diff --git a/_service b/_service index b6dc0a0..fe2e7b3 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 2.1.7 --> 2.1.7+%cd.%h - Pacemaker-2.1.7 + 4f595be2b enable diff --git a/_servicedata b/_servicedata index ccb2044..999529f 100644 --- a/_servicedata +++ b/_servicedata @@ -5,4 +5,4 @@ https://github.com/ClusterLabs/pacemaker.git - 0f7f88312f7a1ccedee60bf768aba79ee13d41e0 \ No newline at end of file + 9c13ce6fe95812308443c188ace8f897e6bce942 \ No newline at end of file diff --git a/bug-806256_pacemaker-log-level-notice.patch b/bug-806256_pacemaker-log-level-notice.patch index a8bc894..8ae4ce1 100644 --- a/bug-806256_pacemaker-log-level-notice.patch +++ b/bug-806256_pacemaker-log-level-notice.patch @@ -4,24 +4,24 @@ Date: Thu Mar 14 09:41:53 2013 +0800 Log: Change some messages to notice level (bnc#806256) -Index: pacemaker-2.1.6+20230821.d00694366/daemons/controld/controld_membership.c +Index: pacemaker-2.1.7+20240118.9ae4bea49/daemons/controld/controld_membership.c =================================================================== ---- pacemaker-2.1.6+20230821.d00694366.orig/daemons/controld/controld_membership.c -+++ pacemaker-2.1.6+20230821.d00694366/daemons/controld/controld_membership.c -@@ -435,7 +435,7 @@ crm_update_quorum(gboolean quorum, gbool - crm_xml_add_int(update, XML_ATTR_HAVE_QUORUM, quorum); - crm_xml_add(update, XML_ATTR_DC_UUID, controld_globals.our_uuid); +--- pacemaker-2.1.7+20240118.9ae4bea49.orig/daemons/controld/controld_membership.c ++++ pacemaker-2.1.7+20240118.9ae4bea49/daemons/controld/controld_membership.c +@@ -432,7 +432,7 @@ crm_update_quorum(gboolean quorum, gbool + crm_xml_add_int(update, PCMK_XA_HAVE_QUORUM, quorum); + crm_xml_add(update, PCMK_XA_DC_UUID, controld_globals.our_uuid); - crm_debug("Updating quorum status to %s", pcmk__btoa(quorum)); + crm_notice("Updating quorum status to %s", pcmk__btoa(quorum)); - controld_update_cib(XML_TAG_CIB, update, cib_scope_local, + controld_update_cib(PCMK_XE_CIB, update, cib_scope_local, cib_quorum_update_complete); free_xml(update); -Index: pacemaker-2.1.6+20230821.d00694366/daemons/controld/controld_transition.c +Index: pacemaker-2.1.7+20240118.9ae4bea49/daemons/controld/controld_transition.c =================================================================== ---- pacemaker-2.1.6+20230821.d00694366.orig/daemons/controld/controld_transition.c -+++ pacemaker-2.1.6+20230821.d00694366/daemons/controld/controld_transition.c -@@ -171,7 +171,7 @@ do_te_invoke(long long action, +--- pacemaker-2.1.7+20240118.9ae4bea49.orig/daemons/controld/controld_transition.c ++++ pacemaker-2.1.7+20240118.9ae4bea49/daemons/controld/controld_transition.c +@@ -167,7 +167,7 @@ do_te_invoke(long long action, CRM_CHECK(controld_globals.transition_graph != NULL, controld_globals.transition_graph = create_blank_graph(); return); @@ -30,10 +30,10 @@ Index: pacemaker-2.1.6+20230821.d00694366/daemons/controld/controld_transition.c controld_globals.transition_graph->id, ref, graph_input); te_reset_job_counts(); -Index: pacemaker-2.1.6+20230821.d00694366/daemons/fenced/fenced_remote.c +Index: pacemaker-2.1.7+20240118.9ae4bea49/daemons/fenced/fenced_remote.c =================================================================== ---- pacemaker-2.1.6+20230821.d00694366.orig/daemons/fenced/fenced_remote.c -+++ pacemaker-2.1.6+20230821.d00694366/daemons/fenced/fenced_remote.c +--- pacemaker-2.1.7+20240118.9ae4bea49.orig/daemons/fenced/fenced_remote.c ++++ pacemaker-2.1.7+20240118.9ae4bea49/daemons/fenced/fenced_remote.c @@ -695,7 +695,7 @@ remote_op_timeout_one(gpointer userdata) static void finalize_timed_out_op(remote_fencing_op_t *op, const char *reason) diff --git a/pacemaker-2.1.7+20231219.0f7f88312.tar.xz b/pacemaker-2.1.7+20231219.0f7f88312.tar.xz deleted file mode 100644 index 1250e54..0000000 --- a/pacemaker-2.1.7+20231219.0f7f88312.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:377bec429837d8b8db33e91f2b23b8d5b6cbaa1653da5ac3a8a2372cfc0f007c -size 4280884 diff --git a/pacemaker-2.1.7+20240130.4f595be2b.tar.xz b/pacemaker-2.1.7+20240130.4f595be2b.tar.xz new file mode 100644 index 0000000..9ea4ace --- /dev/null +++ b/pacemaker-2.1.7+20240130.4f595be2b.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7de229823546f2045ba048fe47f2211519d4f3dccf1268cbb788c782fdd7d404 +size 4310328 diff --git a/pacemaker-cts-StartCmd.patch b/pacemaker-cts-StartCmd.patch index 3ffddf5..11ba91c 100644 --- a/pacemaker-cts-StartCmd.patch +++ b/pacemaker-cts-StartCmd.patch @@ -1,13 +1,13 @@ -Index: pacemaker-2.1.5+20230309.a4b0ea1b5/python/pacemaker/_cts/patterns.py +Index: pacemaker-2.1.7+20240118.9ae4bea49/python/pacemaker/_cts/patterns.py =================================================================== ---- pacemaker-2.1.5+20230309.a4b0ea1b5.orig/python/pacemaker/_cts/patterns.py -+++ pacemaker-2.1.5+20230309.a4b0ea1b5/python/pacemaker/_cts/patterns.py -@@ -135,7 +135,7 @@ class Corosync2Patterns(BasePatterns): +--- pacemaker-2.1.7+20240118.9ae4bea49.orig/python/pacemaker/_cts/patterns.py ++++ pacemaker-2.1.7+20240118.9ae4bea49/python/pacemaker/_cts/patterns.py +@@ -139,7 +139,7 @@ class Corosync2Patterns(BasePatterns): self._name = "crm-corosync" self._commands.update({ -- "StartCmd" : "service corosync start && service pacemaker start", -+ "StartCmd" : "service pacemaker start", - "StopCmd" : "service pacemaker stop; [ ! -e /usr/sbin/pacemaker-remoted ] || service pacemaker_remote stop; service corosync stop", +- "StartCmd": "service corosync start && service pacemaker start", ++ "StartCmd": "ervice pacemaker start", + "StopCmd": "service pacemaker stop; [ ! -e /usr/sbin/pacemaker-remoted ] || service pacemaker_remote stop; service corosync stop", - "EpochCmd" : "crm_node -e", + "EpochCmd": "crm_node -e", diff --git a/pacemaker.changes b/pacemaker.changes index 4f51ae0..6893460 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,78 @@ +------------------------------------------------------------------- +Tue Feb 06 11:07:06 UTC 2024 - Yan Gao + +- Update to version 2.1.7+20240130.4f595be2b: +- tools: crm_attribute emits garbage for --node localhost or auto (gh#ClusterLabs/pacemaker#3339) +- scheduler: drop support for rules based on #role attribute +- CIB: deprecate support for rkt in bundles +- daemons: use ENOMEM for pcmk__new_client() failure +- daemons: return ECONNREFUSED to new clients at shutdown +- libpacemaker: Fix a parameter to the cluster-status message. +- tools: Fix memory leak in crm_mon with HTML output (gh#ClusterLabs/pacemaker#3332) + +------------------------------------------------------------------- +Tue Feb 06 08:26:12 UTC 2024 - Yan Gao + +- Update to version 2.1.7+20240122.d342672cb: +- pacemaker-attrd: improve some messages for debugging +- pacemaker-attrd: sync utilization attributes to peers correctly (gh#ClusterLabs/pacemaker#3333) +- pacemaker-attrd: properly validate attribute set type (gh#ClusterLabs/pacemaker#3333) +- cib_file: improve error message when schema file is missing +- libcrmcommon, Pacemaker Explained: improve descriptions of cluster options + +------------------------------------------------------------------- +Mon Jan 29 09:16:24 UTC 2024 - Yan Gao + +- Update to version 2.1.7+20240118.9ae4bea49: +- tools: crm_mon segfaults when fencer connection is lost (bsc#1219220, gh#ClusterLabs/pacemaker#3331) + +------------------------------------------------------------------- +Mon Jan 29 08:21:43 UTC 2024 - Yan Gao + +- Update to version 2.1.7+20240117.570909537: +- pacemaker-attrd: make sure we don't try to log NULL +- libpe_rules: Warn on invalid value-source in expressions +- libpe_rules, libpacemaker: Warn on invalid boolean-op +- CIB: Deprecate resource-discovery-enabled node attribute +- NLS: update translations for current code base +- libcib: Do not check CIB feature set for files in cib_perform_op. +- scheduler: Check the CIB feature set in cluster_status. +- based: Fix CIB version values +- attrd: write Pacemaker Remote node attributes even if not in cache (gh#ClusterLabs/pacemaker#3304) +- based: Add man page for pacemaker-based +- agents: Use attrd_updater dampen delay in SysInfo (gh#ClusterLabs/pacemaker#3286) +- libcrmcommon: Check correct env vars in pcmk__node_attr_target() (gh#ClusterLabs/pacemaker#3286) + +- Rebase: + * bug-806256_pacemaker-log-level-notice.patch + * pacemaker-cts-StartCmd.patch + +------------------------------------------------------------------- +Mon Jan 29 08:09:16 UTC 2024 - Yan Gao + +- Update to version 2.1.7+20240101.3f4ff3e98: +- libcrmcommon: use log-friendly name in pacemakerd IPC logs +- controld,libcrmcommon: improve attrd IPC API messages +- libcrmcommon: handle NULL attribute manager IPC API connections consistently +- libcrmcommon: handle disconnected attrd API connections consistently +- scheduler: restore nvpair behavior without id-ref (gh#ClusterLabs/pacemaker#3292) +- scheduler: use correct variable in log message +- scheduler: reject expression without op sooner (gh#ClusterLabs/pacemaker#3292) +- libcrmcommon: fix NULL dereference in expand_idref() (gh#ClusterLabs/pacemaker#3292) +- pacemaker-attrd,libcrmcluster: avoid use-after-free when remote node in cluster node cache (gh#ClusterLabs/pacemaker#3293) +- libcrmcluster: avoid use-after-free in trace log (gh#ClusterLabs/pacemaker#3293) +- attrd: improve logging of CIB write result +- attrd: improve messages for CIB wipe +- scheduler: improve logs for invalid id-ref's (gh#ClusterLabs/pacemaker#3292) +- scheduler: improve logging of invalid roles +- scheduler: improve messages when unpacking location constraints +- scheduler: treat config errors as processing errors +- HealthSmart: Check the parameter values of check_temperature to avoid error output (gh#ClusterLabs/pacemaker#3289) +- Modify the HealthCPU, HealthSMART, HealthIOWait scripts about the function of reload and setting the dampen +- daemons: Only ask for schemas if supported by the server +- daemons: Download newer schema files to a remote executor. +- libcrmcommon: Write crm_verify detailed messages to XML + ------------------------------------------------------------------- Wed Dec 20 13:44:11 UTC 2023 - Yan Gao diff --git a/pacemaker.spec b/pacemaker.spec index 339e772..2c8df1b 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -129,7 +129,7 @@ %define with_regression_tests 0 Name: pacemaker -Version: 2.1.7+20231219.0f7f88312 +Version: 2.1.7+20240130.4f595be2b Release: 0 Summary: Scalable High-Availability cluster resource manager # AGPL-3.0 licensed extra/clustermon.sh is not present in the binary @@ -591,6 +591,7 @@ fi %endif %{_sbindir}/fence_watchdog +%{_mandir}/man7/pacemaker-based.7%{ext_man} %{_mandir}/man7/pacemaker-controld.7%{ext_man} %{_mandir}/man7/pacemaker-schedulerd.7%{ext_man} %{_mandir}/man7/pacemaker-fenced.7%{ext_man} @@ -661,6 +662,7 @@ fi %config(noreplace) %{_fillupdir}/sysconfig.pacemaker %config(noreplace) %{_fillupdir}/sysconfig.crm_mon %{_mandir}/man7/*pacemaker* +%exclude %{_mandir}/man7/pacemaker-based.* %exclude %{_mandir}/man7/pacemaker-controld.* %exclude %{_mandir}/man7/pacemaker-schedulerd.* %exclude %{_mandir}/man7/pacemaker-fenced.*