diff --git a/_service b/_service index 6482f3a..3ec8b6d 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 2.1.5 --> 2.1.5+%cd.%h - 95bb4788a + a4b0ea1b5 enable diff --git a/_servicedata b/_servicedata index 6d89d0d..c01805f 100644 --- a/_servicedata +++ b/_servicedata @@ -5,4 +5,4 @@ https://github.com/ClusterLabs/pacemaker.git - e46bd496da15932f697b23d7a6e2441575e450ba \ No newline at end of file + c026b5e2a10eebc29cbf1b09953fbba40b7549f3 \ 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 5356b69..b56bde3 100644 --- a/bug-806256_pacemaker-log-level-notice.patch +++ b/bug-806256_pacemaker-log-level-notice.patch @@ -4,23 +4,23 @@ Date: Thu Mar 14 09:41:53 2013 +0800 Log: Change some messages to notice level (bnc#806256) -Index: pacemaker-2.1.5+20221208.cd0f91f51/daemons/controld/controld_membership.c +Index: pacemaker-2.1.5+20230309.a4b0ea1b5/daemons/controld/controld_membership.c =================================================================== ---- pacemaker-2.1.5+20221208.cd0f91f51.orig/daemons/controld/controld_membership.c -+++ pacemaker-2.1.5+20221208.cd0f91f51/daemons/controld/controld_membership.c -@@ -431,7 +431,7 @@ crm_update_quorum(gboolean quorum, gbool +--- pacemaker-2.1.5+20230309.a4b0ea1b5.orig/daemons/controld/controld_membership.c ++++ pacemaker-2.1.5+20230309.a4b0ea1b5/daemons/controld/controld_membership.c +@@ -426,7 +426,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); - fsa_cib_update(XML_TAG_CIB, update, call_options, call_id, NULL); -- crm_debug("Updating quorum status to %s (call=%d)", -+ crm_notice("Updating quorum status to %s (call=%d)", - pcmk__btoa(quorum), call_id); - fsa_register_cib_callback(call_id, FALSE, NULL, cib_quorum_update_complete); +- 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, call_options, + cib_quorum_update_complete); free_xml(update); -Index: pacemaker-2.1.5+20221208.cd0f91f51/daemons/controld/controld_transition.c +Index: pacemaker-2.1.5+20230309.a4b0ea1b5/daemons/controld/controld_transition.c =================================================================== ---- pacemaker-2.1.5+20221208.cd0f91f51.orig/daemons/controld/controld_transition.c -+++ pacemaker-2.1.5+20221208.cd0f91f51/daemons/controld/controld_transition.c +--- pacemaker-2.1.5+20230309.a4b0ea1b5.orig/daemons/controld/controld_transition.c ++++ pacemaker-2.1.5+20230309.a4b0ea1b5/daemons/controld/controld_transition.c @@ -182,7 +182,7 @@ do_te_invoke(long long action, CRM_CHECK(controld_globals.transition_graph != NULL, controld_globals.transition_graph = create_blank_graph(); @@ -30,14 +30,14 @@ Index: pacemaker-2.1.5+20221208.cd0f91f51/daemons/controld/controld_transition.c controld_globals.transition_graph->id, ref, graph_input); te_reset_job_counts(); -Index: pacemaker-2.1.5+20221208.cd0f91f51/daemons/fenced/fenced_remote.c +Index: pacemaker-2.1.5+20230309.a4b0ea1b5/daemons/fenced/fenced_remote.c =================================================================== ---- pacemaker-2.1.5+20221208.cd0f91f51.orig/daemons/fenced/fenced_remote.c -+++ pacemaker-2.1.5+20221208.cd0f91f51/daemons/fenced/fenced_remote.c -@@ -687,7 +687,7 @@ finalize_timed_out_op(remote_fencing_op_ +--- pacemaker-2.1.5+20230309.a4b0ea1b5.orig/daemons/fenced/fenced_remote.c ++++ pacemaker-2.1.5+20230309.a4b0ea1b5/daemons/fenced/fenced_remote.c +@@ -687,7 +687,7 @@ remote_op_timeout_one(gpointer userdata) + static void + finalize_timed_out_op(remote_fencing_op_t *op, const char *reason) { - op->op_timer_total = 0; - - crm_debug("Action '%s' targeting %s for client %s timed out " + crm_notice("Action '%s' targeting %s for client %s timed out " CRM_XS " id=%.8s", diff --git a/pacemaker-2.1.5+20230125.95bb4788a.tar.xz b/pacemaker-2.1.5+20230125.95bb4788a.tar.xz deleted file mode 100644 index 8de7d06..0000000 --- a/pacemaker-2.1.5+20230125.95bb4788a.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f2d96173dfcc0118ae49b537c018db10b5a632dcd174fe1aad29e5d774944f3d -size 4134232 diff --git a/pacemaker-2.1.5+20230309.a4b0ea1b5.tar.xz b/pacemaker-2.1.5+20230309.a4b0ea1b5.tar.xz new file mode 100644 index 0000000..cfe716e --- /dev/null +++ b/pacemaker-2.1.5+20230309.a4b0ea1b5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1824edc6bd20f784852f326614eeaff27e99b82d1d623c3775cba29bb928e37 +size 4167784 diff --git a/pacemaker-cts-StartCmd.patch b/pacemaker-cts-StartCmd.patch index 0827236..3ffddf5 100644 --- a/pacemaker-cts-StartCmd.patch +++ b/pacemaker-cts-StartCmd.patch @@ -1,13 +1,13 @@ -Index: pacemaker-2.0.5+20210420.e82d2a1bc/cts/lab/patterns.py +Index: pacemaker-2.1.5+20230309.a4b0ea1b5/python/pacemaker/_cts/patterns.py =================================================================== ---- pacemaker-2.0.5+20210420.e82d2a1bc.orig/cts/lab/patterns.py -+++ pacemaker-2.0.5+20210420.e82d2a1bc/cts/lab/patterns.py -@@ -114,7 +114,7 @@ class crm_corosync(BasePatterns): - BasePatterns.__init__(self, name) +--- 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): + self._name = "crm-corosync" - self.commands.update({ + 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", - "EpochCmd" : "crm_node -e", + "EpochCmd" : "crm_node -e", diff --git a/pacemaker.changes b/pacemaker.changes index c8f5d3d..0c1a3e9 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,71 @@ +------------------------------------------------------------------- +Tue Mar 14 10:25:29 UTC 2023 - Yan Gao + +- Update to version 2.1.5+20230309.a4b0ea1b5: +- controller: compare recordable actions case-sensitively +- libcrmcommon: Don't parse "-INFINITY" as a list of cmdline options (CLBZ#5509) +- tools: crm_shadow --commit now works with CIB_file +- scheduler: expired results shouldn't affect state +- scheduler: avoid remap log if not remapped +- scheduler: always treat degraded results as success +- watchdog-fencing: correctly derive timeout with topology +- watchdog-fencing: terminate dangling timer before watchdog-waiting +- scheduler: ensure resource history entries have an XML ID +- crm_resource: Add the --element option for --get-parameter +- libcrmcommon: Fix problems with pcmk__output_and_clear_error. +- libcrmcommon: Fix memleak in pcmk__output_xml_add_node_copy() + +- Rebase: + * bug-806256_pacemaker-log-level-notice.patch + * pacemaker-cts-StartCmd.patch + +------------------------------------------------------------------- +Thu Mar 09 11:46:21 UTC 2023 - Yan Gao + +- Update to version 2.1.5+20230220.c4f6c191a: +- libcrmcommon: Fix handling node=NULL in pcmk__attrd_api_query. +- fencer: Avoid double source remove of op_timer_total (rh#2166967) + +- Rebase: + * bug-806256_pacemaker-log-level-notice.patch + +------------------------------------------------------------------- +Mon Feb 20 10:50:04 UTC 2023 - Yan Gao + +- Update to version 2.1.5+20230216.ed8bc68bc: +- scheduler: count only containers' active nodes for bundles + +------------------------------------------------------------------- +Fri Feb 10 15:33:30 UTC 2023 - Yan Gao + +- Update to version 2.1.5+20230208.231b58a40: +- cts: Add a basic cts-attrd program. +- daemons: Modify a couple log messages for testing. +- daemons: Add a -l argument to pacemaker-attrd. +- daemons: Skip connecting to the CIB in attrd standalone mode. +- daemons: Add some additional errors for when startup fails. +- daemons: Add a standalone argument for attrd. +- fencer: Prevent double g_source_remove of op_timer_one (rh#2166967) +- tools: Don't allow use of --name and --pattern at the same time. +- tools: Add sync point support to crm_attribute. +- tools: Add pattern support to attrd_updater. +- scheduler: handle cleaned migrate_from history correctly (bsc#1182313) +- scheduler: unknown_on_node() should ignore pending actions (bsc#1182313) +- daemons: Fix pointer management in attrd_client_update. +- scheduler: improve migration history validation + +------------------------------------------------------------------- +Thu Feb 02 13:56:32 UTC 2023 - Yan Gao + +- Update to version 2.1.5+20230201.11c15a89f: +- crm_mon: Display the descriptions in crm_mon output +- libcrmcommon: parse_op_key() can now handle confirmed notifications +- xml: change resources-related schemas and bump PCMK__API_VERSION +- crm_resouce: Add the description to the XML output of crm_resource --list +- python: Disable a couple more pylint warnings. +- scheduler: correctly choose container vs inside resource for interleaving +- scheduler: ignore node when getting resource inside container + ------------------------------------------------------------------- Thu Jan 26 09:49:40 UTC 2023 - Yan Gao @@ -524,7 +592,7 @@ Mon Sep 19 11:25:05 UTC 2022 - Yan Gao Mon Sep 19 11:16:33 UTC 2022 - Yan Gao - Update to version 2.1.4+20220808.986d22dd5: -- libcrmcommon: Fix an IPC-related memory leak. +- libcrmcommon: Fix an IPC-related memory leak. (bsc#1208544) ------------------------------------------------------------------- Wed Aug 03 10:47:09 UTC 2022 - Yan Gao diff --git a/pacemaker.spec b/pacemaker.spec index 05d11e4..d478cee 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -104,7 +104,7 @@ %define with_regression_tests 0 Name: pacemaker -Version: 2.1.5+20230125.95bb4788a +Version: 2.1.5+20230309.a4b0ea1b5 Release: 0 Summary: Scalable High-Availability cluster resource manager # AGPL-3.0 licensed extra/clustermon.sh is not present in the binary