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

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker-tools-correct-OCF_RESOURCE_INSTANCE-crm_resource-force-execute-2.patch of Package pacemaker.23975

commit 8022d211227e03410b82005c93b7650797ac6196
Author: Kazunori INOUE <inouekazu@intellilink.co.jp>
Date:   Tue Nov 7 10:36:33 2017 +0900

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

Index: pacemaker/tools/crm_resource_runtime.c
===================================================================
--- pacemaker.orig/tools/crm_resource_runtime.c
+++ pacemaker/tools/crm_resource_runtime.c
@@ -1476,7 +1476,6 @@ cli_resource_execute(const char *rsc_id,
     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);
 
@@ -1537,8 +1536,9 @@ cli_resource_execute(const char *rsc_id,
     /* add crm_feature_set env needed by some resource agents */
     g_hash_table_insert(params, strdup(XML_ATTR_CRM_VERSION), strdup(CRM_FEATURE_SET));
 
-    value = g_hash_table_lookup(rsc->meta, XML_RSC_ATTR_UNIQUE);
-    rid = crm_is_true(value) ? rsc->id : rsc_id;
+    rid = ((rsc->parent
+            && ((rsc->parent->variant == pe_clone) || (rsc->parent->variant == pe_master)))
+           && is_not_set(rsc->parent->flags, pe_rsc_unique)) ? rsc_id : rsc->id;
 
     op = resources_action_create(rid, rclass, rprov, rtype, action, 0,
                                  timeout_ms, params, 0);

Places

File pacemaker-tools-correct-OCF_RESOURCE_INSTANCE-crm_resource-force-execute-2.patch of Package pacemaker.23975

Places