File bug-728579_pacemaker-stonith-dev-id.patch of Package pacemaker.21297

Overview Repositories Revisions Requests Users Attributes Meta

File bug-728579_pacemaker-stonith-dev-id.patch of Package pacemaker.21297

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.3+20200127.cdf84f849/daemons/fenced/fenced_commands.c
===================================================================
--- pacemaker-2.0.3+20200127.cdf84f849.orig/daemons/fenced/fenced_commands.c
+++ pacemaker-2.0.3+20200127.cdf84f849/daemons/fenced/fenced_commands.c
@@ -901,6 +901,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.3+20200127.cdf84f849/lib/fencing/st_client.c
===================================================================
--- pacemaker-2.0.3+20200127.cdf84f849.orig/lib/fencing/st_client.c
+++ pacemaker-2.0.3+20200127.cdf84f849/lib/fencing/st_client.c
@@ -38,6 +38,7 @@ struct stonith_action_s {
     char *action;
     char *victim;
     GHashTable *args;
+    char *dev_id;
     int timeout;
     int async;
     void *userdata;
@@ -596,6 +597,7 @@ stonith__destroy_action(stonith_action_t
         }
         free(action->output);
         free(action->error);
+        free(action->dev_id);
         free(action);
     }
 }
@@ -665,6 +667,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);
@@ -672,6 +676,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;
@@ -809,6 +818,10 @@ internal_stonith_action_execute(stonith_
     svc_action->cb_data = (void *) action;
     set_bit(svc_action->flags, SVC_ACTION_NON_BLOCKED);
 
+    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.3+20200127.cdf84f849/lib/services/services_linux.c
===================================================================
--- pacemaker-2.0.3+20200127.cdf84f849.orig/lib/services/services_linux.c
+++ pacemaker-2.0.3+20200127.cdf84f849/lib/services/services_linux.c
@@ -28,6 +28,9 @@
 #include "crm/common/mainloop.h"
 #include "crm/services.h"
 
+#include "crm/stonith-ng.h"
+#include "crm/fencing/internal.h"
+
 #include "services_private.h"
 
 static void close_pipe(int fildes[]);
@@ -405,6 +408,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 */

Places

File bug-728579_pacemaker-stonith-dev-id.patch of Package pacemaker.21297

Places