Accepting request 769084 from network:ha-clustering:Factory

- Update to version 2.0.3+20200128.df6c286d9:
- scheduler: ensure attenuated scores still have some effect
- scheduler: ignore colocation constraints with 0 score

- Update to version 2.0.3+20200127.cdf84f849:
- libpe_status: Remove extra colons from operations output.
- libpe_status: correctly check for implicit resource ID collision
- libpe_status: Use the same message for headers and history.
- get ready for implicit -fno-common with upcoming GCC 10 (bsc#1160410)
- Rebase:
  * bug-728579_pacemaker-stonith-dev-id.patch

- Update to version 2.0.3+20200116.92a6f7e97:
- controller: bump feature set for shutdown-lock
- scheduler: clear resource history when appropriate
- tools: for down nodes, crm_resource --refresh should clear CIB only
- controller: allow CRM_OP_LRM_DELETE to clear CIB only
- tools: crm_resource resource checks should show shutdown locks
- scheduler: display when a resource is shutdown-locked to a node
- controller: don't clear shutdown locks when node rejoins
- controller: mark shutdown-locked resources in resource history
- scheduler: respect shutdown locks when placing inactive resources
- scheduler: respect shutdown locks when placing active resources
- scheduler: add shutdown lock cluster options
- tools: improve error checking for crm_resource cleanup/fail commands
- tools: improve crm_resource "why" messages
- controller: improve messages when deleting CIB resource history

- Update to version 2.0.3+20200116.ea5b06fae:
- rectify thinko possibly behind spurious "process will not die" msg (forwarded request 769083 from yan_gao)

OBS-URL: https://build.opensuse.org/request/show/769084
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pacemaker?expand=0&rev=132
This commit is contained in:
Dominique Leuenberger 2020-02-03 10:10:52 +00:00 committed by Git OBS Bridge
commit f7a9750277
7 changed files with 136 additions and 29 deletions

View File

@ -8,9 +8,9 @@
To update to a new release, change "revision" to the desired
git commit hash and bump "version" if necessary
<param name="version">2.0.2</param>
<param name="version">2.0.3</param>
-->
<param name="versionformat">2.0.2+%cd.%h</param>
<param name="versionformat">2.0.3+%cd.%h</param>
<param name="revision">master</param>
<param name="changesgenerate">enable</param>
</service>

View File

@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">git://github.com/ClusterLabs/pacemaker.git</param>
<param name="changesrevision">934021cb840f53b0b5de62b45a13baebb2ad6feb</param>
<param name="changesrevision">98432e569e91652247e4b0cf81023a15d2eed716</param>
</service>
</servicedata>

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.0.2+20191014.81d51216d/daemons/fenced/fenced_commands.c
Index: pacemaker-2.0.3+20200127.cdf84f849/daemons/fenced/fenced_commands.c
===================================================================
--- pacemaker-2.0.2+20191014.81d51216d.orig/daemons/fenced/fenced_commands.c
+++ pacemaker-2.0.2+20191014.81d51216d/daemons/fenced/fenced_commands.c
@@ -905,6 +905,7 @@ build_device_from_xml(xmlNode * msg)
--- pacemaker-2.0.3+20200127.cdf84f849.orig/daemons/fenced/fenced_commands.c
+++ pacemaker-2.0.3+20200127.cdf84f849/daemons/fenced/fenced_commands.c
@@ -901,6 +901,7 @@ build_device_from_xml(xmlNode * msg)
device->id, device->on_target_actions);
}
@ -16,11 +16,11 @@ Index: pacemaker-2.0.2+20191014.81d51216d/daemons/fenced/fenced_commands.c
device->work = mainloop_add_trigger(G_PRIORITY_HIGH, stonith_device_dispatch, device);
/* TODO: Hook up priority */
Index: pacemaker-2.0.2+20191014.81d51216d/lib/fencing/st_client.c
Index: pacemaker-2.0.3+20200127.cdf84f849/lib/fencing/st_client.c
===================================================================
--- pacemaker-2.0.2+20191014.81d51216d.orig/lib/fencing/st_client.c
+++ pacemaker-2.0.2+20191014.81d51216d/lib/fencing/st_client.c
@@ -42,6 +42,7 @@ struct stonith_action_s {
--- pacemaker-2.0.3+20200127.cdf84f849.orig/lib/fencing/st_client.c
+++ pacemaker-2.0.3+20200127.cdf84f849/lib/fencing/st_client.c
@@ -38,6 +38,7 @@ struct stonith_action_s {
char *action;
char *victim;
GHashTable *args;
@ -28,7 +28,7 @@ Index: pacemaker-2.0.2+20191014.81d51216d/lib/fencing/st_client.c
int timeout;
int async;
void *userdata;
@@ -600,6 +601,7 @@ stonith__destroy_action(stonith_action_t
@@ -596,6 +597,7 @@ stonith__destroy_action(stonith_action_t
}
free(action->output);
free(action->error);
@ -36,7 +36,7 @@ Index: pacemaker-2.0.2+20191014.81d51216d/lib/fencing/st_client.c
free(action);
}
}
@@ -669,6 +671,8 @@ stonith_action_create(const char *agent,
@@ -665,6 +667,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.2+20191014.81d51216d/lib/fencing/st_client.c
snprintf(buffer, sizeof(buffer), "pcmk_%s_retries", _action);
value = g_hash_table_lookup(device_args, buffer);
@@ -676,6 +680,11 @@ stonith_action_create(const char *agent,
@@ -672,6 +676,11 @@ stonith_action_create(const char *agent,
if (value) {
action->max_retries = atoi(value);
}
@ -57,7 +57,7 @@ Index: pacemaker-2.0.2+20191014.81d51216d/lib/fencing/st_client.c
}
return action;
@@ -813,6 +822,10 @@ internal_stonith_action_execute(stonith_
@@ -809,6 +818,10 @@ internal_stonith_action_execute(stonith_
svc_action->cb_data = (void *) action;
set_bit(svc_action->flags, SVC_ACTION_NON_BLOCKED);
@ -68,11 +68,11 @@ Index: pacemaker-2.0.2+20191014.81d51216d/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.2+20191014.81d51216d/lib/services/services_linux.c
Index: pacemaker-2.0.3+20200127.cdf84f849/lib/services/services_linux.c
===================================================================
--- pacemaker-2.0.2+20191014.81d51216d.orig/lib/services/services_linux.c
+++ pacemaker-2.0.2+20191014.81d51216d/lib/services/services_linux.c
@@ -30,6 +30,9 @@
--- pacemaker-2.0.3+20200127.cdf84f849.orig/lib/services/services_linux.c
+++ pacemaker-2.0.3+20200127.cdf84f849/lib/services/services_linux.c
@@ -28,6 +28,9 @@
#include "crm/common/mainloop.h"
#include "crm/services.h"
@ -81,8 +81,8 @@ Index: pacemaker-2.0.2+20191014.81d51216d/lib/services/services_linux.c
+
#include "services_private.h"
#if SUPPORT_CIBSECRETS
@@ -189,6 +192,15 @@ static void
static void close_pipe(int fildes[]);
@@ -405,6 +408,15 @@ static void
add_action_env_vars(const svc_action_t *op)
{
void (*env_setter)(gpointer, gpointer, gpointer) = NULL;

View File

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

View File

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

View File

@ -1,3 +1,110 @@
-------------------------------------------------------------------
Wed Jan 29 09:53:57 UTC 2020 - Yan Gao <ygao@suse.com>
- Update to version 2.0.3+20200128.df6c286d9:
- scheduler: ensure attenuated scores still have some effect
- scheduler: ignore colocation constraints with 0 score
-------------------------------------------------------------------
Tue Jan 28 16:09:11 UTC 2020 - Yan Gao <ygao@suse.com>
- Update to version 2.0.3+20200127.cdf84f849:
- libpe_status: Remove extra colons from operations output.
- libpe_status: correctly check for implicit resource ID collision
- libpe_status: Use the same message for headers and history.
- get ready for implicit -fno-common with upcoming GCC 10 (bsc#1160410)
- Rebase:
* bug-728579_pacemaker-stonith-dev-id.patch
-------------------------------------------------------------------
Tue Jan 21 12:49:01 UTC 2020 - Yan Gao <ygao@suse.com>
- Update to version 2.0.3+20200116.92a6f7e97:
- controller: bump feature set for shutdown-lock
- scheduler: clear resource history when appropriate
- tools: for down nodes, crm_resource --refresh should clear CIB only
- controller: allow CRM_OP_LRM_DELETE to clear CIB only
- tools: crm_resource resource checks should show shutdown locks
- scheduler: display when a resource is shutdown-locked to a node
- controller: don't clear shutdown locks when node rejoins
- controller: mark shutdown-locked resources in resource history
- scheduler: respect shutdown locks when placing inactive resources
- scheduler: respect shutdown locks when placing active resources
- scheduler: add shutdown lock cluster options
- tools: improve error checking for crm_resource cleanup/fail commands
- tools: improve crm_resource "why" messages
- controller: improve messages when deleting CIB resource history
-------------------------------------------------------------------
Tue Jan 21 11:10:05 UTC 2020 - Yan Gao <ygao@suse.com>
- Update to version 2.0.3+20200116.ea5b06fae:
- rectify thinko possibly behind spurious "process will not die" msg
- tools: Adapt stonith_admin to new return codes.
- libpacemaker: Fix handling of some operation return values.
- tools: Re-enable CGI output from crm_mon.
- tools: Correct sec vs. msec discrepancy in stonith_admin.
- libpe_status: Update the maint mode message for HTML output.
- libpe_status: Use a separate log formatter for cluster options.
- tools: Move --watch-fencing to under "Additional Options".
- libpacemaker: Convert to new return codes.
- libpacemaker: Add higher level stonith functions.
- tools: Handle request being NULL.
- tools: Be sure to free the GError when done with it.
-------------------------------------------------------------------
Fri Jan 10 14:18:35 UTC 2020 - Yan Gao <ygao@suse.com>
- Update to version 2.0.3+20200106.bc6f54495:
- attrd: properly declare global variables as extern in header (bsc#1160410)
- libcrmcommon: introduce new set of return codes
-------------------------------------------------------------------
Fri Jan 10 13:08:03 UTC 2020 - Yan Gao <ygao@suse.com>
- Update to version 2.0.3+20200102.1e3b41f65:
- controller: improve CIB status deletion messages
- controller: improve join messages
- fenced: Clearly log merged STONITH operations.
- iso8601: Fix crm_time_parse_offset() to parse offset with plus sign.
- libcrmcommon: correctly raise detail log line length
- libcrmservice: handle child wait errors appropriately
- libcrmservice: improve messages when waiting for child process
-------------------------------------------------------------------
Thu Dec 05 12:49:59 UTC 2019 - Yan Gao <ygao@suse.com>
- Update to version 2.0.3+20191203.d671faa22:
- scheduler: make sure cluster-wide maintenance-mode=true overrides per-resource settings (bsc#1154881)
- tools: Correct the crm_mon man page.
- pengine: formatted output for log
- libcrmcommon: Add a formatter for logs
- tools: Use glib for cmdline handling in crm_diff.
-------------------------------------------------------------------
Tue Nov 26 09:10:34 UTC 2019 - Yan Gao <ygao@suse.com>
- Update to version 2.0.3+20191125.4b1f869f0 (Pacemaker-2.0.3):
- libcrmcommon: memory leak when comparing time with invalid specification
- scheduler: only add successfully unpacked members as group children
- scheduler: include execution time when logging action failure
- libcrmservice: use "error" instead of "unknown error"
- tools: update blocked description in html output
-------------------------------------------------------------------
Mon Nov 11 09:59:07 UTC 2019 - Yan Gao <ygao@suse.com>
- Update to version 2.0.2+20191108.e39096b5a:
- tools: Print nodes_maintenance in crm_mon.
- libcrmcommon: Use <h3> when outputting a nested list.
- tools: Explain what happens if crm_mon.cgi is run.
- libcrmcommon: Update formatted output help.
- tools: Add a space to "CLUSTER OK: 5nodes online". (bsc#1158180)
- scheduler: count disabled and blocked resources correctly
- scheduler: simplify logging resource info
- libpengine: Correct display of master resources.
-------------------------------------------------------------------
Thu Nov 07 10:57:29 UTC 2019 - Yan Gao <ygao@suse.com>
@ -243,8 +350,8 @@ Fri Jul 12 13:54:03 UTC 2019 - Yan Gao <ygao@suse.com>
- libcrmcommon: tweak ACL log messages
- libcrmcommon: pengine: formatted output for xml
- libstonithd: improve error checking when sending command
- fencer: don't require API registration for list and status commands
- fencer: improve error checking and log messages for API action requests
- fencer: don't require API registration for list and status commands (bsc#1148236)
- fencer: improve error checking and log messages for API action requests (bsc#1148236)
- executor: don't cancel stonith monitors when device is not registered
- executor: return error for stonith probes if stonith connection was lost
- libcrmcommon: assert on ACL memory allocation errors
@ -532,8 +639,8 @@ Fri Jan 11 15:57:23 UTC 2019 - ygao@suse.com
Fri Jan 11 10:11:05 UTC 2019 - ygao@suse.com
- Update to version 2.0.0+20190110.7bbbeb6f6:
- tools: Clear all prefer constraints when performing a move
- tools: Fix moving a resource with a lifetime constraint
- tools: Clear all prefer constraints when performing a move (bsc#1155290)
- tools: Fix moving a resource with a lifetime constraint (bsc#1155290)
- attrd: check for alert changes after CIB is replaced
- attrd: start new election if writer is lost
- attrd: handle shutdown more cleanly

View File

@ -76,7 +76,7 @@
%endif
Name: pacemaker
Version: 2.0.2+20191106.eef56dcd6
Version: 2.0.3+20200128.df6c286d9
Release: 0
Summary: Scalable High-Availability cluster resource manager
# AGPL-3.0 licensed extra/clustermon.sh is not present in the binary