888f216e00
- crmd: Don't add node_state to cib, if we have not seen or fenced this node yet - PE: Do not allow colocation with blocked clone instances - PE: Do not re-allocate clone instances that are blocked in the Stopped state - fence_legacy: stonithd now handles killing the process group for us - Fencing: On timeout, clean up the agent's entire process group - fencing: Put all fencing agent processes into their own process group - crmd: Prevent crash by passing log arguments in the correct order - PE: Do not restart resources that depend on unmanaged resources - crmd: Prevent recurring monitors being cancelled due to notify operations - mcp: Fix so that only pacemakerd restarts, at the time of pacemakerd failure - mcp: Support PCMK_fail_fast to reboot a machine at the time of process (subsystem) failure - cpg: Ensure the CPG group is always null-terminated - Upstream version cs: ac7aa1c94f317fc1d4024fbc09b012bc9f1b229e OBS-URL: https://build.opensuse.org/request/show/185885 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=50
80 lines
2.5 KiB
Diff
80 lines
2.5 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/fencing/commands.c
|
|
===================================================================
|
|
--- pacemaker.orig/fencing/commands.c
|
|
+++ pacemaker/fencing/commands.c
|
|
@@ -608,6 +608,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/lib/fencing/st_client.c
|
|
===================================================================
|
|
--- pacemaker.orig/lib/fencing/st_client.c
|
|
+++ pacemaker/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;
|
|
@@ -559,6 +560,7 @@ stonith_action_destroy(stonith_action_t
|
|
free(action->args);
|
|
free(action->action);
|
|
free(action->victim);
|
|
+ free(action->dev_id);
|
|
free(action);
|
|
}
|
|
|
|
@@ -586,6 +588,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, 511, "pcmk_%s_retries", _action);
|
|
value = g_hash_table_lookup(device_args, buffer);
|
|
@@ -593,6 +597,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;
|
|
@@ -745,6 +754,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);
|
|
@@ -765,6 +776,10 @@ internal_stonith_action_execute(stonith_
|
|
close(p_read_fd);
|
|
close(p_write_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);
|