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

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

Browse Source 
- Update to version 2.1.7+20240220.d4f389e48:
- libcrmcommon: avoid file descriptor leak in IPC client with async connection (bsc#1219323, gh#ClusterLabs/pacemaker#3351)

- Update to version 2.1.7+20240219.a586196f1:
- libcrmservice: Revert single quotes to double quotes in metadata
- libcrmcommon: Always output request= in XML output. (gh#ClusterLabs/pacemaker#3362)
- scheduler: improve date specification argument validation
- libcrmcommon: Properly handle UTF-8 characters when escaping XML
- libcrmcommon: Don't include "<null>" as an attribute value
- tools: Drop newline from crm_rule errors
- libcrmcommon: Escape XML text content when adding it
- libcrmcommon: Escape XML text content when dumping XML as string
- libcrmcommon: crm_xml_escape() shouldn't stop on Unicode characters (gh#ClusterLabs/pacemaker#3323)
- libcrmcommon: Always use XML substitutions
- tools: crm_simulate output should match its schema
- Rebase:
  * bug-728579_pacemaker-stonith-dev-id.patch

OBS-URL: https://build.opensuse.org/request/show/1148355
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=392
This commit is contained in:
Yan Gao 2024-02-20 21:49:26 +00:00 committed by Git OBS Bridge
parent 271ab1da64
commit f813a15ec2
7 changed files with 48 additions and 23 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.1.7</param>
-->
<param name="versionformat">2.1.7+%cd.%h</param>
<param name="revision">4f595be2b</param>
<param name="revision">d4f389e48</param>
<param name="changesgenerate">enable</param>
</service>

2
_servicedata
View File

@ -5,4 +5,4 @@
</service>
<service name="tar_scm">
<param name="url">https://github.com/ClusterLabs/pacemaker.git</param>
<param name="changesrevision">9c13ce6fe95812308443c188ace8f897e6bce942</param></service></servicedata>
<param name="changesrevision">0ca251f040ee6a1d33c317cd86377d94b71303ed</param></service></servicedata>

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

@ -4,22 +4,22 @@ 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.4+20220928.4690461db/daemons/fenced/fenced_commands.c
Index: pacemaker-2.1.7+20240208.bc5596299/daemons/fenced/fenced_commands.c
===================================================================
--- pacemaker-2.1.4+20220928.4690461db.orig/daemons/fenced/fenced_commands.c
+++ pacemaker-2.1.4+20220928.4690461db/daemons/fenced/fenced_commands.c
@@ -1096,6 +1096,7 @@ build_device_from_xml(xmlNode *dev)
--- pacemaker-2.1.7+20240208.bc5596299.orig/daemons/fenced/fenced_commands.c
+++ pacemaker-2.1.7+20240208.bc5596299/daemons/fenced/fenced_commands.c
@@ -1151,6 +1151,7 @@ build_device_from_xml(xmlNode *dev)
(const char *) device->on_target_actions->str);
}
+ g_hash_table_insert(device->params, strdup(CRM_META "_" F_STONITH_DEVICE), strdup(device->id));
+ g_hash_table_insert(device->params, strdup(CRM_META "_" PCMK__XE_ST_DEVICE_ID), strdup(device->id));
device->work = mainloop_add_trigger(G_PRIORITY_HIGH, stonith_device_dispatch, device);
/* TODO: Hook up priority */
Index: pacemaker-2.1.4+20220928.4690461db/lib/fencing/st_actions.c
Index: pacemaker-2.1.7+20240208.bc5596299/lib/fencing/st_actions.c
===================================================================
--- pacemaker-2.1.4+20220928.4690461db.orig/lib/fencing/st_actions.c
+++ pacemaker-2.1.4+20220928.4690461db/lib/fencing/st_actions.c
--- pacemaker-2.1.7+20240208.bc5596299.orig/lib/fencing/st_actions.c
+++ pacemaker-2.1.7+20240208.bc5596299/lib/fencing/st_actions.c
@@ -31,6 +31,7 @@ struct stonith_action_s {
char *agent;
char *action;
@ -28,7 +28,7 @@ Index: pacemaker-2.1.4+20220928.4690461db/lib/fencing/st_actions.c
int timeout;
bool async;
void *userdata;
@@ -226,6 +227,7 @@ stonith__destroy_action(stonith_action_t
@@ -224,6 +225,7 @@ stonith__destroy_action(stonith_action_t
services_action_free(action->svc_action);
}
pcmk__reset_result(&(action->result));
@ -36,16 +36,16 @@ Index: pacemaker-2.1.4+20220928.4690461db/lib/fencing/st_actions.c
free(action);
}
}
@@ -286,6 +288,8 @@ stonith__action_create(const char *agent
@@ -284,6 +286,8 @@ stonith__action_create(const char *agent
if (device_args) {
char buffer[512];
const char *value = NULL;
+ const char *st_dev_id_key = CRM_META "_" F_STONITH_DEVICE;
+ const char *st_dev_id_key = CRM_META "_" PCMK__XE_ST_DEVICE_ID;
+ const char *st_dev_id_value = NULL;
snprintf(buffer, sizeof(buffer), "pcmk_%s_retries", action_name);
value = g_hash_table_lookup(device_args, buffer);
@@ -293,6 +297,11 @@ stonith__action_create(const char *agent
@@ -291,6 +295,11 @@ stonith__action_create(const char *agent
if (value) {
action->max_retries = atoi(value);
}
@ -57,7 +57,7 @@ Index: pacemaker-2.1.4+20220928.4690461db/lib/fencing/st_actions.c
}
return action;
@@ -630,6 +639,10 @@ internal_stonith_action_execute(stonith_
@@ -628,6 +637,10 @@ internal_stonith_action_execute(stonith_
SVC_ACTION_NON_BLOCKED,
"SVC_ACTION_NON_BLOCKED");
@ -68,10 +68,10 @@ Index: pacemaker-2.1.4+20220928.4690461db/lib/fencing/st_actions.c
/* keep retries from executing out of control and free previous results */
if (is_retry) {
pcmk__reset_result(&(action->result));
Index: pacemaker-2.1.4+20220928.4690461db/lib/services/services_linux.c
Index: pacemaker-2.1.7+20240208.bc5596299/lib/services/services_linux.c
===================================================================
--- pacemaker-2.1.4+20220928.4690461db.orig/lib/services/services_linux.c
+++ pacemaker-2.1.4+20220928.4690461db/lib/services/services_linux.c
--- pacemaker-2.1.7+20240208.bc5596299.orig/lib/services/services_linux.c
+++ pacemaker-2.1.7+20240208.bc5596299/lib/services/services_linux.c
@@ -29,6 +29,9 @@
#include "crm/services.h"
#include "crm/services_internal.h"
@ -90,7 +90,7 @@ Index: pacemaker-2.1.4+20220928.4690461db/lib/services/services_linux.c
+ if (pcmk__str_eq(op->standard, PCMK_RESOURCE_CLASS_STONITH, pcmk__str_casei)
+ && pcmk__str_eq(op->agent, "fence_legacy", pcmk__str_casei)
+ && op->rsc != NULL) {
+ const char *st_dev_id_key = CRM_META "_" F_STONITH_DEVICE;
+ const char *st_dev_id_key = CRM_META "_" PCMK__XE_ST_DEVICE_ID;
+
+ setenv(st_dev_id_key, op->rsc, 1);
+ }

3
pacemaker-2.1.7+20240130.4f595be2b.tar.xz
View File

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

3
pacemaker-2.1.7+20240220.d4f389e48.tar.xz Normal file
View File

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

25
pacemaker.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Tue Feb 20 19:51:03 UTC 2024 - Yan Gao <ygao@suse.com>
- Update to version 2.1.7+20240220.d4f389e48:
- libcrmcommon: avoid file descriptor leak in IPC client with async connection (bsc#1219323, gh#ClusterLabs/pacemaker#3351)
-------------------------------------------------------------------
Tue Feb 20 07:21:52 UTC 2024 - Yan Gao <ygao@suse.com>
- Update to version 2.1.7+20240219.a586196f1:
- libcrmservice: Revert single quotes to double quotes in metadata
- libcrmcommon: Always output request= in XML output. (gh#ClusterLabs/pacemaker#3362)
- scheduler: improve date specification argument validation
- libcrmcommon: Properly handle UTF-8 characters when escaping XML
- libcrmcommon: Don't include "<null>" as an attribute value
- tools: Drop newline from crm_rule errors
- libcrmcommon: Escape XML text content when adding it
- libcrmcommon: Escape XML text content when dumping XML as string
- libcrmcommon: crm_xml_escape() shouldn't stop on Unicode characters (gh#ClusterLabs/pacemaker#3323)
- libcrmcommon: Always use XML substitutions
- tools: crm_simulate output should match its schema
- Rebase:
* bug-728579_pacemaker-stonith-dev-id.patch
-------------------------------------------------------------------
Tue Feb 06 11:07:06 UTC 2024 - Yan Gao <ygao@suse.com>

2
pacemaker.spec
View File

@ -129,7 +129,7 @@
%define with_regression_tests 0
Name: pacemaker
Version: 2.1.7+20240130.4f595be2b
Version: 2.1.7+20240220.d4f389e48
Release: 0
Summary: Scalable High-Availability cluster resource manager
# AGPL-3.0 licensed extra/clustermon.sh is not present in the binary