Merge pull request #976 from kgaillot/1.1

Release 1.1.15-rc1

ChangeLog

@@ -1,3 +1,35 @@
+* Fri Apr 22 2016 Ken Gaillot <[email protected]> Pacemaker-1.1.15-rc1
+- Update source tarball to revision: f7dfcf8
+- Changesets: 301
+- Diff:       188 files changed, 5526 insertions(+), 3307 deletions(-)
+
+- Features added since Pacemaker-1.1.14
+  + Event-driven alerts allow scripts to be called after significant events
+  + Move some files from pacemaker package to pacemaker-cli for cleaner pacemaker-remote dependencies
+  + fencing: Simplify watchdog integration
+  + fencing: Support concurrent fencing actions via new pcmk_action_limit option
+  + remote: pacemaker_remote may be stopped without disabling resource first
+  + remote: Report integration status of Pacemaker Remote nodes in CIB node_state
+  + tools: crm_mon now reports why resources are not starting
+  + tools: crm_report now obscures passwords in logfiles
+  + tools: attrd_updater --update-both/--update-delay options allow changing dampening value
+
+- Changes since Pacemaker-1.1.14
+  + Fix multiple memory issues (leaks, use-after-free) in daemons and libraries
+  + cib: Fix regression to restore support for compressed CIB larger than 1MB
+  + crmd: Fix regression so that fenced unseen nodes do not remain unclean
+  + fencing: Allow fencing by node ID (e.g. by DLM) even if node left cluster
+  + lrmd: Fix potential issues when cluster is stopped via systemd shutdown
+  + pacemakerd: Properly respawn stonithd if it fails
+  + pengine: Fix regression with multiple monitor levels that could ignore failure
+  + remote: Allow remote nodes to have node attributes even with legacy attrd
+  + remote: Recover from remote node fencing more quickly
+  + remote: Place resources on newly rejoined remote nodes more quickly
+  + resources: ping agent can now use fping6 for IPv6 hosts
+  + tools: crm_report is now more efficient and handles Pacemaker Remote nodes better
+  + tools: Prevent crm_resource segfault when --resource is not supplied with --restart
+  + tools: crm_shadow --display option now works
+
 * Thu Jan 14 2016 Ken Gaillot <[email protected]> Pacemaker-1.1.14-1
 - Update source tarball to revision: f0b585a
 - Changesets: 724

crmd/control.c

@@ -41,13 +41,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-/* Enable support for built-in notifications
- *
- * The interface is expected to change significantly, and this will be defined
- * in the upstream master branch only until a new design is finalized.
- */
-#define RHEL7_COMPAT
-
 qb_ipcs_service_t *ipcs = NULL;
 
 extern gboolean crm_connect_corosync(crm_cluster_t * cluster);
@@ -901,7 +894,11 @@ pe_cluster_option crmd_opts[] = {
         },
 
 #ifdef RHEL7_COMPAT
-    /* this interface is expected to change but was released in RHEL 7 */
+    /* These options were superseded by the alerts feature and now are just an
+     * alternate interface to it. It was never released upstream, but was
+     * released in RHEL 7, so we allow it to be enabled at compile-time by
+     * defining RHEL7_COMPAT.
+     */
 	{ "notification-agent", NULL, "string", NULL, "/dev/null", &check_script,
           "Notification script or tool to be called after significant cluster events",
           "Full path to a script or binary that will be invoked when resources start/stop/fail, fencing occurs or nodes join/leave the cluster.\n"

lib/cib/Makefile.am

@@ -28,7 +28,7 @@ noinst_HEADERS		=
 libcib_la_SOURCES	= cib_ops.c cib_utils.c cib_client.c cib_native.c cib_attrs.c
 libcib_la_SOURCES      += cib_file.c cib_remote.c
 
-libcib_la_LDFLAGS	= -version-info 5:0:1 -L$(top_builddir)/lib/pengine/.libs
+libcib_la_LDFLAGS	= -version-info 5:1:1 -L$(top_builddir)/lib/pengine/.libs
 libcib_la_LIBADD        = $(CRYPTOLIB) $(top_builddir)/lib/pengine/libpe_rules.la $(top_builddir)/lib/common/libcrmcommon.la
 libcib_la_CFLAGS	= -I$(top_srcdir)
 

lib/cluster/Makefile.am

@@ -28,7 +28,7 @@ header_HEADERS =
 lib_LTLIBRARIES	= libcrmcluster.la 
 
 libcrmcluster_la_SOURCES = election.c cluster.c membership.c
-libcrmcluster_la_LDFLAGS = -version-info 5:0:1
+libcrmcluster_la_LDFLAGS = -version-info 6:0:2
 libcrmcluster_la_LIBADD  = $(top_builddir)/lib/common/libcrmcommon.la $(top_builddir)/lib/fencing/libstonithd.la $(CLUSTERLIBS)
 libcrmcluster_la_DEPENDENCIES = $(top_builddir)/lib/common/libcrmcommon.la $(top_builddir)/lib/fencing/libstonithd.la 
 

lib/common/Makefile.am

@@ -40,7 +40,7 @@ if BUILD_CIBSECRETS
 libcrmcommon_la_SOURCES	+= cib_secrets.c
 endif
 
-libcrmcommon_la_LDFLAGS	= -version-info 8:0:5
+libcrmcommon_la_LDFLAGS	= -version-info 9:0:6
 libcrmcommon_la_LIBADD  = @LIBADD_DL@ $(GNUTLSLIBS) -lm
 libcrmcommon_la_SOURCES += $(top_builddir)/lib/gnu/md5.c
 

lib/fencing/Makefile.am

@@ -25,7 +25,7 @@ AM_CPPFLAGS         = -I$(top_builddir)/include  -I$(top_srcdir)/include     \
 lib_LTLIBRARIES = libstonithd.la
 
 libstonithd_la_SOURCES = st_client.c
-libstonithd_la_LDFLAGS = -version-info 4:0:2
+libstonithd_la_LDFLAGS = -version-info 4:1:2
 libstonithd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la
 
 AM_CFLAGS = $(AM_CPPFLAGS)

lib/lrmd/Makefile.am

@@ -25,7 +25,7 @@ AM_CPPFLAGS         = -I$(top_builddir)/include  -I$(top_srcdir)/include     \
 lib_LTLIBRARIES = liblrmd.la
 
 liblrmd_la_SOURCES = lrmd_client.c proxy_common.c
-liblrmd_la_LDFLAGS = -version-info 3:1:2
+liblrmd_la_LDFLAGS = -version-info 4:0:3
 liblrmd_la_LIBADD = $(top_builddir)/lib/common/libcrmcommon.la	\
 			$(top_builddir)/lib/services/libcrmservice.la \
 			$(top_builddir)/lib/fencing/libstonithd.la

lib/pengine/Makefile.am

@@ -26,11 +26,11 @@ lib_LTLIBRARIES	= libpe_rules.la libpe_status.la
 ## SOURCES
 noinst_HEADERS	= unpack.h variant.h
 
-libpe_rules_la_LDFLAGS	= -version-info 2:5:0
+libpe_rules_la_LDFLAGS	= -version-info 2:6:0
 libpe_rules_la_SOURCES	= rules.c common.c
 libpe_rules_la_LIBADD	= $(top_builddir)/lib/common/libcrmcommon.la
 
-libpe_status_la_LDFLAGS	= -version-info 10:0:0
+libpe_status_la_LDFLAGS	= -version-info 11:0:1
 libpe_status_la_SOURCES	=  status.c unpack.c utils.c complex.c native.c \
 			   group.c clone.c rules.c common.c remote.c
 libpe_status_la_LIBADD	=  @CURSESLIBS@ $(top_builddir)/lib/common/libcrmcommon.la

lib/services/Makefile.am

@@ -24,7 +24,7 @@ lib_LTLIBRARIES = libcrmservice.la
 noinst_HEADERS  = upstart.h systemd.h services_private.h
 
 libcrmservice_la_SOURCES = services.c services_linux.c
-libcrmservice_la_LDFLAGS = -version-info 4:0:1
+libcrmservice_la_LDFLAGS = -version-info 4:1:1
 libcrmservice_la_CFLAGS  = $(GIO_CFLAGS) -DOCF_ROOT_DIR=\"@OCF_ROOT_DIR@\"
 libcrmservice_la_LIBADD  = $(GIO_LIBS) $(top_builddir)/lib/common/libcrmcommon.la $(DBUS_LIBS)
 

lib/transition/Makefile.am

@@ -27,7 +27,7 @@ lib_LTLIBRARIES	= libtransitioner.la
 noinst_HEADERS		= 
 libtransitioner_la_SOURCES	= unpack.c graph.c utils.c
 
-libtransitioner_la_LDFLAGS	= -version-info 2:4:0
+libtransitioner_la_LDFLAGS	= -version-info 2:5:0
 libtransitioner_la_CFLAGS	= -I$(top_builddir)
 libtransitioner_la_LIBADD       = $(top_builddir)/lib/common/libcrmcommon.la
 

pengine/Makefile.am

@@ -61,7 +61,7 @@ endif
 noinst_HEADERS	= allocate.h utils.h pengine.h
 #utils.h pengine.h
 
-libpengine_la_LDFLAGS	= -version-info 10:0:0
+libpengine_la_LDFLAGS	= -version-info 11:0:1
 # -L$(top_builddir)/lib/pils -lpils -export-dynamic -module -avoid-version
 libpengine_la_SOURCES	= pengine.c allocate.c utils.c constraints.c
 libpengine_la_SOURCES  += native.c group.c clone.c master.c graph.c utilization.c

version.m4

@@ -1,2 +1,2 @@
-m4_define([VERSION_NUMBER], [1.1.14])
-m4_define([PCMK_URL], [http://clusterlabs.org])
+m4_define([VERSION_NUMBER], [1.1.15])
+m4_define([PCMK_URL], [http://clusterlabs.org/])