Accepting request 532208 from home:yan_gao:branches:network:ha-clustering:Factory:Test
- Log: Reduce verbosity of developer logging - PE: We most definitely need to probe connection resources - PE: Ensure the bundle nodes get set with the correct discovery mode - PE: Implement probing of container remote nodes - attrd: Tweak log messages for clarity - crm_resource: Do not send history erasure commands for nodes where this is none - PE: Resources in bundles should also respect failcounts - PE: Do not send notifications to unclean bundles - PE: Prevent graph loops when fencing the host out from underneath a bundle - Tools: Allow bundle resources to read/write master scores based on the same logic as attrd (cf34f4c) - PE: bundle: Send an additional host list when container-attribute-target=host - PE: Correctly interpret colocation with bundles - PE/attrd: Allow bundle resources to read/write attributes based on the physical host rather than the container name - Upstream version cs: 4328c6a65424d1caf9785107664ec1b7fc824664 - Rebase: * bug-728579_pacemaker-stonith-dev-id.patch - Fix: -Wformat-truncation=2: prevent format truncation - snprintf: use correct signedness in print format specifiers - snprintf: use sizeof(X) as size + prevent off-by-ones - crmd,libcrmcommon,libcluster,tools: handle PID as string properly - tools: use right size for string buffer in fake_transition.c - crm_resource: fix a memleak - pengine: sprintf -> snprintf - libcrmcommon: fix possible infloop in buffer_print - crm_snprintf_offset like parts: fix off-by-ones - attrd: improve update messages - stonithd,lrmd,pengine: spelling/formatting corrections - build: install ifspeed resource agent - libcrmservices: avoid assert for HB resource with no parameters OBS-URL: https://build.opensuse.org/request/show/532208 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=273
This commit is contained in:
parent
68eff2f20b
commit
f92e6d1c91
2
_service
2
_service
@ -11,7 +11,7 @@
|
|||||||
<param name="version">1.1.17</param>
|
<param name="version">1.1.17</param>
|
||||||
-->
|
-->
|
||||||
<param name="versionformat">1.1.17+git%cd.%h</param>
|
<param name="versionformat">1.1.17+git%cd.%h</param>
|
||||||
<param name="revision">d134f83b4f0188f6d7cd381c8cdda1a2a7c38bd5</param>
|
<param name="revision">4328c6a65424d1caf9785107664ec1b7fc824664</param>
|
||||||
</service>
|
</service>
|
||||||
|
|
||||||
<service name="recompress" mode="disabled">
|
<service name="recompress" mode="disabled">
|
||||||
|
@ -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-1.1.14+git20160209.8d93feb/fencing/commands.c
|
Index: pacemaker-1.1.17+20170926.4328c6a65/fencing/commands.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pacemaker-1.1.14+git20160209.8d93feb.orig/fencing/commands.c
|
--- pacemaker-1.1.17+20170926.4328c6a65.orig/fencing/commands.c
|
||||||
+++ pacemaker-1.1.14+git20160209.8d93feb/fencing/commands.c
|
+++ pacemaker-1.1.17+20170926.4328c6a65/fencing/commands.c
|
||||||
@@ -826,6 +826,7 @@ build_device_from_xml(xmlNode * msg)
|
@@ -925,6 +925,7 @@ build_device_from_xml(xmlNode * msg)
|
||||||
device->id, device->on_target_actions);
|
device->id, device->on_target_actions);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -16,10 +16,10 @@ Index: pacemaker-1.1.14+git20160209.8d93feb/fencing/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-1.1.14+git20160209.8d93feb/lib/fencing/st_client.c
|
Index: pacemaker-1.1.17+20170926.4328c6a65/lib/fencing/st_client.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pacemaker-1.1.14+git20160209.8d93feb.orig/lib/fencing/st_client.c
|
--- pacemaker-1.1.17+20170926.4328c6a65.orig/lib/fencing/st_client.c
|
||||||
+++ pacemaker-1.1.14+git20160209.8d93feb/lib/fencing/st_client.c
|
+++ pacemaker-1.1.17+20170926.4328c6a65/lib/fencing/st_client.c
|
||||||
@@ -54,6 +54,7 @@ struct stonith_action_s {
|
@@ -54,6 +54,7 @@ struct stonith_action_s {
|
||||||
char *action;
|
char *action;
|
||||||
char *victim;
|
char *victim;
|
||||||
@ -28,7 +28,7 @@ Index: pacemaker-1.1.14+git20160209.8d93feb/lib/fencing/st_client.c
|
|||||||
int timeout;
|
int timeout;
|
||||||
int async;
|
int async;
|
||||||
void *userdata;
|
void *userdata;
|
||||||
@@ -679,6 +680,7 @@ stonith_action_destroy(stonith_action_t
|
@@ -666,6 +667,7 @@ stonith_action_destroy(stonith_action_t
|
||||||
free(action->args);
|
free(action->args);
|
||||||
free(action->action);
|
free(action->action);
|
||||||
free(action->victim);
|
free(action->victim);
|
||||||
@ -36,16 +36,16 @@ Index: pacemaker-1.1.14+git20160209.8d93feb/lib/fencing/st_client.c
|
|||||||
free(action);
|
free(action);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -706,6 +708,8 @@ stonith_action_create(const char *agent,
|
@@ -693,6 +695,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;
|
||||||
+ const char *st_dev_id_key = CRM_META "_" F_STONITH_DEVICE;
|
+ const char *st_dev_id_key = CRM_META "_" F_STONITH_DEVICE;
|
||||||
+ const char *st_dev_id_value = NULL;
|
+ const char *st_dev_id_value = NULL;
|
||||||
|
|
||||||
snprintf(buffer, 511, "pcmk_%s_retries", _action);
|
snprintf(buffer, sizeof(buffer), "pcmk_%s_retries", _action);
|
||||||
value = g_hash_table_lookup(device_args, buffer);
|
value = g_hash_table_lookup(device_args, buffer);
|
||||||
@@ -713,6 +717,11 @@ stonith_action_create(const char *agent,
|
@@ -700,6 +704,11 @@ stonith_action_create(const char *agent,
|
||||||
if (value) {
|
if (value) {
|
||||||
action->max_retries = atoi(value);
|
action->max_retries = atoi(value);
|
||||||
}
|
}
|
||||||
@ -57,7 +57,7 @@ Index: pacemaker-1.1.14+git20160209.8d93feb/lib/fencing/st_client.c
|
|||||||
}
|
}
|
||||||
|
|
||||||
return action;
|
return action;
|
||||||
@@ -894,6 +903,8 @@ internal_stonith_action_execute(stonith_
|
@@ -881,6 +890,8 @@ internal_stonith_action_execute(stonith_
|
||||||
|
|
||||||
if (!pid) {
|
if (!pid) {
|
||||||
/* child */
|
/* child */
|
||||||
@ -66,7 +66,7 @@ Index: pacemaker-1.1.14+git20160209.8d93feb/lib/fencing/st_client.c
|
|||||||
setpgid(0, 0);
|
setpgid(0, 0);
|
||||||
|
|
||||||
close(1);
|
close(1);
|
||||||
@@ -916,6 +927,10 @@ internal_stonith_action_execute(stonith_
|
@@ -903,6 +914,10 @@ internal_stonith_action_execute(stonith_
|
||||||
close(p_write_fd);
|
close(p_write_fd);
|
||||||
close(p_stderr_fd);
|
close(p_stderr_fd);
|
||||||
|
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:9686739823302e3719d9de86b688b3ff63ad2c8a24d3f59027ade03a3ddebd1f
|
|
||||||
size 4165820
|
|
3
pacemaker-1.1.17+20170926.4328c6a65.tar.bz2
Normal file
3
pacemaker-1.1.17+20170926.4328c6a65.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:d2c54df7658e8ea8582a6fd1a06838df5377e6029380fadb4663cca400d14b8a
|
||||||
|
size 4221592
|
@ -1,3 +1,82 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Sep 29 11:56:01 UTC 2017 - ygao@suse.com
|
||||||
|
|
||||||
|
- Log: Reduce verbosity of developer logging
|
||||||
|
- PE: We most definitely need to probe connection resources
|
||||||
|
- PE: Ensure the bundle nodes get set with the correct discovery mode
|
||||||
|
- PE: Implement probing of container remote nodes
|
||||||
|
- attrd: Tweak log messages for clarity
|
||||||
|
- crm_resource: Do not send history erasure commands for nodes where this is none
|
||||||
|
- PE: Resources in bundles should also respect failcounts
|
||||||
|
- PE: Do not send notifications to unclean bundles
|
||||||
|
- PE: Prevent graph loops when fencing the host out from underneath a bundle
|
||||||
|
- Tools: Allow bundle resources to read/write master scores based on the same logic as attrd (cf34f4c)
|
||||||
|
- PE: bundle: Send an additional host list when container-attribute-target=host
|
||||||
|
- PE: Correctly interpret colocation with bundles
|
||||||
|
- PE/attrd: Allow bundle resources to read/write attributes based on the physical host rather than the container name
|
||||||
|
- Upstream version cs: 4328c6a65424d1caf9785107664ec1b7fc824664
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Sep 28 10:22:07 UTC 2017 - ygao@suse.com
|
||||||
|
|
||||||
|
- Rebase:
|
||||||
|
* bug-728579_pacemaker-stonith-dev-id.patch
|
||||||
|
|
||||||
|
- Fix: -Wformat-truncation=2: prevent format truncation
|
||||||
|
- snprintf: use correct signedness in print format specifiers
|
||||||
|
- snprintf: use sizeof(X) as size + prevent off-by-ones
|
||||||
|
- crmd,libcrmcommon,libcluster,tools: handle PID as string properly
|
||||||
|
- tools: use right size for string buffer in fake_transition.c
|
||||||
|
- crm_resource: fix a memleak
|
||||||
|
- pengine: sprintf -> snprintf
|
||||||
|
- libcrmcommon: fix possible infloop in buffer_print
|
||||||
|
- crm_snprintf_offset like parts: fix off-by-ones
|
||||||
|
- attrd: improve update messages
|
||||||
|
- stonithd,lrmd,pengine: spelling/formatting corrections
|
||||||
|
- build: install ifspeed resource agent
|
||||||
|
- libcrmservices: avoid assert for HB resource with no parameters
|
||||||
|
- crmd: re-enable local collection of meta-data for remote nodes
|
||||||
|
- crmd,pengine,libpe_status,libpe_rules: remove support for versioned attributes
|
||||||
|
- crmd: avoid memory leak when node state is unknown
|
||||||
|
- crmd: avoid assert if LRM query fails
|
||||||
|
- libpe_status: more error checking when unpacking bundles
|
||||||
|
- libpe_status: bundles now respect PCMK_authkey_location
|
||||||
|
- libcrmcommon,liblrmd,lrmd: validate PCMK_remote_port
|
||||||
|
- PE: Bundles: add support for rkt bundle type
|
||||||
|
- libcrmcommon,libpe_rules: unpack new alert filter syntax
|
||||||
|
- xml: allow specifying alertable events
|
||||||
|
- Fix: a proper calculation of a speed in case of hfi1 for ifspeed RA.
|
||||||
|
- pengine: detect proper clone name at startup
|
||||||
|
- pengine: don't ignore permanent master scores at startup
|
||||||
|
- pengine: handle resource migrating behind a migrating remote connection
|
||||||
|
- stonith-ng: advertise pcmk_on_action via metadata
|
||||||
|
- liblrmd: Make sure the operation of a remote resource returns if setup of the key fails (bsc#1053463)
|
||||||
|
- libcrmcommon,pengine: improve log messages
|
||||||
|
- PE: only print to stdout if run from command line
|
||||||
|
- crmd: eliminate size restriction on node state xpath
|
||||||
|
- pengine: add regression test for remote connect interval wait
|
||||||
|
- pengine: re-enable unrecoverable remote fencing
|
||||||
|
- pengine: Make sure calculated resource scores are consistent on different architectures (bsc#1054389)
|
||||||
|
- PE: Allow resources inside bundles to receive notifications
|
||||||
|
- PE: Update unfencing device change test output
|
||||||
|
- attrd,crmd: erase attributes at attrd start-up, not first join
|
||||||
|
- attrd: accept connections only after CIB connection is active
|
||||||
|
- attrd: make CIB connection function self-contained
|
||||||
|
- attrd: improve messages
|
||||||
|
- stonith-ng: make fencing-device reappear properly after reenabling
|
||||||
|
- crmd: don't need meta-data after resource is deleted
|
||||||
|
- crmd: only get meta-data for OCF and stonith agents
|
||||||
|
- libcrmcommon: generate agent key without :: if no provider
|
||||||
|
- pengine: avoid fence loop for remote nodes
|
||||||
|
- attrd: don't log error if CIB doesn't have an alerts section
|
||||||
|
- PE: Only retrigger unfencing on nodes that ran operations with the old parameters
|
||||||
|
- PE: Output resource changes in a friendlier format
|
||||||
|
- PE: Attempt to indicate why resources are changing state
|
||||||
|
- Mechanism for recording why an action is required
|
||||||
|
- Support unfencing of remote nodes
|
||||||
|
- PE: Ignore optional unfencing events and report the fencing type
|
||||||
|
- Upstream version cs: 20cffae1e9c64217339173c197edac8612ad02b9
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jul 31 09:40:31 UTC 2017 - ygao@suse.com
|
Mon Jul 31 09:40:31 UTC 2017 - ygao@suse.com
|
||||||
|
|
||||||
@ -58,7 +137,7 @@ Wed Jul 19 14:06:09 UTC 2017 - ygao@suse.com
|
|||||||
|
|
||||||
- Update to version 1.1.17
|
- Update to version 1.1.17
|
||||||
- PE: Ensure unrecoverable remote nodes are fenced even if no resources can run on them
|
- PE: Ensure unrecoverable remote nodes are fenced even if no resources can run on them
|
||||||
- iso8601: strftime needs fully populated struct tm
|
- iso8601: strftime needs fully populated struct tm (bsc#1058844)
|
||||||
- crmd: abort transition whenever we lose quorum
|
- crmd: abort transition whenever we lose quorum
|
||||||
- PE: Ensure bundle nodes and child resources are correctly cleaned up
|
- PE: Ensure bundle nodes and child resources are correctly cleaned up
|
||||||
- PE: Generic ordering for anything with bundles
|
- PE: Generic ordering for anything with bundles
|
||||||
@ -343,7 +422,7 @@ Mon Mar 6 13:04:16 UTC 2017 - ygao@suse.com
|
|||||||
- mcp: Correction of the difference in access permission setting.
|
- mcp: Correction of the difference in access permission setting.
|
||||||
- stonith_admin: Addition of the list-targets option.
|
- stonith_admin: Addition of the list-targets option.
|
||||||
- stonith: Check for missing params in new device and dup
|
- stonith: Check for missing params in new device and dup
|
||||||
- libservices: treat systemd service reloading as OK
|
- libservices: treat systemd service reloading as OK (bsc#1059187)
|
||||||
- crmd: increase severity when fencing didn't happen (bsc#1011240)
|
- crmd: increase severity when fencing didn't happen (bsc#1011240)
|
||||||
- rng: Create resources-2.7.rng to update template class validation
|
- rng: Create resources-2.7.rng to update template class validation
|
||||||
- libcrmcommon: Don't report error if the output file isn't syncable
|
- libcrmcommon: Don't report error if the output file isn't syncable
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
## Where to install Pacemaker documentation
|
## Where to install Pacemaker documentation
|
||||||
%global pcmk_docdir %{_docdir}/%{name}
|
%global pcmk_docdir %{_docdir}/%{name}
|
||||||
|
|
||||||
%global commit 1.1.17+20170727.d134f83b4
|
%global commit 1.1.17+20170926.4328c6a65
|
||||||
|
|
||||||
## Corosync version
|
## Corosync version
|
||||||
%define cs_version 2
|
%define cs_version 2
|
||||||
|
Loading…
Reference in New Issue
Block a user