File pacemaker-tools-correct-OCF_RESOURCE_INSTANCE-c... of Package pacemaker.13547

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker-tools-correct-OCF_RESOURCE_INSTANCE-crm_resource-force-execute-1.patch of Package pacemaker.13547

commit f286f9279bc79083c977b31e5491afda2baea007
Author: Kazunori INOUE <inouekazu@intellilink.co.jp>
Date:   Thu Nov 2 14:27:36 2017 +0900

Low: tools: set the correct OCF_RESOURCE_INSTANCE env when crm_resource --force-* executes RA

diff --git a/tools/crm_resource_runtime.c b/tools/crm_resource_runtime.c
index 08cbd6ecc..271c99a6c 100644
--- a/tools/crm_resource_runtime.c
+++ b/tools/crm_resource_runtime.c
@@ -1452,10 +1452,12 @@ cli_resource_execute(const char *rsc_id, const char *rsc_action, GHashTable *ove
 {
     int rc = pcmk_ok;
     svc_action_t *op = NULL;
+    const char *rid = NULL;
     const char *rtype = NULL;
     const char *rprov = NULL;
     const char *rclass = NULL;
     const char *action = NULL;
+    const char *value = NULL;
     GHashTable *params = NULL;
     resource_t *rsc = pe_find_resource(data_set->resources, rsc_id);
 
@@ -1519,12 +1521,15 @@ cli_resource_execute(const char *rsc_id, const char *rsc_action, GHashTable *ove
     /* add crm_feature_set env needed by some resource agents */
     g_hash_table_insert(params, strdup(XML_ATTR_CRM_VERSION), strdup(CRM_FEATURE_SET));
 
-    op = resources_action_create(rsc->id, rclass, rprov, rtype, action, 0,
+    value = g_hash_table_lookup(rsc->meta, XML_RSC_ATTR_UNIQUE);
+    rid = crm_is_true(value) ? rsc->id : rsc_id;
+
+    op = resources_action_create(rid, rclass, rprov, rtype, action, 0,
                                  timeout_ms, params, 0);
     if (op == NULL) {
         /* Re-run with stderr enabled so we can display a sane error message */
         crm_enable_stderr(TRUE);
-        op = resources_action_create(rsc->id, rclass, rprov, rtype, action, 0,
+        op = resources_action_create(rid, rclass, rprov, rtype, action, 0,
                                      timeout_ms, params, 0);
 
         /* We know op will be NULL, but this makes static analysis happy */

Places

File pacemaker-tools-correct-OCF_RESOURCE_INSTANCE-crm_resource-force-execute-1.patch of Package pacemaker.13547

Places