File pacemaker-crm_attribute-prefer-node-name-from-e... of Package pacemaker

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker-crm_attribute-prefer-node-name-from-environment.patch of Package pacemaker (Revision 0e051afa0cc7159c73d2a3fcc79577e4)

Currently displaying revision 0e051afa0cc7159c73d2a3fcc79577e4 , Show latest

commit cdd4419d08654d91cd8b72cca11e1d1cc51f1056
Author: Ken Gaillot <kgaillot@redhat.com>
Date:   Thu Feb 16 10:23:12 2017 -0600

Fix: tools: crm_attribute should prefer node name from environment
    
    Same behavior as was done for crm_node in e0eb9e76

diff --git a/tools/crm_attribute.c b/tools/crm_attribute.c
index 7cb277426..60ded8d81 100644
--- a/tools/crm_attribute.c
+++ b/tools/crm_attribute.c
@@ -44,7 +44,7 @@
 gboolean BE_QUIET = FALSE;
 char command = 'G';
 
-char *dest_uname = NULL;
+const char *dest_uname = NULL;
 char *dest_node = NULL;
 char *set_name = NULL;
 char *attr_id = NULL;
@@ -247,7 +247,14 @@ main(int argc, char **argv)
     } else if (safe_str_eq(type, XML_CIB_TAG_CRMCONFIG)) {
     } else if (safe_str_neq(type, XML_CIB_TAG_TICKETS)) {
         if (dest_uname == NULL) {
-            dest_uname = get_node_name(0);
+            /* If we are being called from a resource agent via the cluster,
+             * the correct local node name will be passed as an environment
+             * variable. Otherwise, we have to ask the cluster.
+             */
+            dest_uname = getenv("OCF_RESKEY_" CRM_META "_" XML_LRM_ATTR_TARGET);
+            if (dest_uname == NULL) {
+                dest_uname = get_local_node_name();
+            }
         }
 
         rc = query_node_uuid(the_cib, dest_uname, &dest_node, &is_remote_node);

Places

File pacemaker-crm_attribute-prefer-node-name-from-environment.patch of Package pacemaker (Revision 0e051afa0cc7159c73d2a3fcc79577e4)

Places