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

Accepting request 868329 from home:yan_gao:branches:network:ha-clustering:Factory

Browse Source 
- pacemakerd: downgrade the warning about SBD_SYNC_RESOURCE_STARTUP to notice (bsc#1180966)
  * bsc#1180966-0001-Log-pacemakerd-downgrade-the-warning-about-SBD_SYNC_.patch

- Update to version 2.0.5+20210104.8ae19fdf9:
- attrd: prevent leftover attributes of shutdown node in cib (bsc#1173668)

- Update to version 2.0.5+20201218.c67665496:
- books: enable Sphinx build
- books: remove Publican
- xml: Update XML schema for crm_resource changes.
- libpacemaker: Also flatten XML location constraint output.
- libpacemaker: Various small fixes to location-list.
- libpacemaker: Fix printing out location constraints.
- libpacemaker: Correct loop detection in rscs_colocated_with_list.
- libpacemaker: Flatten XML output for colocations.
- libpacemaker: Pass the correct resource to recursive calls.
- tools: Don't display generic lists for colocations and constraints.
- libpacemaker: Change the colocation list headings.
- libpacemaker: Don't show an empty locations list.
- libcrmcluster: properly check CPG payload size
- libcrmcluster: correctly return error for invalid payload size
- libcrmcommon: set errno properly on IPC connection failure
- scheduler: Don't output a resource header with no list.
- libcib: Cleanup at signoff.Fix(CLBZ#5457)
- scheduler: add class back to multiple recovery message
- fencer: standardize fence device references in log messages
- fencer: improve wording of various messages
- fencer: correct order of arguments to a message
- fencer: log operation IDs more consistently
- fencer: log operation state as readable string rather than integer enum value

OBS-URL: https://build.opensuse.org/request/show/868329
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=345
This commit is contained in:
Yan Gao 2021-02-01 10:34:27 +00:00 committed by Git OBS Bridge
parent 32e626790c
commit c43bb90be9
10 changed files with 179 additions and 52 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">2.0.5</param>
-->
<param name="versionformat">2.0.5+%cd.%h</param>
<param name="revision">Pacemaker-2.0.5</param>
<param name="revision">8ae19fdf9</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">ba59be71228fed04f78ab374dfac748d314d0e89</param>
<param name="changesrevision">8ae19fdf91765d679140f05c3e3ea4669711f624</param>
</service>
</servicedata>

26
bsc#1180966-0001-Log-pacemakerd-downgrade-the-warning-about-SBD_SYNC_.patch Normal file
View File

@ -0,0 +1,26 @@
From d26a6ad01bd046e318dd3ca4512bcf09f8bf9568 Mon Sep 17 00:00:00 2001
From: "Gao,Yan" <ygao@suse.com>
Date: Fri, 29 Jan 2021 13:32:23 +0100
Subject: [PATCH] Log: pacemakerd: downgrade the warning about
SBD_SYNC_RESOURCE_STARTUP to notice
---
daemons/pacemakerd/pacemakerd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/daemons/pacemakerd/pacemakerd.c b/daemons/pacemakerd/pacemakerd.c
index 509b0f824..157df72ad 100644
--- a/daemons/pacemakerd/pacemakerd.c
+++ b/daemons/pacemakerd/pacemakerd.c
@@ -1325,7 +1325,7 @@ main(int argc, char **argv)
startup_trigger = mainloop_add_trigger(G_PRIORITY_HIGH, init_children_processes, NULL);
} else {
if (running_with_sbd) {
- crm_warn("Enabling SBD_SYNC_RESOURCE_STARTUP would (if supported "
+ crm_notice("Enabling SBD_SYNC_RESOURCE_STARTUP would (if supported "
"by your SBD version) improve reliability of "
"interworking between SBD & pacemaker.");
}
--
2.26.2

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

@ -4,23 +4,23 @@ 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.0.4+20201012.0cc17c01e/daemons/fenced/fenced_commands.c
Index: pacemaker-2.0.5+20210104.8ae19fdf9/daemons/fenced/fenced_commands.c
===================================================================
--- pacemaker-2.0.4+20201012.0cc17c01e.orig/daemons/fenced/fenced_commands.c
+++ pacemaker-2.0.4+20201012.0cc17c01e/daemons/fenced/fenced_commands.c
@@ -931,6 +931,7 @@ build_device_from_xml(xmlNode * msg)
device->id, device->on_target_actions);
--- pacemaker-2.0.5+20210104.8ae19fdf9.orig/daemons/fenced/fenced_commands.c
+++ pacemaker-2.0.5+20210104.8ae19fdf9/daemons/fenced/fenced_commands.c
@@ -937,6 +937,7 @@ build_device_from_xml(xmlNode * msg)
"on target", device->id, device->on_target_actions);
}
+ g_hash_table_insert(device->params, strdup(CRM_META "_" F_STONITH_DEVICE), strdup(device->id));
device->work = mainloop_add_trigger(G_PRIORITY_HIGH, stonith_device_dispatch, device);
/* TODO: Hook up priority */
Index: pacemaker-2.0.4+20201012.0cc17c01e/lib/fencing/st_client.c
Index: pacemaker-2.0.5+20210104.8ae19fdf9/lib/fencing/st_client.c
===================================================================
--- pacemaker-2.0.4+20201012.0cc17c01e.orig/lib/fencing/st_client.c
+++ pacemaker-2.0.4+20201012.0cc17c01e/lib/fencing/st_client.c
@@ -39,6 +39,7 @@ struct stonith_action_s {
--- pacemaker-2.0.5+20210104.8ae19fdf9.orig/lib/fencing/st_client.c
+++ pacemaker-2.0.5+20210104.8ae19fdf9/lib/fencing/st_client.c
@@ -40,6 +40,7 @@ struct stonith_action_s {
char *action;
char *victim;
GHashTable *args;
@ -28,7 +28,7 @@ Index: pacemaker-2.0.4+20201012.0cc17c01e/lib/fencing/st_client.c
int timeout;
int async;
void *userdata;
@@ -593,6 +594,7 @@ stonith__destroy_action(stonith_action_t
@@ -586,6 +587,7 @@ stonith__destroy_action(stonith_action_t
}
free(action->output);
free(action->error);
@ -36,7 +36,7 @@ Index: pacemaker-2.0.4+20201012.0cc17c01e/lib/fencing/st_client.c
free(action);
}
}
@@ -664,6 +666,8 @@ stonith_action_create(const char *agent,
@@ -657,6 +659,8 @@ stonith_action_create(const char *agent,
if (device_args) {
char buffer[512];
const char *value = NULL;
@ -45,7 +45,7 @@ Index: pacemaker-2.0.4+20201012.0cc17c01e/lib/fencing/st_client.c
snprintf(buffer, sizeof(buffer), "pcmk_%s_retries", _action);
value = g_hash_table_lookup(device_args, buffer);
@@ -671,6 +675,11 @@ stonith_action_create(const char *agent,
@@ -664,6 +668,11 @@ stonith_action_create(const char *agent,
if (value) {
action->max_retries = atoi(value);
}
@ -57,7 +57,7 @@ Index: pacemaker-2.0.4+20201012.0cc17c01e/lib/fencing/st_client.c
}
return action;
@@ -812,6 +821,10 @@ internal_stonith_action_execute(stonith_
@@ -806,6 +815,10 @@ internal_stonith_action_execute(stonith_
SVC_ACTION_NON_BLOCKED,
"SVC_ACTION_NON_BLOCKED");
@ -68,10 +68,10 @@ Index: pacemaker-2.0.4+20201012.0cc17c01e/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.0.4+20201012.0cc17c01e/lib/services/services_linux.c
Index: pacemaker-2.0.5+20210104.8ae19fdf9/lib/services/services_linux.c
===================================================================
--- pacemaker-2.0.4+20201012.0cc17c01e.orig/lib/services/services_linux.c
+++ pacemaker-2.0.4+20201012.0cc17c01e/lib/services/services_linux.c
--- pacemaker-2.0.5+20210104.8ae19fdf9.orig/lib/services/services_linux.c
+++ pacemaker-2.0.5+20210104.8ae19fdf9/lib/services/services_linux.c
@@ -28,6 +28,9 @@
#include "crm/common/mainloop.h"
#include "crm/services.h"

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

@ -4,11 +4,11 @@ Date: Thu Mar 14 09:41:53 2013 +0800
Log: Change some messages to notice level (bnc#806256)
Index: pacemaker-2.0.4+20200820.09f345c49/daemons/controld/controld_membership.c
Index: pacemaker-2.0.5+20210104.8ae19fdf9/daemons/controld/controld_membership.c
===================================================================
--- pacemaker-2.0.4+20200820.09f345c49.orig/daemons/controld/controld_membership.c
+++ pacemaker-2.0.4+20200820.09f345c49/daemons/controld/controld_membership.c
@@ -409,7 +409,7 @@ crm_update_quorum(gboolean quorum, gbool
--- pacemaker-2.0.5+20210104.8ae19fdf9.orig/daemons/controld/controld_membership.c
+++ pacemaker-2.0.5+20210104.8ae19fdf9/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);
fsa_cib_update(XML_TAG_CIB, update, call_options, call_id, NULL);
@ -17,10 +17,10 @@ Index: pacemaker-2.0.4+20200820.09f345c49/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.4+20200820.09f345c49/daemons/controld/controld_transition.c
Index: pacemaker-2.0.5+20210104.8ae19fdf9/daemons/controld/controld_transition.c
===================================================================
--- pacemaker-2.0.4+20200820.09f345c49.orig/daemons/controld/controld_transition.c
+++ pacemaker-2.0.4+20200820.09f345c49/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;
@ -30,16 +30,16 @@ Index: pacemaker-2.0.4+20200820.09f345c49/daemons/controld/controld_transition.c
graph_input);
te_reset_job_counts();
Index: pacemaker-2.0.4+20200820.09f345c49/daemons/fenced/fenced_remote.c
Index: pacemaker-2.0.5+20210104.8ae19fdf9/daemons/fenced/fenced_remote.c
===================================================================
--- pacemaker-2.0.4+20200820.09f345c49.orig/daemons/fenced/fenced_remote.c
+++ pacemaker-2.0.4+20200820.09f345c49/daemons/fenced/fenced_remote.c
@@ -609,7 +609,7 @@ remote_op_timeout(gpointer userdata)
--- 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;
}
- 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=%s",
CRM_XS " id=%.8s",
op->action, op->target, op->client_name, op->id);

24
bug-812269_pacemaker-fencing-device-register-messages.patch
View File

@ -4,24 +4,24 @@ Date: Thu Apr 18 16:00:02 2013 +0800
Log: fencing: Drop the severity of the messages on registering a stonith device
Index: pacemaker-1.1.18+20180430.c0d7ba798/daemons/fenced/fenced_commands.c
Index: pacemaker-2.0.5+20210104.8ae19fdf9/daemons/fenced/fenced_commands.c
===================================================================
--- pacemaker-1.1.18+20180430.c0d7ba798.orig/daemons/fenced/fenced_commands.c
+++ pacemaker-1.1.18+20180430.c0d7ba798/daemons/fenced/fenced_commands.c
@@ -1190,7 +1190,7 @@ stonith_device_register(xmlNode * msg, c
}
--- pacemaker-2.0.5+20210104.8ae19fdf9.orig/daemons/fenced/fenced_commands.c
+++ pacemaker-2.0.5+20210104.8ae19fdf9/daemons/fenced/fenced_commands.c
@@ -1194,7 +1194,7 @@ stonith_device_register(xmlNode * msg, c
g_hash_table_replace(device_list, device->id, device);
- crm_notice("Added '%s' to the device list (%d active devices)", device->id,
+ crm_info("Added '%s' to the device list (%d active devices)", device->id,
g_hash_table_size(device_list));
ndevices = g_hash_table_size(device_list);
- crm_notice("Added '%s' to device list (%d active device%s)",
+ crm_info("Added '%s' to device list (%d active device%s)",
device->id, ndevices, pcmk__plural_s(ndevices));
}
if (desc) {
Index: pacemaker-1.1.18+20180430.c0d7ba798/daemons/fenced/pacemaker-fenced.c
Index: pacemaker-2.0.5+20210104.8ae19fdf9/daemons/fenced/pacemaker-fenced.c
===================================================================
--- pacemaker-1.1.18+20180430.c0d7ba798.orig/daemons/fenced/pacemaker-fenced.c
+++ pacemaker-1.1.18+20180430.c0d7ba798/daemons/fenced/pacemaker-fenced.c
@@ -1021,7 +1021,7 @@ update_cib_cache_cb(const char *event, x
--- pacemaker-2.0.5+20210104.8ae19fdf9.orig/daemons/fenced/pacemaker-fenced.c
+++ pacemaker-2.0.5+20210104.8ae19fdf9/daemons/fenced/pacemaker-fenced.c
@@ -1029,7 +1029,7 @@ update_cib_cache_cb(const char *event, x
break;
case -pcmk_err_diff_resync:
case -pcmk_err_diff_failed:

3
pacemaker-2.0.5+20201202.ba59be712.tar.xz
View File

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

3
pacemaker-2.0.5+20210104.8ae19fdf9.tar.xz Normal file
View File

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

108
pacemaker.changes
View File

@ -1,3 +1,103 @@
-------------------------------------------------------------------
Fri Jan 29 12:42:52 UTC 2021 - Yan Gao <ygao@suse.com>
- pacemakerd: downgrade the warning about SBD_SYNC_RESOURCE_STARTUP to notice (bsc#1180966)
* bsc#1180966-0001-Log-pacemakerd-downgrade-the-warning-about-SBD_SYNC_.patch
-------------------------------------------------------------------
Thu Jan 28 14:28:18 UTC 2021 - Yan Gao <ygao@suse.com>
- Update to version 2.0.5+20210104.8ae19fdf9:
- attrd: prevent leftover attributes of shutdown node in cib (bsc#1173668)
-------------------------------------------------------------------
Thu Jan 28 14:22:47 UTC 2021 - Yan Gao <ygao@suse.com>
- Update to version 2.0.5+20201218.c67665496:
- books: enable Sphinx build
- books: remove Publican
- xml: Update XML schema for crm_resource changes.
- libpacemaker: Also flatten XML location constraint output.
- libpacemaker: Various small fixes to location-list.
- libpacemaker: Fix printing out location constraints.
- libpacemaker: Correct loop detection in rscs_colocated_with_list.
- libpacemaker: Flatten XML output for colocations.
- libpacemaker: Pass the correct resource to recursive calls.
- tools: Don't display generic lists for colocations and constraints.
- libpacemaker: Change the colocation list headings.
- libpacemaker: Don't show an empty locations list.
- libcrmcluster: properly check CPG payload size
- libcrmcluster: correctly return error for invalid payload size
- libcrmcommon: set errno properly on IPC connection failure
- scheduler: Don't output a resource header with no list.
- libcib: Cleanup at signoff.Fix(CLBZ#5457)
- scheduler: add class back to multiple recovery message
- fencer: standardize fence device references in log messages
- fencer: improve wording of various messages
- fencer: correct order of arguments to a message
- fencer: log operation IDs more consistently
- fencer: log operation state as readable string rather than integer enum value
- fencer: prefer "fencing" to "stonith"
- fencer: use singular or plural correctly in messages
- pacemakerd: improve error message when -S can't connect
- libcrmcommon: improve messages when adding a log file
- libcrmcommon: drop unformatted log message about log permissions
- libcrmcommon: drop unnecessary parent check when adding log file
- daemons: improve client name used in log messages
- ipc_client: Use libqb to get auth data for ipcc connections
- Rebase:
* bug-806256_pacemaker-log-level-notice.patch
* bug-728579_pacemaker-stonith-dev-id.patch
* bug-812269_pacemaker-fencing-device-register-messages.patch
-------------------------------------------------------------------
Mon Jan 25 12:29:58 UTC 2021 - Yan Gao <ygao@suse.com>
- Update to version 2.0.5+20201203.dc64a43f9:
- libpacemaker: add public API functions for cluster queries
- libs: Remove extra whitespace in list_item calls.
- schedulerd: Fixed processing to expand meta_attributes. Fix(#CLBZ:5451)
- scheduler: Fix output of failed actions without an operation_key.
- scheduler: treat missing parameter as NULL in rules with value-source (rh#1872376)
- scheduler: correctly skip dangling id-ref(rh#1872376)
- controld: Retry connection failure when controld is stopped.(Fix:CLBZ#5445)
- travis: run cts-exec with --force-wait option (bsc#1177489)
- cts-exec: add --force-wait/-w option (bsc#1177489)
- cts-fencing: add --force-wait/-w option (bsc#1177489)
- cts-exec: add --timeout/-t option (bsc#1177489)
- cts-fencing: add --timeout/-t option (bsc#1177489)
- cts-exec: optimize exec regression testing via appropriate synchronization with execd (bsc#1177489)
- cts-fencing: optimize fencing regression testing via appropriate synchronization with fenced (bsc#1177489)
- Pacemaker Explained: Explain limitations of node attr expressions. (rh#1891929)
- include: Bump CRM_FEATURE_SET to 3.6.3.
- xml: Add a schema for new crm_resource output.
- tools: Use formatted output for stacks and constraints.
- tools: Use formatted output for resource searching.
- tools: Use formatted output for crm_resource checks.
- tools: Use formatted output for CTS printing in crm_resource.
- scheduler, tools: Add a new node-and-op output message.
- tools: Use formatted output for crm_resource info messages.
- tools: Use formatted output for finding resources.
- tools: Use formatted output for resource output in crm_resource.
- scheduler: Add a message for resource config printing.
- tools: Use formatted output for props, attrs, and metadata.
- liblrmd: Add output messages for agents, providers, and standards.
- tools: Use the existing resource-list message in crm_resource.
- tools: Add an output message for a list of resource names.
- tools: Add the beginnings of formatted output to crm_resource.
- scheduler: filter Pacemaker-supplied stonith parameters from secure hash (rh#1872376)
- scheduler: use same default private parameter list as controller
- libstonithd: improve filtering of Pacemaker-handled parameters
- scheduler: properly compute digest of non-sensitive resource parameters (rh#1872376)
- libcrmcommon: Prevent a segfault in pcmk__cmdline_preproc.
- tools: Save the optarg parameter for --list-ocf-alternatives.
- xml: Add a generic list XML schema file.
- xml: Move resource-related XML schema into its own file.
- libcrmcommon: Automatically lower case XML list names.
- xml: add schema for new crmadmin output
- crmadmin: implement formatted output (bsc#1178865)
-------------------------------------------------------------------
Sun Dec 06 12:32:29 UTC 2020 - Yan Gao <ygao@suse.com>
@ -859,10 +959,10 @@ Fri Jul 12 13:54:03 UTC 2019 - Yan Gao <ygao@suse.com>
- libcrmcommon: Add a formatted outputter for HTML.
- remote: allow run-time configurable TLS priorities
- pengine: formatted output for text
- scheduler: properly detect dangling migrations
- scheduler: only successful ops count for migration comparisons
- libpe_status: add sanity check when unpacking migration history
- libpe_status: check for stops correctly when unpacking migration
- scheduler: properly detect dangling migrations (bsc#1177212)
- scheduler: only successful ops count for migration comparisons (bsc#1177212)
- libpe_status: add sanity check when unpacking migration history (bsc#1177212)
- libpe_status: check for stops correctly when unpacking migration (bsc#1177212)
- controller: reset expected reply when disconnecting from scheduler
- cts-scheduler: convert to python
- tools: Use a copy of argv in stonith_admin.

7
pacemaker.spec
View File

@ -80,7 +80,7 @@
%define with_regression_tests 0
Name: pacemaker
Version: 2.0.5+20201202.ba59be712
Version: 2.0.5+20210104.8ae19fdf9
Release: 0
Summary: Scalable High-Availability cluster resource manager
# AGPL-3.0 licensed extra/clustermon.sh is not present in the binary
@ -102,6 +102,7 @@ Patch7: bug-977201_pacemaker-controld-self-fencing.patch
Patch8: bug-995365_pacemaker-cts-restart-systemd-journald.patch
Patch9: pacemaker-cts-StartCmd.patch
Patch10: 0001-Log-libcrmcommon-lower-message-on-reading-proc-file-.patch
Patch11: bsc#1180966-0001-Log-pacemakerd-downgrade-the-warning-about-SBD_SYNC_.patch
# Required for core functionality
BuildRequires: autoconf
BuildRequires: automake
@ -167,7 +168,7 @@ BuildRequires: cluster-glue-libs-devel
%if %{with doc}
BuildRequires: asciidoc
BuildRequires: inkscape
BuildRequires: publican
BuildRequires: python3-sphinx
%endif
%if %{with_regression_tests}
BuildRequires: procps
@ -317,6 +318,7 @@ manager.
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%build
@ -353,7 +355,6 @@ autoreconf -fvi
%{?with_profiling: --with-profiling} \
%{?with_coverage: --with-coverage} \
%{?with_cibsecrets: --with-cibsecrets} \
%{!?with_doc: --with-brand=} \
--with-initdir=%{_initddir} \
--with-runstatedir=%{_rundir} \
--localstatedir=%{_var} \