rpm/pacemaker
SHA256
1
0
Fork 0
forked from pool/pacemaker
Code Pull Requests Activity

Accepting request 1248015 from network:ha-clustering:Factory

Browse Source 
- Update to version 3.0.0+20250218.3d0ffefd9e:
- build: Fix default pacemaker-remoted path

- Update to version 3.0.0+20250210.af3642fbf6:
- libcrmcluster: prevent external callers from triggering assertion when connecting to cluster (gh#ClusterLabs/pacemaker#3821)

- Update to version 3.0.0+20250207.d06c888ba7:
- libpacemaker: Reset scheduler object in pcmk_simulate()
- libpe_status: Make cluster_status() idempotent
- tools: Fix overflow in crm_simulate --repeat
- libpacemaker: Handle scandir() error in pcmk__profile_dir()
- libpacemaker: Fix mem leak in pcmk__profile_dir()
- tools: Avoid crash in crm_simulate --profile

- Update to version 3.0.0+20250205.88e9ec1325:
- libcrmservices: Unref the dbus connection... (gh#ClusterLabs/pacemaker#3816)
- libcrmservices: Don't leak msg if systemd_proxy is NULL. (gh#ClusterLabs/pacemaker#3816)

- Update to version 3.0.0+20250203.f950b1d05d:
- python: Add python value for new CRM_EX_NO_DC exit code. (gh#ClusterLabs/pacemaker#3815)
- libcrmcommon: Fix memory leak in text_end_list()/curses_end_list() (gh#ClusterLabs/pacemaker#3814)
- crmadmin: return error if DC is not elected #2902 #3606 (gh#ClusterLabs/pacemaker#3716)

- Update to version 3.0.0+20250128.0de22e5f75:
- libraries: Update version numbers in so names
- Rebase:
  * bug-995365_pacemaker-cts-restart-systemd-journald.patch

- Update to version 3.0.0+20250114.7dc494a96f:
- controller: best practices for send_stonith_update() (gh#ClusterLabs/pacemaker#3796) (forwarded request 1248014 from yan_gao)

OBS-URL: https://build.opensuse.org/request/show/1248015
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pacemaker?expand=0&rev=162
This commit is contained in:
Dominique Leuenberger 2025-02-25 15:39:08 +00:00 committed by Git OBS Bridge
commit 6ab0dccf8e
8 changed files with 173 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_service
View File

@ -11,7 +11,7 @@
<param name="version">3.0.0</param> <param name="version">3.0.0</param>
--> -->
<param name="versionformat">3.0.0+%cd.%h</param> <param name="versionformat">3.0.0+%cd.%h</param>
<param name="revision">fa492f5181</param> <param name="revision">3d0ffefd9e</param>
<param name="changesgenerate">enable</param> <param name="changesgenerate">enable</param>
</service> </service>

2
_servicedata
View File

@ -5,4 +5,4 @@
</service> </service>
<service name="tar_scm"> <service name="tar_scm">
<param name="url">https://github.com/ClusterLabs/pacemaker.git</param> <param name="url">https://github.com/ClusterLabs/pacemaker.git</param>
<param name="changesrevision">dc802bfe4bebd89448b53e42dcc5d022905a4215</param></service></servicedata> <param name="changesrevision">3d0ffefd9e1f92ec333e66006c2f0f6da1168566</param></service></servicedata>

36
bug-728579_pacemaker-stonith-dev-id.patch
View File

@ -4,11 +4,11 @@ Date: Thu Sep 6 15:14:58 2012 +0800
Medium: stonith: Expose IDs of stonith resources to stonith agents through "$CRM_meta_st_device_id" environment variable Medium: stonith: Expose IDs of stonith resources to stonith agents through "$CRM_meta_st_device_id" environment variable
Index: pacemaker-2.1.7+20240208.bc5596299/daemons/fenced/fenced_commands.c Index: pacemaker-3.0.0+20250114.9931db7727/daemons/fenced/fenced_commands.c
=================================================================== ===================================================================
--- pacemaker-2.1.7+20240208.bc5596299.orig/daemons/fenced/fenced_commands.c --- pacemaker-3.0.0+20250114.9931db7727.orig/daemons/fenced/fenced_commands.c
+++ pacemaker-2.1.7+20240208.bc5596299/daemons/fenced/fenced_commands.c +++ pacemaker-3.0.0+20250114.9931db7727/daemons/fenced/fenced_commands.c
@@ -1151,6 +1151,7 @@ build_device_from_xml(xmlNode *dev) @@ -1085,6 +1085,7 @@ build_device_from_xml(xmlNode *dev)
(const char *) device->on_target_actions->str); (const char *) device->on_target_actions->str);
} }
@ -16,10 +16,10 @@ Index: pacemaker-2.1.7+20240208.bc5596299/daemons/fenced/fenced_commands.c
device->work = mainloop_add_trigger(G_PRIORITY_HIGH, stonith_device_dispatch, device); device->work = mainloop_add_trigger(G_PRIORITY_HIGH, stonith_device_dispatch, device);
/* TODO: Hook up priority */ /* TODO: Hook up priority */
Index: pacemaker-2.1.7+20240208.bc5596299/lib/fencing/st_actions.c Index: pacemaker-3.0.0+20250114.9931db7727/lib/fencing/st_actions.c
=================================================================== ===================================================================
--- pacemaker-2.1.7+20240208.bc5596299.orig/lib/fencing/st_actions.c --- pacemaker-3.0.0+20250114.9931db7727.orig/lib/fencing/st_actions.c
+++ pacemaker-2.1.7+20240208.bc5596299/lib/fencing/st_actions.c +++ pacemaker-3.0.0+20250114.9931db7727/lib/fencing/st_actions.c
@@ -31,6 +31,7 @@ struct stonith_action_s { @@ -31,6 +31,7 @@ struct stonith_action_s {
char *agent; char *agent;
char *action; char *action;
@ -28,7 +28,7 @@ Index: pacemaker-2.1.7+20240208.bc5596299/lib/fencing/st_actions.c
int timeout; int timeout;
bool async; bool async;
void *userdata; void *userdata;
@@ -224,6 +225,7 @@ stonith__destroy_action(stonith_action_t @@ -225,6 +226,7 @@ stonith__destroy_action(stonith_action_t
services_action_free(action->svc_action); services_action_free(action->svc_action);
} }
pcmk__reset_result(&(action->result)); pcmk__reset_result(&(action->result));
@ -36,7 +36,7 @@ Index: pacemaker-2.1.7+20240208.bc5596299/lib/fencing/st_actions.c
free(action); free(action);
} }
} }
@@ -284,6 +286,8 @@ stonith__action_create(const char *agent @@ -283,6 +285,8 @@ stonith__action_create(const char *agent
if (device_args) { if (device_args) {
char buffer[512]; char buffer[512];
const char *value = NULL; const char *value = NULL;
@ -45,7 +45,7 @@ Index: pacemaker-2.1.7+20240208.bc5596299/lib/fencing/st_actions.c
snprintf(buffer, sizeof(buffer), "pcmk_%s_retries", action_name); snprintf(buffer, sizeof(buffer), "pcmk_%s_retries", action_name);
value = g_hash_table_lookup(device_args, buffer); value = g_hash_table_lookup(device_args, buffer);
@@ -291,6 +295,11 @@ stonith__action_create(const char *agent @@ -290,6 +294,11 @@ stonith__action_create(const char *agent
if (value) { if (value) {
action->max_retries = atoi(value); action->max_retries = atoi(value);
} }
@ -57,9 +57,9 @@ Index: pacemaker-2.1.7+20240208.bc5596299/lib/fencing/st_actions.c
} }
return action; return action;
@@ -628,6 +637,10 @@ internal_stonith_action_execute(stonith_ @@ -648,6 +657,10 @@ internal_stonith_action_execute(stonith_
SVC_ACTION_NON_BLOCKED, return -E2BIG;
"SVC_ACTION_NON_BLOCKED"); }
+ if (action->dev_id) { + if (action->dev_id) {
+ svc_action->rsc = strdup(action->dev_id); + svc_action->rsc = strdup(action->dev_id);
@ -68,11 +68,11 @@ Index: pacemaker-2.1.7+20240208.bc5596299/lib/fencing/st_actions.c
/* keep retries from executing out of control and free previous results */ /* keep retries from executing out of control and free previous results */
if (is_retry) { if (is_retry) {
pcmk__reset_result(&(action->result)); pcmk__reset_result(&(action->result));
Index: pacemaker-2.1.7+20240208.bc5596299/lib/services/services_linux.c Index: pacemaker-3.0.0+20250114.9931db7727/lib/services/services_linux.c
=================================================================== ===================================================================
--- pacemaker-2.1.7+20240208.bc5596299.orig/lib/services/services_linux.c --- pacemaker-3.0.0+20250114.9931db7727.orig/lib/services/services_linux.c
+++ pacemaker-2.1.7+20240208.bc5596299/lib/services/services_linux.c +++ pacemaker-3.0.0+20250114.9931db7727/lib/services/services_linux.c
@@ -29,6 +29,9 @@ @@ -25,6 +25,9 @@
#include "crm/services.h" #include "crm/services.h"
#include "crm/services_internal.h" #include "crm/services_internal.h"
@ -82,7 +82,7 @@ Index: pacemaker-2.1.7+20240208.bc5596299/lib/services/services_linux.c
#include "services_private.h" #include "services_private.h"
static void close_pipe(int fildes[]); static void close_pipe(int fildes[]);
@@ -406,6 +409,15 @@ static void @@ -446,6 +449,15 @@ static void
add_action_env_vars(const svc_action_t *op) add_action_env_vars(const svc_action_t *op)
{ {
void (*env_setter)(gpointer, gpointer, gpointer) = NULL; void (*env_setter)(gpointer, gpointer, gpointer) = NULL;

14
bug-995365_pacemaker-cts-restart-systemd-journald.patch
View File

@ -1,7 +1,7 @@
Index: pacemaker-2.1.9+20241118.394d77ec98/python/pacemaker/_cts/audits.py Index: pacemaker-3.0.0+20250128.0de22e5f75/python/pacemaker/_cts/audits.py
=================================================================== ===================================================================
--- pacemaker-2.1.9+20241118.394d77ec98.orig/python/pacemaker/_cts/audits.py --- pacemaker-3.0.0+20250128.0de22e5f75.orig/python/pacemaker/_cts/audits.py
+++ pacemaker-2.1.9+20241118.394d77ec98/python/pacemaker/_cts/audits.py +++ pacemaker-3.0.0+20250128.0de22e5f75/python/pacemaker/_cts/audits.py
@@ -82,13 +82,9 @@ class LogAudit(ClusterAudit): @@ -82,13 +82,9 @@ class LogAudit(ClusterAudit):
for node in nodes: for node in nodes:
@ -9,12 +9,12 @@ Index: pacemaker-2.1.9+20241118.394d77ec98/python/pacemaker/_cts/audits.py
- (rc, _) = self._cm.rsh(node, "systemctl stop systemd-journald.socket") - (rc, _) = self._cm.rsh(node, "systemctl stop systemd-journald.socket")
+ (rc, _) = self._cm.rsh(node, "systemctl restart systemd-journald.socket") + (rc, _) = self._cm.rsh(node, "systemctl restart systemd-journald.socket")
if rc != 0: if rc != 0:
- self._cm.log("ERROR: Cannot stop 'systemd-journald' on %s" % node) - self._cm.log(f"ERROR: Cannot stop 'systemd-journald' on {node}")
- -
- (rc, _) = self._cm.rsh(node, "systemctl start systemd-journald.service") - (rc, _) = self._cm.rsh(node, "systemctl start systemd-journald.service")
- if rc != 0: - if rc != 0:
- self._cm.log("ERROR: Cannot start 'systemd-journald' on %s" % node) - self._cm.log(f"ERROR: Cannot start 'systemd-journald' on {node}")
+ self._cm.log("ERROR: Cannot restart 'systemd-journald' on %s" % node) + self._cm.log(f"ERROR: Cannot restart 'systemd-journald' on {node}")
if "syslogd" in self._cm.env: if "syslogd" in self._cm.env:
(rc, _) = self._cm.rsh(node, "service %s restart" % self._cm.env["syslogd"]) (rc, _) = self._cm.rsh(node, f"service {self._cm.env['syslogd']} restart")

BIN
pacemaker-3.0.0+20250128.fa492f5181.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

3
pacemaker-3.0.0+20250218.3d0ffefd9e.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:990e57675d841cbc955bef49c72733c6fc2d7d54666298676bbf108832db75c3
size 5359832

142
pacemaker.changes
View File

@ -1,3 +1,145 @@
-------------------------------------------------------------------
Fri Feb 21 09:34:47 UTC 2025 - Yan Gao <ygao@suse.com>
- Update to version 3.0.0+20250218.3d0ffefd9e:
- build: Fix default pacemaker-remoted path
-------------------------------------------------------------------
Fri Feb 21 09:12:35 UTC 2025 - Yan Gao <ygao@suse.com>
- Update to version 3.0.0+20250210.af3642fbf6:
- libcrmcluster: prevent external callers from triggering assertion when connecting to cluster (gh#ClusterLabs/pacemaker#3821)
-------------------------------------------------------------------
Fri Feb 21 09:03:55 UTC 2025 - Yan Gao <ygao@suse.com>
- Update to version 3.0.0+20250207.d06c888ba7:
- libpacemaker: Reset scheduler object in pcmk_simulate()
- libpe_status: Make cluster_status() idempotent
- tools: Fix overflow in crm_simulate --repeat
- libpacemaker: Handle scandir() error in pcmk__profile_dir()
- libpacemaker: Fix mem leak in pcmk__profile_dir()
- tools: Avoid crash in crm_simulate --profile
-------------------------------------------------------------------
Wed Feb 19 17:01:34 UTC 2025 - Yan Gao <ygao@suse.com>
- Update to version 3.0.0+20250205.88e9ec1325:
- libcrmservices: Unref the dbus connection... (gh#ClusterLabs/pacemaker#3816)
- libcrmservices: Don't leak msg if systemd_proxy is NULL. (gh#ClusterLabs/pacemaker#3816)
-------------------------------------------------------------------
Wed Feb 19 13:58:59 UTC 2025 - Yan Gao <ygao@suse.com>
- Update to version 3.0.0+20250203.f950b1d05d:
- python: Add python value for new CRM_EX_NO_DC exit code. (gh#ClusterLabs/pacemaker#3815)
- libcrmcommon: Fix memory leak in text_end_list()/curses_end_list() (gh#ClusterLabs/pacemaker#3814)
- crmadmin: return error if DC is not elected #2902 #3606 (gh#ClusterLabs/pacemaker#3716)
-------------------------------------------------------------------
Tue Feb 18 15:11:05 UTC 2025 - Yan Gao <ygao@suse.com>
- Update to version 3.0.0+20250128.0de22e5f75:
- libraries: Update version numbers in so names
- Rebase:
* bug-995365_pacemaker-cts-restart-systemd-journald.patch
-------------------------------------------------------------------
Mon Feb 17 20:29:03 UTC 2025 - Yan Gao <ygao@suse.com>
- Update to version 3.0.0+20250114.7dc494a96f:
- controller: best practices for send_stonith_update() (gh#ClusterLabs/pacemaker#3796)
- controller: drop unused argument
- libcrmcluster: better detect remote nodes in peer cache
- pacemaker-attrd: drop unused struct member
- pacemaker-attrd: track node XML IDs independent of attribute values
- pacemaker-attrd: use variable for whether to write
- pacemaker-attrd: rename flag to match recent change
- pacemaker-attrd: track node CIB ID rather than cluster ID
- libcrmcluster: track local node XML ID in cluster object
- libcrmcluster: use pcmk__cluster_get_xml_id() when possible
- libcrmcluster: rename pcmk__cluster_node_uuid()
- libcrmcluster: allow searching by XML ID in pcmk__search_node_caches()
- pacemaker-attrd: bail earlier if value won't be written
- pacemaker-attrd: use API to get peer XML ID
- pacemaker-attrd: don't use "uuid" to mean "XML ID"
- pacemaker-attrd: always add remoteness to attribute value XML (gh#ClusterLabs/pacemaker#3796)
-------------------------------------------------------------------
Mon Feb 17 19:50:01 UTC 2025 - Yan Gao <ygao@suse.com>
- Update to version 3.0.0+20250114.9931db7727:
- Makefile: drop asciidoc references
- crm_diff: Replace variable name
- controller: address format-overflow warnings (gh#ClusterLabs/pacemaker#3794)
- libcrmcommon: Catch correct errors for remote connection sockets (gh#ClusterLabs/pacemaker#3793)
- Drop deprecated '--sync-call' option from cibadmin
- Drop deprecated '-l/--local' option from cibadmin in multiple places
- various: Correct some printf specifiers (gh#ClusterLabs/pacemaker#3793)
- schedulerd: Resetting error and warning flags. (gh#ClusterLabs/pacemaker#3791)
- raise minimum GnuTLS dependency to 3.4.6
- sysconfig: document when logs may show sensitive info
- pacemaker-attrd: reduce log spam at shutdown
- executor: avoid misleading log when cancelling a recurring monitor
- scheduler: improve restart-needed log
- scheduler: don't show node capacity for bundle nodes
- scheduler: clarify no-quorum effects
- libcrmcommon: improve flag set/clear messages
- libcrmcommon: improve message for unsupported XPath match
- libstonithd: improve action re-attempt message
- libcib: Don't send CRM_OP_REGISTER from cib_remote client
- tools: mention potential issues with crm_resource --restart
- tools: indicate crm_resource --interval can take units
- tools: clarify that crm_mon updates are automatic when interactive
- controller: round timeout when checking remaining remote command time (gh#ClusterLabs/pacemaker#3781)
- agents: Replace the egrep command with the EGREP definition in ping RA
- libcrmcluster: fix format typos
- doc: drop Inkscape dependency
- tools: validate stonith_admin --timeout value
- libpacemaker: set fail-count to INFINITY for fatal failures
- libpacemaker: add PCMK__XA_FAILED_START_OFFSET and PCMK__XA_FAILED_STOP_OFFSET
- tools: Deprecate cibadmin --sync-call
- OCF: controld.in: Remove gfs_controld command as it's already obsoleted
- xml: Warn about post-transform behavior changes for ACLs with xpath
- sysconfig: Document using certificates for remote nodes.
- sysconfig: Explain permissions needed on TLS-related files.
- libcrmcluster: restore CPG header size compatibility
- libcrmcluster: improve messages in pcmk__cpg_message_data()
- liblrmd: Enable TLS support for Pacemaker Remote clients.
- daemons: Enable TLS support for Pacemaker Remote nodes.
- libcrmcommon: Set *tls = NULL in a few more locations.
- libcib: Enable TLS certs for remote CIB operations.
- libs: Log if a TLS certificate is close to expiration.
- libcrmcommon: If the server supports certs, require them...
- daemons: Set up X509 auth in based if enabled.
- sysconfig: Add env settings needed for X509 authentication.
- libcrmcluster: don't assert for CPG decompression error
- libcrmcluster: avoid redundant log for invalid CPG messages
- libcrmcluster: initialize from in pcmk__cpg_message_data()
- scheduler: avoid memory leak in bundles
- xml: Preserve ACL reference behavior for replaced constraints
- xml: Ensure ACL permissions are valid after XSL transformations
- xml: Warn if schema transformation drops remove-after-stop property
- xml: Warn if schema transformation drops moon phase
- xml: Info if schema transformation drops empty groups or clones
- xml: Warn if schema transformation drops colocation/order lifetimes
- xml: Warn if schema transformation drops can_fail or...
- xml: Warn if schema transformation drops restart-type meta-attr
- xml: Warn if schema transformation drops rkt bundles
- xml: Warn if schema transformation drops nagios/upstart resources
- log: Allow CIB upgrade messages to start with W, I, D
- various: clean up library memory at child exit
- pacemaker-remoted: improve exit codes for schema failures
- controller: avoid memory leak when updating join phase
- scheduler: avoid memory leak when freeing node copies
- libcrmcommon: drop unhelpful trace message
- systemd: If the state is Pending at the time of probe, execute follow up monitor. (gh#ClusterLabs/pacemaker#3746)
- systemd: Fix when monitor of systemd resource continues to be pending. (gh#ClusterLabs/pacemaker#3746)
- Rebase:
* bug-728579_pacemaker-stonith-dev-id.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 03 10:44:36 UTC 2025 - Yan Gao <ygao@suse.com> Mon Feb 03 10:44:36 UTC 2025 - Yan Gao <ygao@suse.com>

3
pacemaker.spec
View File

@ -121,7 +121,7 @@
%define with_regression_tests 0 %define with_regression_tests 0
Name: pacemaker Name: pacemaker
Version: 3.0.0+20250128.fa492f5181 Version: 3.0.0+20250218.3d0ffefd9e
Release: 0 Release: 0
Summary: Scalable High-Availability cluster resource manager Summary: Scalable High-Availability cluster resource manager
# AGPL-3.0 licensed extra/clustermon.sh is not present in the binary # AGPL-3.0 licensed extra/clustermon.sh is not present in the binary
@ -213,7 +213,6 @@ BuildRequires: cluster-glue-libs-devel
%endif %endif
%endif %endif
%if %{with doc} %if %{with doc}
BuildRequires: asciidoc
BuildRequires: python3-sphinx BuildRequires: python3-sphinx
%endif %endif
%if %{with_regression_tests} %if %{with_regression_tests}