Merge pull request #2555 from kgaillot/release

Release 2.1.2-rc1
ClusterLabs · Nov 4, 2021 · 62c36e2 · 62c36e2
2 parents a30baf8 + 3b6b73d
commit 62c36e2
Show file tree

Hide file tree

Showing 12 changed files with 67 additions and 14 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,58 @@
+* Fri Oct 29 2021 Ken Gaillot <[email protected]> Pacemaker-2.1.2-rc1
+- Changesets: 448
+- Diff: 221 files changed, 16502 insertions(+), 11737 deletions(-)
+
+- Features added since Pacemaker-2.1.1
+  + build: when built with --with-initdir, Pacemaker uses the value to find
+           LSB resources (in addition to being where Pacemaker's own
+           init scripts are installed)
+  + build: cmocka is new dependency for unit tests ("make check")
+  + rpm: fence_watchdog now comes with pacemaker package (not pacemaker-cli)
+  + daemons: metadata for cluster options supports OCF 1.1 standard
+  + executor: nagios warning results now map to OCF "degraded" result code
+  + fencing: pcmk_delay_base can optionally specify different delays per node
+  + fencing: pcmk_host_map supports escaped characters such as spaces in values
+  + resources: HealthIOWait agent supports OCF 1.1 standard, and validate works
+  + tools: crm_mon shows exit reasons for actions failed due to internal errors
+  + tools: crm_mon failed action display is more human-friendly by default
+  + tools: crm_resource --force-* now outputs exit reasons if available
+
+- Fixes since Pacemaker-2.1.1
+  + tools: fix crm_mon --hide-headers and related options
+           (regression introduced in 2.0.4)
+  + attrd: check election status upon node loss to avoid election timeout
+  + controller: improved handling of executor connection failures
+  + executor: properly detect systemd unit existence
+  + pacemakerd: recover properly from Corosync crash
+  + fencing: fencing results are now sorted with sub-second resolution
+  + fencing: fix fence_watchdog version output, metadata output, and man page
+  + tools: map LSB status to OCF correctly with crm_resource --force-check
+
+- Public API changes since Pacemaker-2.1.1
+  + libcrmcommon: deprecate PCMK_OCF_EXEC_ERROR
+  + libcrmcommon: deprecate PCMK_OCF_PENDING
+  + libcrmcommon: deprecate PCMK_OCF_SIGNAL
+  + libcrmcommon: add CRM_EX_DEGRADED and CRM_EX_DEGRADED_PROMOTED
+  + libcrmcommon: add enum pcmk_exec_status
+  + libcrmcommon: add PCMK_EXEC_MAX
+  + libcrmcommon: add PCMK_EXEC_NO_FENCE_DEVICE
+  + libcrmcommon: add PCMK_EXEC_NO_SECRETS
+  + libcrmcommon: add pcmk_exec_status_str()
+  + libcrmcommon: add pcmk_rc2ocf()
+  + libcrmcommon: deprecate PCMK_OCF_TIMEOUT
+  + libcrmservice: add services_result2ocf()
+  + libcrmservice: deprecate enum op_status
+  + libcrmservice: deprecate LSB_ROOT_DIR
+  + libcrmservice: deprecate NAGIOS_NOT_INSTALLED
+  + libcrmservice: deprecate NAGIOS_STATE_DEPENDENT
+  + libcrmservice: deprecate services_get_ocf_exitcode()
+  + libcrmservice: deprecate services_list() and services_action_create()
+  + libcrmservice: deprecate services_lrm_status_str()
+  + libpacemaker: add enum pcmk_sim_flags
+  + libpacemaker: add pcmk_injections_t
+  + libpacemaker: add pcmk_free_injections()
+  + libpacemaker: add pcmk_simulate()
+
 * Thu Sep 09 2021 Ken Gaillot <[email protected]> Pacemaker-2.1.1
 - Changesets: 231
 - Diff:

diff --git a/cts/lab/patterns.py b/cts/lab/patterns.py
@@ -219,7 +219,7 @@ def __init__(self, name):
         ]
 
         self.components["corosync-ignore"] = [
-            r"error:.*Connection to the CPG API failed: Library error",
+            r"Could not connect to Corosync CFG: CS_ERR_LIBRARY",
             r"\[[0-9]+\] exited with status [0-9]+ \(",
             r"\[[0-9]+\] terminated with signal 15",
             r"pacemaker-based.*error:.*Corosync connection lost",

diff --git a/daemons/execd/execd_alerts.c b/daemons/execd/execd_alerts.c
@@ -149,9 +149,7 @@ process_lrmd_alert_exec(pcmk__client_t *client, uint32_t id, xmlNode *request)
         }
         free(cb_data);
     }
-    if (action) {
-        services_action_free(action);
-    }
+    services_action_free(action);
     return rc;
 }
 

diff --git a/lib/cib/Makefile.am b/lib/cib/Makefile.am
@@ -15,7 +15,7 @@ lib_LTLIBRARIES		= libcib.la
 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 29:0:2
+libcib_la_LDFLAGS	= -version-info 29:1:2
 libcib_la_CPPFLAGS	= -I$(top_srcdir) $(AM_CPPFLAGS)
 
 libcib_la_CFLAGS	= $(CFLAGS_HARDENED_LIB)

diff --git a/lib/cluster/Makefile.am b/lib/cluster/Makefile.am
@@ -13,7 +13,7 @@ noinst_HEADERS	= crmcluster_private.h
 ## libraries
 lib_LTLIBRARIES	= libcrmcluster.la 
 
-libcrmcluster_la_LDFLAGS = -version-info 29:7:0
+libcrmcluster_la_LDFLAGS = -version-info 29:8:0
 
 libcrmcluster_la_CFLAGS  = $(CFLAGS_HARDENED_LIB)
 libcrmcluster_la_LDFLAGS += $(LDFLAGS_HARDENED_LIB)

diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am
@@ -34,7 +34,7 @@ SUBDIRS = . tests
 
 noinst_HEADERS		= crmcommon_private.h mock_private.h
 
-libcrmcommon_la_LDFLAGS	= -version-info 41:0:7
+libcrmcommon_la_LDFLAGS	= -version-info 42:0:8
 
 libcrmcommon_la_CFLAGS	= $(CFLAGS_HARDENED_LIB)
 libcrmcommon_la_LDFLAGS	+= $(LDFLAGS_HARDENED_LIB)

diff --git a/lib/fencing/Makefile.am b/lib/fencing/Makefile.am
@@ -14,7 +14,7 @@ noinst_HEADERS		= fencing_private.h
 
 lib_LTLIBRARIES		= libstonithd.la
 
-libstonithd_la_LDFLAGS	= -version-info 31:1:5
+libstonithd_la_LDFLAGS	= -version-info 32:0:6
 
 libstonithd_la_CFLAGS	= $(CFLAGS_HARDENED_LIB)
 libstonithd_la_LDFLAGS	+= $(LDFLAGS_HARDENED_LIB)

diff --git a/lib/lrmd/Makefile.am b/lib/lrmd/Makefile.am
@@ -10,7 +10,7 @@ include $(top_srcdir)/mk/common.mk
 
 lib_LTLIBRARIES		= liblrmd.la
 
-liblrmd_la_LDFLAGS	= -version-info 29:2:1
+liblrmd_la_LDFLAGS	= -version-info 29:3:1
 
 liblrmd_la_CFLAGS	= $(CFLAGS_HARDENED_LIB)
 liblrmd_la_LDFLAGS	+= $(LDFLAGS_HARDENED_LIB)

diff --git a/lib/pacemaker/Makefile.am b/lib/pacemaker/Makefile.am
@@ -18,7 +18,7 @@ lib_LTLIBRARIES	= libpacemaker.la
 
 ## SOURCES
 
-libpacemaker_la_LDFLAGS	= -version-info 3:1:2
+libpacemaker_la_LDFLAGS	= -version-info 4:0:3
 
 libpacemaker_la_CFLAGS	= $(CFLAGS_HARDENED_LIB)
 libpacemaker_la_LDFLAGS	+= $(LDFLAGS_HARDENED_LIB)

diff --git a/lib/pengine/Makefile.am b/lib/pengine/Makefile.am
@@ -16,15 +16,15 @@ lib_LTLIBRARIES		= libpe_rules.la libpe_status.la
 ## SOURCES
 noinst_HEADERS		= variant.h pe_status_private.h
 
-libpe_rules_la_LDFLAGS	= -version-info 29:0:3
+libpe_rules_la_LDFLAGS	= -version-info 29:1:3
 
 libpe_rules_la_CFLAGS	= $(CFLAGS_HARDENED_LIB)
 libpe_rules_la_LDFLAGS	+= $(LDFLAGS_HARDENED_LIB)
 
 libpe_rules_la_LIBADD	= $(top_builddir)/lib/common/libcrmcommon.la
 libpe_rules_la_SOURCES	= rules.c rules_alerts.c common.c
 
-libpe_status_la_LDFLAGS	= -version-info 32:1:4
+libpe_status_la_LDFLAGS	= -version-info 32:2:4
 
 libpe_status_la_CFLAGS	= $(CFLAGS_HARDENED_LIB)
 libpe_status_la_LDFLAGS	+= $(LDFLAGS_HARDENED_LIB)

diff --git a/lib/services/Makefile.am b/lib/services/Makefile.am
@@ -17,7 +17,7 @@ noinst_HEADERS			= pcmk-dbus.h upstart.h systemd.h \
 				  services_ocf.h \
 				  services_private.h
 
-libcrmservice_la_LDFLAGS	= -version-info 30:4:2
+libcrmservice_la_LDFLAGS	= -version-info 30:5:2
 libcrmservice_la_CFLAGS		=
 
 libcrmservice_la_CFLAGS		+= $(CFLAGS_HARDENED_LIB)

diff --git a/m4/version.m4 b/m4/version.m4
@@ -1,2 +1,2 @@
-m4_define([VERSION_NUMBER], [2.1.1])
+m4_define([VERSION_NUMBER], [2.1.2])
 m4_define([PCMK_URL], [https://ClusterLabs.org/pacemaker/])