154c80f970
- Update to version 2.0.2+20190801.122c32115: - libcib: install cib_types.h - tools: Use glib for cmdline handling in crm_mon. - libcrmcommon: Handle no digits in crm_int_helper. - libcrmcommon: Allow glib cmdline parsing without formatted output. - extra: calculate #health_disk correctly in SysInfo - extra: handle run-as-user properly in ClusterMon - extra: advertise promote and demote in Stateful meta-data - extra: formally deprecate the ocf:pacemaker:pingd agent - extra: quote shell variables in agent code where appropriate - extra: use ":=" where appropriate in agent code - Update to version 2.0.2+20190725.4b4fea3eb: - Rebase: * bug-977201_pacemaker-controld-self-fencing.patch - libcrmcommon: Restore getopt behavior in stonith_admin. - controller: document the cluster-name cluster property - controller: allow configurable reaction to local node fencing - pacemakerd: make daemon exit detection messages more consistent - executor: stonith probes should fail only if previously registered - libstonithd: handle API creation errors better - spec: avoid long-broken (in a pristine tree state) "make all" - controller: panic local host if notified of own fencing - controller: clear "required" bit when disconnecting scheduler - libcrmcommon: Remove -q from global cmdline options. - tools: Allow HTML output in stonith_admin. - libstonithd: Add HTML support to fencing messages. - st_client: Reword stonith_event_text. - controld: Use XML output to check for pending status. - pengine: formatted output for html OBS-URL: https://build.opensuse.org/request/show/721844 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=329
101 lines
3.6 KiB
Diff
101 lines
3.6 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-2.0.2+20190614.9f18a420a/daemons/fenced/fenced_commands.c
|
|
===================================================================
|
|
--- pacemaker-2.0.2+20190614.9f18a420a.orig/daemons/fenced/fenced_commands.c
|
|
+++ pacemaker-2.0.2+20190614.9f18a420a/daemons/fenced/fenced_commands.c
|
|
@@ -878,6 +878,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-2.0.2+20190614.9f18a420a/lib/fencing/st_client.c
|
|
===================================================================
|
|
--- pacemaker-2.0.2+20190614.9f18a420a.orig/lib/fencing/st_client.c
|
|
+++ pacemaker-2.0.2+20190614.9f18a420a/lib/fencing/st_client.c
|
|
@@ -40,6 +40,7 @@ struct stonith_action_s {
|
|
char *action;
|
|
char *victim;
|
|
GHashTable *args;
|
|
+ char *dev_id;
|
|
int timeout;
|
|
int async;
|
|
void *userdata;
|
|
@@ -561,6 +562,7 @@ stonith__destroy_action(stonith_action_t
|
|
}
|
|
free(action->output);
|
|
free(action->error);
|
|
+ free(action->dev_id);
|
|
free(action);
|
|
}
|
|
}
|
|
@@ -630,6 +632,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);
|
|
@@ -637,6 +641,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;
|
|
@@ -773,6 +782,10 @@ internal_stonith_action_execute(stonith_
|
|
svc_action->params = action->args;
|
|
svc_action->cb_data = (void *) action;
|
|
|
|
+ if (action->dev_id) {
|
|
+ svc_action->rsc = strdup(action->dev_id);
|
|
+ }
|
|
+
|
|
/* keep retries from executing out of control and free previous results */
|
|
if (is_retry) {
|
|
free(action->output);
|
|
Index: pacemaker-2.0.2+20190614.9f18a420a/lib/services/services_linux.c
|
|
===================================================================
|
|
--- pacemaker-2.0.2+20190614.9f18a420a.orig/lib/services/services_linux.c
|
|
+++ pacemaker-2.0.2+20190614.9f18a420a/lib/services/services_linux.c
|
|
@@ -30,6 +30,9 @@
|
|
#include "crm/common/mainloop.h"
|
|
#include "crm/services.h"
|
|
|
|
+#include "crm/stonith-ng.h"
|
|
+#include "crm/fencing/internal.h"
|
|
+
|
|
#include "services_private.h"
|
|
|
|
#if SUPPORT_CIBSECRETS
|
|
@@ -189,6 +192,15 @@ static void
|
|
add_action_env_vars(const svc_action_t *op)
|
|
{
|
|
void (*env_setter)(gpointer, gpointer, gpointer) = NULL;
|
|
+
|
|
+ if (safe_str_eq(op->standard, PCMK_RESOURCE_CLASS_STONITH)
|
|
+ && safe_str_eq(op->agent, "fence_legacy")
|
|
+ && op->rsc != NULL) {
|
|
+ const char *st_dev_id_key = CRM_META "_" F_STONITH_DEVICE;
|
|
+
|
|
+ setenv(st_dev_id_key, op->rsc, 1);
|
|
+ }
|
|
+
|
|
if (op->agent == NULL) {
|
|
env_setter = set_alert_env; /* we deal with alert handler */
|
|
|