File pacemaker-crmd-update_attr_delegate-instead-of-... of Package pacemaker

Overview Repositories Revisions Requests Users Attributes Meta

File pacemaker-crmd-update_attr_delegate-instead-of-set_standby.patch of Package pacemaker

commit 3cb9cd7d4f1ea7d25936a7d3f262032c8d3ef33d
Author: Zhuravleva Aleksandra <zhuravleva357@gmail.com>
Date:   Fri Mar 31 13:00:00 2017 +0300

update_attr_delegate() instead of set_standby()

diff --git a/crmd/join_client.c b/crmd/join_client.c
index 0ba671daf..b8ff66aa4 100644
--- a/crmd/join_client.c
+++ b/crmd/join_client.c
@@ -257,12 +257,16 @@ do_cl_join_finalize_respond(long long action,
 
             if (start_state) {
                 if (safe_str_eq(start_state, "standby")) {
+                    char *attr_id = crm_strdup_printf("nodes-%.256s-standby", fsa_our_uuid);
                     crm_notice("Forcing node %s to join in %s state per configured environment", fsa_our_uname, start_state);
-                    set_standby(fsa_cib_conn, fsa_our_uuid, NULL, "on");
+                    update_attr_delegate(fsa_cib_conn, cib_sync_call, XML_CIB_TAG_NODES, fsa_our_uuid, NULL, NULL, 
+                                         attr_id, "standby", "on", TRUE, NULL, NULL);
 
                 } else if (safe_str_eq(start_state, "online")) {
+                    char *attr_id = crm_strdup_printf("nodes-%.256s-standby", fsa_our_uuid);
                     crm_notice("Forcing node %s to join in %s state per configured environment", fsa_our_uname, start_state);
-                    set_standby(fsa_cib_conn, fsa_our_uuid, NULL, "off");
+                    update_attr_delegate(fsa_cib_conn, cib_sync_call, XML_CIB_TAG_NODES, fsa_our_uuid, NULL, NULL, 
+                                         attr_id, "standby", "off", TRUE, NULL, NULL);
 
                 } else if (safe_str_eq(start_state, "default")) {
                     crm_debug("Not forcing a starting state on node %s", fsa_our_uname);
diff --git a/lib/cib/cib_attrs.c b/lib/cib/cib_attrs.c
index d3ea30484..16705c544 100644
--- a/lib/cib/cib_attrs.c
+++ b/lib/cib/cib_attrs.c
@@ -591,7 +591,8 @@ set_standby(cib_t * the_cib, const char *uuid, const char *scope, const char *st
 
     } else {
         scope = XML_CIB_TAG_NODES;
-        attr_id = crm_strdup_printf("nodes-%.256s-standby", uuid);
+        attr_id = crm_strdup_printf("standby-%.256s", uuid);
+        // attr_id = crm_strdup_printf("nodes-%.256s-standby", uuid);
     }
 
     rc = update_attr_delegate(the_cib, cib_sync_call, scope, uuid, NULL, NULL,

Places

File pacemaker-crmd-update_attr_delegate-instead-of-set_standby.patch of Package pacemaker

Places