f92e6d1c91
- 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
80 lines
2.7 KiB
Diff
80 lines
2.7 KiB
Diff
commit 1e01228825eb8d4449edfbb1a1fa0c38fab4d5e6
|
|
Author: Gao,Yan <ygao@suse.com>
|
|
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-1.1.17+20170926.4328c6a65/fencing/commands.c
|
|
===================================================================
|
|
--- pacemaker-1.1.17+20170926.4328c6a65.orig/fencing/commands.c
|
|
+++ pacemaker-1.1.17+20170926.4328c6a65/fencing/commands.c
|
|
@@ -925,6 +925,7 @@ build_device_from_xml(xmlNode * msg)
|
|
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-1.1.17+20170926.4328c6a65/lib/fencing/st_client.c
|
|
===================================================================
|
|
--- pacemaker-1.1.17+20170926.4328c6a65.orig/lib/fencing/st_client.c
|
|
+++ pacemaker-1.1.17+20170926.4328c6a65/lib/fencing/st_client.c
|
|
@@ -54,6 +54,7 @@ struct stonith_action_s {
|
|
char *action;
|
|
char *victim;
|
|
char *args;
|
|
+ char *dev_id;
|
|
int timeout;
|
|
int async;
|
|
void *userdata;
|
|
@@ -666,6 +667,7 @@ stonith_action_destroy(stonith_action_t
|
|
free(action->args);
|
|
free(action->action);
|
|
free(action->victim);
|
|
+ free(action->dev_id);
|
|
free(action);
|
|
}
|
|
|
|
@@ -693,6 +695,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_value = NULL;
|
|
|
|
snprintf(buffer, sizeof(buffer), "pcmk_%s_retries", _action);
|
|
value = g_hash_table_lookup(device_args, buffer);
|
|
@@ -700,6 +704,11 @@ stonith_action_create(const char *agent,
|
|
if (value) {
|
|
action->max_retries = atoi(value);
|
|
}
|
|
+
|
|
+ st_dev_id_value = g_hash_table_lookup(device_args, st_dev_id_key);
|
|
+ if (st_dev_id_value) {
|
|
+ action->dev_id = strdup(st_dev_id_value);
|
|
+ }
|
|
}
|
|
|
|
return action;
|
|
@@ -881,6 +890,8 @@ internal_stonith_action_execute(stonith_
|
|
|
|
if (!pid) {
|
|
/* child */
|
|
+ const char *st_dev_id_key = CRM_META "_" F_STONITH_DEVICE;
|
|
+
|
|
setpgid(0, 0);
|
|
|
|
close(1);
|
|
@@ -903,6 +914,10 @@ internal_stonith_action_execute(stonith_
|
|
close(p_write_fd);
|
|
close(p_stderr_fd);
|
|
|
|
+ if (action->dev_id) {
|
|
+ setenv(st_dev_id_key, action->dev_id, 1);
|
|
+ }
|
|
+
|
|
/* keep retries from executing out of control */
|
|
if (is_retry) {
|
|
sleep(1);
|