585b8113f5
- cpg: Ensure group name is never unset - remote: Simplify calls to accept() and inet_ntop() by using "struct sockaddr_storage" (bsc#964183) - remote: cl#5269 - Notify other clients of a new connection only if the handshake has completed (bsc#967388) - remote: Correctly display the IP address of the remote client (bsc#964183) - spec: declare also BSD license as suitable - libservices: Add error handling for pipe() failed. - libservices: Check resource agent is executable or not before pipe open. - crmd: Prevent use-after-free when an unexpected remote client takes over (bsc#964183) - pacemakerd: Correction of the stonithd process judgment of pacemakerd. - crmd: Do not turn on stonith-watchdog-timeout automatically if SBD is detected - remote: Correctly check for SBD configuration consistency - resources: Fix state file metadata in Dummy, Stateful and HealthCPU resource agents - systemd: Modified so that the cluster to stop before the rsyslog - common: Correctly locate sbd via its pidfile - common: Assume processes are active if we get EACCESS - Fencing: Simplify watchdog integration - crmd: Only poopulate stonith-watchdog-timeout if SBD is active - remote: Ensure SBD is consistently configured on remote nodes - remote: Allow cluster and remote LRM API versions to diverge - cib: Do not send notifications when the dryrun flag is present - Upstream version cs: cf67796823c4429714857411e614cfacfbc59d89 - crm_shadow: fix broken --display command - ipc: Respect the parameter of pick_ipc_buffer() but don't let it affect the global value - libcluster: crm_peer_uname() should return NULL if uuid is invalid - remote: recover from remote node fencing more quickly - crmd: update node state for migrated pacemaker_remote nodes - crmd: update node state for stopped pacemaker_remote nodes - crmd: update node state for started pacemaker_remote nodes - crmd: add new message type for updating pacemaker_remote node state OBS-URL: https://build.opensuse.org/request/show/362987 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=233
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.14+git20160209.8d93feb/fencing/commands.c
|
|
===================================================================
|
|
--- pacemaker-1.1.14+git20160209.8d93feb.orig/fencing/commands.c
|
|
+++ pacemaker-1.1.14+git20160209.8d93feb/fencing/commands.c
|
|
@@ -826,6 +826,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.14+git20160209.8d93feb/lib/fencing/st_client.c
|
|
===================================================================
|
|
--- pacemaker-1.1.14+git20160209.8d93feb.orig/lib/fencing/st_client.c
|
|
+++ pacemaker-1.1.14+git20160209.8d93feb/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;
|
|
@@ -679,6 +680,7 @@ stonith_action_destroy(stonith_action_t
|
|
free(action->args);
|
|
free(action->action);
|
|
free(action->victim);
|
|
+ free(action->dev_id);
|
|
free(action);
|
|
}
|
|
|
|
@@ -706,6 +708,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);
|
|
@@ -713,6 +717,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;
|
|
@@ -894,6 +903,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);
|
|
@@ -916,6 +927,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);
|