pool/pacemaker
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 955066 from network:ha-clustering:Factory

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/955066
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pacemaker?expand=0&rev=141
This commit is contained in:
Dominique Leuenberger 2022-02-16 23:30:14 +00:00 committed by Git OBS Bridge
commit 60472dd485
9 changed files with 260 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
0001-Fix-fencer-get-current-time-correctly.patch
View File

@ -1,43 +0,0 @@
From 0339e89f3238b31df78b864dae8684b82c370741 Mon Sep 17 00:00:00 2001
From: Ken Gaillot <kgaillot@redhat.com>
Date: Mon, 13 Dec 2021 15:22:40 -0600
Subject: [PATCH] Fix: fencer: get current time correctly
f52bc8e1ce (2.1.2) introduced a regression by using clock_gettime() with
CLOCK_MONOTONIC to get the current time. Use qb_util_timespec_from_epoch_get()
instead (which as of this writing uses clock_gettime() with CLOCK_REALTIME if
available, and falls back to gettimeofday() if not).
---
daemons/fenced/fenced_commands.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/daemons/fenced/fenced_commands.c b/daemons/fenced/fenced_commands.c
index f34cb4f13..7685cb8c3 100644
--- a/daemons/fenced/fenced_commands.c
+++ b/daemons/fenced/fenced_commands.c
@@ -2746,19 +2746,14 @@ bool fencing_peer_active(crm_node_t *peer)
return FALSE;
}
-void set_fencing_completed(remote_fencing_op_t * op)
+void
+set_fencing_completed(remote_fencing_op_t *op)
{
-#ifdef CLOCK_MONOTONIC
struct timespec tv;
- clock_gettime(CLOCK_MONOTONIC, &tv);
-
+ qb_util_timespec_from_epoch_get(&tv);
op->completed = tv.tv_sec;
op->completed_nsec = tv.tv_nsec;
-#else
- op->completed = time(NULL);
- op->completed_nsec = 0L;
-#endif
}
/*!
--
2.31.1

2
_service
View File

@ -11,7 +11,7 @@
<param name="version">2.1.2</param>
-->
<param name="versionformat">2.1.2+%cd.%h</param>
<param name="revision">Pacemaker-2.1.2</param>
<param name="revision">16c1bab10</param>
<param name="changesgenerate">enable</param>
</service>

2
_servicedata
View File

@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/ClusterLabs/pacemaker.git</param>
<param name="changesrevision">ada5c3b36e2adf1703d54d39f40a4b8628eca175</param>
<param name="changesrevision">16928cfc69136bc56b1574bee9966e0d5de73abd</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
Index: pacemaker-2.1.1+20211028.7ee8b5bdd/daemons/fenced/fenced_commands.c
Index: pacemaker-2.1.2+20211124.91f4bad83/daemons/fenced/fenced_commands.c
===================================================================
--- pacemaker-2.1.1+20211028.7ee8b5bdd.orig/daemons/fenced/fenced_commands.c
+++ pacemaker-2.1.1+20211028.7ee8b5bdd/daemons/fenced/fenced_commands.c
@@ -1068,6 +1068,7 @@ build_device_from_xml(xmlNode * msg)
--- pacemaker-2.1.2+20211124.91f4bad83.orig/daemons/fenced/fenced_commands.c
+++ pacemaker-2.1.2+20211124.91f4bad83/daemons/fenced/fenced_commands.c
@@ -1071,6 +1071,7 @@ build_device_from_xml(xmlNode * msg)
"on target", device->id, device->on_target_actions);
}
@ -16,11 +16,11 @@ Index: pacemaker-2.1.1+20211028.7ee8b5bdd/daemons/fenced/fenced_commands.c
device->work = mainloop_add_trigger(G_PRIORITY_HIGH, stonith_device_dispatch, device);
/* TODO: Hook up priority */
Index: pacemaker-2.1.1+20211028.7ee8b5bdd/lib/fencing/st_client.c
Index: pacemaker-2.1.2+20211124.91f4bad83/lib/fencing/st_actions.c
===================================================================
--- pacemaker-2.1.1+20211028.7ee8b5bdd.orig/lib/fencing/st_client.c
+++ pacemaker-2.1.1+20211028.7ee8b5bdd/lib/fencing/st_client.c
@@ -42,6 +42,7 @@ struct stonith_action_s {
--- pacemaker-2.1.2+20211124.91f4bad83.orig/lib/fencing/st_actions.c
+++ pacemaker-2.1.2+20211124.91f4bad83/lib/fencing/st_actions.c
@@ -31,6 +31,7 @@ struct stonith_action_s {
char *action;
char *victim;
GHashTable *args;
@ -28,15 +28,15 @@ Index: pacemaker-2.1.1+20211028.7ee8b5bdd/lib/fencing/st_client.c
int timeout;
int async;
void *userdata;
@@ -647,6 +648,7 @@ stonith__destroy_action(stonith_action_t
@@ -213,6 +214,7 @@ stonith__destroy_action(stonith_action_t
services_action_free(action->svc_action);
}
free(action->output);
free(action->error);
pcmk__reset_result(&(action->result));
+ free(action->dev_id);
free(action);
}
}
@@ -718,6 +720,8 @@ stonith_action_create(const char *agent,
@@ -261,6 +263,8 @@ stonith_action_create(const char *agent,
if (device_args) {
char buffer[512];
const char *value = NULL;
@ -45,7 +45,7 @@ Index: pacemaker-2.1.1+20211028.7ee8b5bdd/lib/fencing/st_client.c
snprintf(buffer, sizeof(buffer), "pcmk_%s_retries", _action);
value = g_hash_table_lookup(device_args, buffer);
@@ -725,6 +729,11 @@ stonith_action_create(const char *agent,
@@ -268,6 +272,11 @@ stonith_action_create(const char *agent,
if (value) {
action->max_retries = atoi(value);
}
@ -57,7 +57,7 @@ Index: pacemaker-2.1.1+20211028.7ee8b5bdd/lib/fencing/st_client.c
}
return action;
@@ -875,6 +884,10 @@ internal_stonith_action_execute(stonith_
@@ -605,6 +614,10 @@ internal_stonith_action_execute(stonith_
SVC_ACTION_NON_BLOCKED,
"SVC_ACTION_NON_BLOCKED");
@ -67,11 +67,11 @@ Index: pacemaker-2.1.1+20211028.7ee8b5bdd/lib/fencing/st_client.c
+
/* keep retries from executing out of control and free previous results */
if (is_retry) {
free(action->output);
Index: pacemaker-2.1.1+20211028.7ee8b5bdd/lib/services/services_linux.c
pcmk__reset_result(&(action->result));
Index: pacemaker-2.1.2+20211124.91f4bad83/lib/services/services_linux.c
===================================================================
--- pacemaker-2.1.1+20211028.7ee8b5bdd.orig/lib/services/services_linux.c
+++ pacemaker-2.1.1+20211028.7ee8b5bdd/lib/services/services_linux.c
--- pacemaker-2.1.2+20211124.91f4bad83.orig/lib/services/services_linux.c
+++ pacemaker-2.1.2+20211124.91f4bad83/lib/services/services_linux.c
@@ -29,6 +29,9 @@
#include "crm/services.h"
#include "crm/services_internal.h"

32
bug-806256_pacemaker-log-level-notice.patch
View File

@ -4,10 +4,10 @@ Date: Thu Mar 14 09:41:53 2013 +0800
Log: Change some messages to notice level (bnc#806256)
Index: pacemaker-2.0.5+20210104.8ae19fdf9/daemons/controld/controld_membership.c
Index: pacemaker-2.1.2+20220126.57e783b4b/daemons/controld/controld_membership.c
===================================================================
--- pacemaker-2.0.5+20210104.8ae19fdf9.orig/daemons/controld/controld_membership.c
+++ pacemaker-2.0.5+20210104.8ae19fdf9/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);
@ -17,26 +17,26 @@ Index: pacemaker-2.0.5+20210104.8ae19fdf9/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.0.5+20210104.8ae19fdf9/daemons/controld/controld_transition.c
Index: pacemaker-2.1.2+20220126.57e783b4b/daemons/controld/controld_transition.c
===================================================================
--- pacemaker-2.0.5+20210104.8ae19fdf9.orig/daemons/controld/controld_transition.c
+++ pacemaker-2.0.5+20210104.8ae19fdf9/daemons/controld/controld_transition.c
@@ -186,7 +186,7 @@ do_te_invoke(long long action,
transition_graph = create_blank_graph();
return;
}
--- pacemaker-2.1.2+20220126.57e783b4b.orig/daemons/controld/controld_transition.c
+++ pacemaker-2.1.2+20220126.57e783b4b/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);
te_reset_job_counts();
Index: pacemaker-2.0.5+20210104.8ae19fdf9/daemons/fenced/fenced_remote.c
Index: pacemaker-2.1.2+20220126.57e783b4b/daemons/fenced/fenced_remote.c
===================================================================
--- pacemaker-2.0.5+20210104.8ae19fdf9.orig/daemons/fenced/fenced_remote.c
+++ pacemaker-2.0.5+20210104.8ae19fdf9/daemons/fenced/fenced_remote.c
@@ -613,7 +613,7 @@ remote_op_timeout(gpointer userdata)
return FALSE;
}
--- 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_
{
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 "

3
pacemaker-2.1.2+20211124.ada5c3b36.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6e240106c50fa32b0b32834afd01cc5ebd44e6c0135ea963f27fbb7a101d714a
size 3494436

3
pacemaker-2.1.2+20220126.16c1bab10.tar.xz Normal file
View File

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

221
pacemaker.changes
View File

@ -1,3 +1,222 @@
-------------------------------------------------------------------
Tue Feb 08 11:57:53 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220126.16c1bab10:
- controller: correctly match "node down" events
- controller: improve meta-data warnings
- scheduler: assert on memory allocation error
- pacemakerd: improve messages for subdaemon handling
-------------------------------------------------------------------
Tue Feb 08 11:47:22 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220126.57e783b4b:
- libstonithd: avoid controld shutdown hanging
- pacemakerd: have signal-handler take care of lost processes
- scheduler: avoid memory leak when displaying clones
- Rebase:
* bug-806256_pacemaker-log-level-notice.patch
-------------------------------------------------------------------
Tue Feb 08 11:25:36 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220120.3f0398825:
- scheduler: implement utilization for bundles
- fencer: reset op result before grabbing new one (rh#1470834)
- schemas: update fence-event API schema for recent change (rh#1470834)
- fencing: display exit reasons with failed fencing events (rh#1470834)
- fencing: return exit reason with fencing history (rh#1470834)
- fencer: track full result in fencing history (rh#1470834)
-------------------------------------------------------------------
Tue Feb 08 08:54:11 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220119.2c937a4c0:
- ipc_client: use libqb async API for connect
- pacemakerd: keep tracking pacemakerd for liveness
- pacemakerd: tweak systemd unit respawn settings
-------------------------------------------------------------------
Tue Feb 08 08:22:23 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220119.eec504705:
- libcrmservice: improve exit reason for timeouts (rh#1470834)
- fencing: improve exit reason for fencing timeouts (rh#1470834)
- controller: improve exit reason for internal timeouts (rh#1470834)
- controller,libpacemaker: make history XML creation less chatty (rh#1470834)
- fencing: don't warn if cluster has no watchdog device (rh#1470834)
- libcrmcommon: don't say "Unknown error" (rh#1470834)
- libcrmcommon: improve description for "not connected" status (rh#1470834)
-------------------------------------------------------------------
Fri Feb 04 17:57:25 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220118.de344dc33:
- tools: Fix the show detail toggle in crm_mon.
- corosync: Repeat corosync_cfg_trackstart
- tools: Handle output format arguments before doing daemonize mode.
- libpacemaker: avoid unnecessary limit on node names
-------------------------------------------------------------------
Fri Feb 04 17:11:56 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220117.0fb17de37:
- tools: get stonith_admin -T option working again (rh#1470834)
- libpacemaker: compare fence action names case-sensitively
- libpacemaker: return exit reason for fencer connection failures
- tools: display failure reasons for stonith_admin fencing commands
- libpacemaker: improve result for high-level fencing API
- fencing: Don't set stonith action to pending if fork fails
-------------------------------------------------------------------
Fri Feb 04 16:14:08 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220114.fb2dcedf1:
- controller: compare case-sensitively where appropriate (rh#1470834)
- controller,tools: improve description for fencing alerts/traps (rh#1470834)
- controller: improve messages when handling fencing notifications (rh#1470834)
- controller: compare fencing targets case-insensitively (rh#1470834)
- scheduler: Use the old RC code to log maskable probe failures.
-------------------------------------------------------------------
Fri Feb 04 15:53:57 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220113.7c94f0367:
- liblrmd: Avoid double-free during notify operation (rh#2039675)
-------------------------------------------------------------------
Fri Feb 04 14:31:35 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220112.b496b9826:
- low: Remove "formerly called..." text in metadata output.
- tools: Free metadata memory in crm_resource.
- daemons: Use formatted output for metadata in schedulerd.
-------------------------------------------------------------------
Fri Feb 04 13:53:42 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220112.c894b0aff:
- fencing: add exit reason for results without a callback (rh#1470834)
- executor: set exit reason if no fencer connection (rh#1470834)
- executor: return an error for unsupported fence device actions (rh#1470834)
- executor: don't require a fencer connection for probes (rh#1470834)
- executor: improve result for fence device probes (rh#1470834)
- executor,scheduler: treat "no secrets" fence results as a hard error (rh#1470834)
- executor: use full result from fencer for fence actions (rh#1470834)
- controller: improve fencing result messages (rh#1470834)
-------------------------------------------------------------------
Fri Feb 04 13:27:31 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220112.69a63fb99:
- scheduler: Handle masked probes in the scheduler. (rh#1506372)
- include: Bump feature set to 3.12.0.
- scheduler: Display the reason why a clone rsc probe failed. (rh#1506372)
- scheduler: Display the reason why a native rsc probe failed. (rh#1506372)
- scheduler: Don't output failed resource probes... (rh#1506372)
-------------------------------------------------------------------
Fri Feb 04 12:42:31 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20220112.08200a00e:
- scheduler: use plural correctly for fail count messages
- libcrmcommon: avoid file resource leak on decompression errors (clbz#5489)
- Rebase:
* bug-806256_pacemaker-log-level-notice.patch
-------------------------------------------------------------------
Fri Feb 04 12:21:46 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20211223.94ced1fa9:
- fencer: clarify timeout message (rh#1470834)
- fencer: free result memory when processing fencing replies (rh#1470834)
- fencer: restore check for invalid topology level target (rh#1470834)
- fencer: pass full result when sending notifications (rh#1470834)
- fencer: add full result to local replies (rh#1470834)
- fencer: set exit reasons for fencing timeouts (rh#1470834)
- fencer: set exit reason for timeouts waiting for peer replies (rh#1470834)
- fencer: grab and log full result when processing peer fencing replies (rh#1470834)
- fencer: pass full result in replies to requests (rh#1470834)
- fencer: track and log full result when handling requests (rh#1470834)
- fencer: handle topology level unregistration errors better (rh#1470834)
- fencer: handle topology level registration errors better (rh#1470834)
- fencer: pass full result in async command replies (rh#1470834)
-------------------------------------------------------------------
Fri Feb 04 11:24:19 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20211222.90769ae96:
- libpacemaker: catch bugs scheduling actions on unclean nodes
-------------------------------------------------------------------
Fri Feb 04 10:51:30 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20211215.5f767500a:
- fencer: get current time correctly
- Merge:
* 0001-Fix-fencer-get-current-time-correctly.patch
- Rebase:
* bug-806256_pacemaker-log-level-notice.patch
-------------------------------------------------------------------
Fri Feb 04 10:38:51 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20211208.e3c53cabb:
- fencer: avoid memory leak when broadcasting history differences
-------------------------------------------------------------------
Fri Feb 04 10:15:06 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20211206.3a6dc7c79:
- scheduler: handle memory errors explicitly for friendly failure output
- resources: use correct syntax in Stateful meta-data (rh#2027370)
- resources: remove DOCTYPE from OCF 1.1-compliant agents
- libcib: deprecate get_object_path() (clbz#5488)
- various: perform XPath searches for CIB element names case-sensitively
- libcib: compare section names case-sensitively for CIB modifications
- controller,libcib,tools: handle CIB XPath searches better
-------------------------------------------------------------------
Fri Feb 04 09:50:42 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20211201.c93f6a460:
- fencer: handle malformed topology level removal requests better (rh#1470834)
- fencer: handle malformed manual confirmation requests better (rh#1470834)
- fencer: return -ETIME for peer fencing timeouts (rh#1470834)
- fencer: improve broadcasting replies for fenced originators (rh#1470834)
- fencer,scheduler: compare fence action names case-sensitively (rh#1470834)
-------------------------------------------------------------------
Thu Feb 03 17:02:58 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20211201.18f4b5d83:
- OCF: controld: Give warning when no-quorum-policy not set as freeze while using DLM (bsc#1129707)
- libcrmservice: Handle systemd service templates. (rh#2003151)
-------------------------------------------------------------------
Thu Feb 03 16:37:12 UTC 2022 - Yan Gao <ygao@suse.com>
- Update to version 2.1.2+20211124.91f4bad83:
- fencing: improve message for callback errors (rh#1470834)
- fencing,executor: improve mapping of legacy return code to execution status (rh#1470834)
- fencing: improve mapping of execution status to legacy return code
- attrd: Change to determine the processing of attrd depending on the section replacement location of CIB.
- based controld: Suppresses unnecessary Election execution.
- based: Makes the replace notification a comparison base for the hash value of the section.
- daemons: Convert schedulerd to the new IPC API.
- daemons: Use formatted output for scheduler help, errors, etc.
- Add a 'name' attribute to acl_target and acl_group elements (rh#1384420)
- libcrmservice: downgrade failed action messages (rh#1470834)
- fencer: improve messages for asynchronous results (rh#1470834)
- fencer: handle dynamic target query failures better (rh#1470834)
- fencing: set exit reason for internal execution errors (rh#1470834)
- Rebase:
* bug-728579_pacemaker-stonith-dev-id.patch
-------------------------------------------------------------------
Wed Dec 22 13:36:05 UTC 2021 - Yan Gao <ygao@suse.com>
@ -1750,7 +1969,7 @@ Fri Jul 05 10:14:13 UTC 2019 - Yan Gao <ygao@suse.com>
Fri Jun 07 10:39:45 UTC 2019 - Yan Gao <ygao@suse.com>
- Update to version 2.0.2+20190606.73beea82f:
- stonith-ng's function cannot be blocked with CIB updates forever
- stonith-ng's function cannot be blocked with CIB updates forever (bsc#1188212)
- libpe_status: offer compile-time option to change concurrent-fencing default
- libstonithd: return proper error code for async stonith action
- various: improve fencer connection messages

4
pacemaker.spec
View File

@ -106,7 +106,7 @@
%define with_regression_tests 0
Name: pacemaker
Version: 2.1.2+20211124.ada5c3b36
Version: 2.1.2+20220126.16c1bab10
Release: 0
Summary: Scalable High-Availability cluster resource manager
# AGPL-3.0 licensed extra/clustermon.sh is not present in the binary
@ -128,7 +128,6 @@ Patch7: bug-977201_pacemaker-controld-self-fencing.patch
Patch8: bug-995365_pacemaker-cts-restart-systemd-journald.patch
Patch9: pacemaker-cts-StartCmd.patch
Patch10: bsc#1180966-0001-Log-pacemakerd-downgrade-the-warning-about-SBD_SYNC_.patch
Patch11: 0001-Fix-fencer-get-current-time-correctly.patch
# Required for core functionality
BuildRequires: autoconf
BuildRequires: automake
@ -351,7 +350,6 @@ manager.
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%build