From 43a9979cf4c2771cf7dbf7d58ded45ce514db010c475eaa418dec95995a9ae46 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Wed, 4 Jan 2023 12:38:55 +0000 Subject: [PATCH] Accepting request 1055788 from home:yan_gao:branches:network:ha-clustering:Factory - Update to version 2.1.5+20221212.b4db7685a: - cts-scheduler: update test for preventing inactive instances from starting if probe is unrunnable on any nodes (bsc#1206263) - scheduler: prevent inactive instances from starting if probe is unrunnable on any nodes (bsc#1206263) - libpacemaker: ensure any pending recurring monitor gets updated if it fails (bsc#1206263) - cts-scheduler: update test for preventing a leftover pending monitor from causing unexpected stop of other instances (bsc#1206263) - scheduler: prevent a leftover pending monitor from causing unexpected stop of other instances (bsc#1206263) - cts-scheduler: add test for preventing a leftover pending monitor from causing unexpected stop of other instances (bsc#1206263) - Update to version 2.1.5+20221212.074e9c860: - tools: Support setting transient utilization attrs from crm_attribute. - scheduler: Unpack transient utilization attributes. - daemons: Add support for transient utilization attributes. - libcrmcommon: Add a block attr to an IPC update request. - tools: Add a -z option to attrd_updater. - Update to version 2.1.5+20221208.cd0f91f51: - libcrmcommon: Warn if deprecated command line formats are used. - controller: Don't nack joining node due to old CIB - based: Successful CIB schema upgrade should always force a write - based: Don't write to disk if CIB replace failed - tools: Fix trivial memory leak in cibadmin - based: Fix double free() in pacemaker-based.c - libpe_status: avoid memory leak on regular expression error - controller: Avoid election storm due to incompatible CIB - libpacemaker: don't regfree() if regcomp() failed - libpe_status: don't try to use compiled expression if regcomp() failed - libcrmcommon: don't regfree() if regcomp() failed - controller: Avoid error if a join request is received after fencing - controller: Don't double-increment failcount for simulated failures - daemons, tools: Unregister formats before exiting OBS-URL: https://build.opensuse.org/request/show/1055788 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=372 --- _service | 2 +- _servicedata | 2 +- bug-806256_pacemaker-log-level-notice.patch | 36 +++---- pacemaker-2.1.5+20221208.a3f44794f.tar.xz | 3 - pacemaker-2.1.5+20221212.b4db7685a.tar.xz | 3 + pacemaker.changes | 101 +++++++++++++++++++- pacemaker.spec | 4 +- 7 files changed, 123 insertions(+), 28 deletions(-) delete mode 100644 pacemaker-2.1.5+20221208.a3f44794f.tar.xz create mode 100644 pacemaker-2.1.5+20221212.b4db7685a.tar.xz diff --git a/_service b/_service index bd207e8..89000fe 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 2.1.5 --> 2.1.5+%cd.%h - Pacemaker-2.1.5 + b4db7685a enable diff --git a/_servicedata b/_servicedata index afb2cf5..e9c79ce 100644 --- a/_servicedata +++ b/_servicedata @@ -5,4 +5,4 @@ https://github.com/ClusterLabs/pacemaker.git - a3f44794f94e1571c6ba0042915ade369b4ce4b1 \ No newline at end of file + b4db7685a5a6b117bd977a49b6377e99b21599eb \ 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 7ba5f5f..5356b69 100644 --- a/bug-806256_pacemaker-log-level-notice.patch +++ b/bug-806256_pacemaker-log-level-notice.patch @@ -4,12 +4,12 @@ Date: Thu Mar 14 09:41:53 2013 +0800 Log: Change some messages to notice level (bnc#806256) -Index: pacemaker-2.1.2+20220126.57e783b4b/daemons/controld/controld_membership.c +Index: pacemaker-2.1.5+20221208.cd0f91f51/daemons/controld/controld_membership.c =================================================================== ---- pacemaker-2.1.2+20220126.57e783b4b.orig/daemons/controld/controld_membership.c -+++ pacemaker-2.1.2+20220126.57e783b4b/daemons/controld/controld_membership.c -@@ -410,7 +410,7 @@ crm_update_quorum(gboolean quorum, gbool - crm_xml_add(update, XML_ATTR_DC_UUID, fsa_our_uuid); +--- 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 + 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)", @@ -17,24 +17,24 @@ Index: pacemaker-2.1.2+20220126.57e783b4b/daemons/controld/controld_membership.c pcmk__btoa(quorum), call_id); fsa_register_cib_callback(call_id, FALSE, NULL, cib_quorum_update_complete); free_xml(update); -Index: pacemaker-2.1.2+20220126.57e783b4b/daemons/controld/controld_transition.c +Index: pacemaker-2.1.5+20221208.cd0f91f51/daemons/controld/controld_transition.c =================================================================== ---- pacemaker-2.1.2+20220126.57e783b4b.orig/daemons/controld/controld_transition.c -+++ pacemaker-2.1.2+20220126.57e783b4b/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 @@ -182,7 +182,7 @@ do_te_invoke(long long action, - transition_graph = pcmk__unpack_graph(graph_data, graph_input); - CRM_CHECK(transition_graph != NULL, - transition_graph = create_blank_graph(); return); -- crm_info("Processing graph %d (ref=%s) derived from %s", transition_graph->id, ref, -+ crm_notice("Processing graph %d (ref=%s) derived from %s", transition_graph->id, ref, - graph_input); + CRM_CHECK(controld_globals.transition_graph != NULL, + controld_globals.transition_graph = create_blank_graph(); + return); +- crm_info("Processing graph %d (ref=%s) derived from %s", ++ crm_notice("Processing graph %d (ref=%s) derived from %s", + controld_globals.transition_graph->id, ref, graph_input); te_reset_job_counts(); -Index: pacemaker-2.1.2+20220126.57e783b4b/daemons/fenced/fenced_remote.c +Index: pacemaker-2.1.5+20221208.cd0f91f51/daemons/fenced/fenced_remote.c =================================================================== ---- pacemaker-2.1.2+20220126.57e783b4b.orig/daemons/fenced/fenced_remote.c -+++ pacemaker-2.1.2+20220126.57e783b4b/daemons/fenced/fenced_remote.c -@@ -670,7 +670,7 @@ finalize_timed_out_op(remote_fencing_op_ +--- 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_ { op->op_timer_total = 0; diff --git a/pacemaker-2.1.5+20221208.a3f44794f.tar.xz b/pacemaker-2.1.5+20221208.a3f44794f.tar.xz deleted file mode 100644 index 93385ce..0000000 --- a/pacemaker-2.1.5+20221208.a3f44794f.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:79f7443aeaf42392570ead1b4b675c5f518421b5d19f00a1b851544c397aa0f2 -size 4102004 diff --git a/pacemaker-2.1.5+20221212.b4db7685a.tar.xz b/pacemaker-2.1.5+20221212.b4db7685a.tar.xz new file mode 100644 index 0000000..949ea99 --- /dev/null +++ b/pacemaker-2.1.5+20221212.b4db7685a.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1303ec8b27f35139cf7ae8ca969f5e744d5d4157cddb54b265e2eae93d5a441 +size 4121404 diff --git a/pacemaker.changes b/pacemaker.changes index f95826a..b83098f 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,98 @@ +------------------------------------------------------------------- +Thu Dec 22 12:59:33 UTC 2022 - Yan Gao + +- Update to version 2.1.5+20221212.b4db7685a: +- cts-scheduler: update test for preventing inactive instances from starting if probe is unrunnable on any nodes (bsc#1206263) +- scheduler: prevent inactive instances from starting if probe is unrunnable on any nodes (bsc#1206263) +- libpacemaker: ensure any pending recurring monitor gets updated if it fails (bsc#1206263) +- cts-scheduler: update test for preventing a leftover pending monitor from causing unexpected stop of other instances (bsc#1206263) +- scheduler: prevent a leftover pending monitor from causing unexpected stop of other instances (bsc#1206263) +- cts-scheduler: add test for preventing a leftover pending monitor from causing unexpected stop of other instances (bsc#1206263) + +------------------------------------------------------------------- +Thu Dec 22 12:50:26 UTC 2022 - Yan Gao + +- Update to version 2.1.5+20221212.074e9c860: +- tools: Support setting transient utilization attrs from crm_attribute. +- scheduler: Unpack transient utilization attributes. +- daemons: Add support for transient utilization attributes. +- libcrmcommon: Add a block attr to an IPC update request. +- tools: Add a -z option to attrd_updater. + +------------------------------------------------------------------- +Wed Dec 21 11:49:56 UTC 2022 - Yan Gao + +- Update to version 2.1.5+20221208.cd0f91f51: +- libcrmcommon: Warn if deprecated command line formats are used. +- controller: Don't nack joining node due to old CIB +- based: Successful CIB schema upgrade should always force a write +- based: Don't write to disk if CIB replace failed +- tools: Fix trivial memory leak in cibadmin +- based: Fix double free() in pacemaker-based.c +- libpe_status: avoid memory leak on regular expression error +- controller: Avoid election storm due to incompatible CIB +- libpacemaker: don't regfree() if regcomp() failed +- libpe_status: don't try to use compiled expression if regcomp() failed +- libcrmcommon: don't regfree() if regcomp() failed +- controller: Avoid error if a join request is received after fencing +- controller: Don't double-increment failcount for simulated failures +- daemons, tools: Unregister formats before exiting +- scheduler: Advertise metadata option in scheduler help output +- fencer: Use formatted output in pacemaker-fenced +- fencer: Correct refresh logic in update_cib_cache_cb() +- controller: Reduce CIB deletions during reprobe +- controller: Don't reprobe remotes when target is only cluster node +- add zh_cn translation for error (#2957) +- tools: Validate scope in cibadmin.c +- tools: Add status as valid cibadmin scope +- tools: Fix action danger check in cibadmin +- libcrmcommon: Null-check return value of pcmk__uid2username() +- daemons: Support cluster-wide sync points for multi IPC messages. +- tools: Fix scope/xpath parsing in cibadmin +- libcrmcommon: Bump feature set for daemon formatted output +- executor: Use formatted output in pacemaker-execd +- pacemaker-based: Use formatted output in pacemaker-based +- controller: Use formatted output in pacemaker-controld +- controller: Node exits fatally in response to join nack +- libcrmcommon: Retry pcmk_connect_ipc() if EAGAIN +- controller: Remove CRM_CHECK in update_dc for no current DC +- Pacemaker Explained: Clarify resource maintenance mode (CLBZ#5382) +- libpe_status: Node maintenance mode sets resource maintenance flag +- libpe_status: crm_mon shows "maintenance" for rsc maint meta +- schemas: resources schema supports maintenance attribute +- daemons: Check for NULL in attrd_do_not_expect_from_peer. +- tools: crm_mon fencing history is now in high resolution +- libpe_status: Use correct guint format specifier for failed action +- add zh_CN translation for pacemaker-schedulerd libexec +- daemons: Handle crm_ipc_new returning a NULL. +- tools: crm_mon now shows last_update origin +- schema: Add update origin to crm_mon output +- tools: crm_mon --daemonize should update when disconnected +- tools: Improve log messages in crm_mon.c +- tools: Remove an output format-based sleep() call from crm_mon +- tools: Include Pacemaker status in crm_mon output +- libcib: Preserve return code in cib__signon_query() +- libpacemaker: Use correct pcmkd state format in XML message +- daemons: Avoid infinite confirm loops in attrd. +- daemons: Handle an attrd client timing out. +- attrd: Fix removing clients from the waitlist when they disconnect. +- daemons: Handle cluster-wide sync points in attrd. +- daemons: Keep track of #attrd-protocol from each peer. +- daemons: Respond to received attrd confirmation requests. +- libpacemaker: Show pcmkd status if we can't get native CIB +- libpacemaker: Check conn status in pcmk__get_fencing_history() +- libcib: Allow cib client reuse in cib__signon_query() +- tools: Add --wait=cluster option to attrd_updater. +- libpacemaker: Improve invalid reply type logging in cluster queries +- includes: Bump CRM_FEATURE_SET for local sync points. +- daemons: Add support for local sync points on clearing failures. +- daemons: If a client disconnects, remove it from the waitlist. +- daemons: Add support for local sync points on updates. +- tools: Add --wait= parameter to attrd_updater. + +- Rebase: + * bug-806256_pacemaker-log-level-notice.patch + ------------------------------------------------------------------- Fri Dec 09 10:57:57 UTC 2022 - Yan Gao @@ -422,7 +517,7 @@ Thu Jul 21 12:35:27 UTC 2022 - Yan Gao Thu Jul 21 12:25:08 UTC 2022 - Yan Gao - Update to version 2.1.4+20220719.6bf20e794: -- tools: Fix a segfault in error handling in crm_resource. (clbz#5496) +- tools: Fix a segfault in error handling in crm_resource. (clbz#5496, bsc#1206761) ------------------------------------------------------------------- Thu Jul 21 12:15:11 UTC 2022 - Yan Gao @@ -2052,9 +2147,9 @@ Fri Oct 30 13:45:28 UTC 2020 - Yan Gao - controld: Avoiding Broken pipe when shutdown. - Stateful: add ability to return custom rc saved in state file - Dummy: add ability to return custom rc saved in state file -- Use effective OCF rc-code to avoid increasing failcount for DEGRADED statuses +- Use effective OCF rc-code to avoid increasing failcount for DEGRADED statuses (bsc#1205861) - tools: Don't display crm_resource error messages twice. -- Accept PCMK_OCF_DEGRADED and PCMK_OCF_DEGRADED_MASTER status codes +- Accept PCMK_OCF_DEGRADED and PCMK_OCF_DEGRADED_MASTER status codes (bsc#1205861) - libcrmservice: avoid dangling reference after DBus memory allocation error - libcrmservice: avoid double logging an error - libcrmservice: improve DBus log messages diff --git a/pacemaker.spec b/pacemaker.spec index f822fd7..aeda443 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -1,7 +1,7 @@ # # spec file for package pacemaker # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -104,7 +104,7 @@ %define with_regression_tests 0 Name: pacemaker -Version: 2.1.5+20221208.a3f44794f +Version: 2.1.5+20221212.b4db7685a Release: 0 Summary: Scalable High-Availability cluster resource manager # AGPL-3.0 licensed extra/clustermon.sh is not present in the binary