Merge pull request #1222 from kgaillot/fixes

Pass correct local node name to resource agents on remote nodes
ClusterLabs · Feb 8, 2017 · fdb53ab · fdb53ab
2 parents 7b6e292 + 2af9bf8
commit fdb53ab
Show file tree

Hide file tree

Showing 618 changed files with 6,594 additions and 6,582 deletions.
diff --git a/crmd/lrm.c b/crmd/lrm.c
@@ -936,7 +936,8 @@ notify_deleted(lrm_state_t * lrm_state, ha_msg_input_t * input, const char *rsc_
     const char *from_host = crm_element_value(input->msg, F_CRM_HOST_FROM);
 
     crm_info("Notifying %s on %s that %s was%s deleted",
-             from_sys, from_host, rsc_id, rc == pcmk_ok ? "" : " not");
+             from_sys, (from_host? from_host : "localhost"), rsc_id,
+             ((rc == pcmk_ok)? "" : " not"));
 
     op = construct_op(lrm_state, input->xml, rsc_id, CRMD_ACTION_DELETE);
     CRM_ASSERT(op != NULL);

diff --git a/cts/CIB.py b/cts/CIB.py
@@ -203,9 +203,9 @@ def contents(self, target=None):
             st.add_op("start", "0", timeout="60s")
 
             # For remote node tests, a cluster node is stopped and brought back up
-            # as a remote node with the name "remote_OLDNAME". To allow fencing
+            # as a remote node with the name "remote-OLDNAME". To allow fencing
             # devices to fence these nodes, create a list of all possible node names.
-            all_node_names = [ prefix+n for n in self.CM.Env["nodes"] for prefix in ('', 'remote_') ]
+            all_node_names = [ prefix+n for n in self.CM.Env["nodes"] for prefix in ('', 'remote-') ]
 
             # Add all parameters specified by user
             entries = string.split(self.CM.Env["stonith-params"], ',')
@@ -234,7 +234,7 @@ def contents(self, target=None):
                 stl = FencingTopology(self.Factory)
                 for node in self.CM.Env["nodes"]:
                     # Remote node tests will rename the node
-                    remote_node = "remote_" + node
+                    remote_node = "remote-" + node
 
                     # Randomly assign node to a fencing method
                     ftype = self.CM.Env.RandomGen.choice(["levels-and", "levels-or ", "broadcast "])

diff --git a/cts/CTStests.py b/cts/CTStests.py
@@ -2785,7 +2785,7 @@ def start_metal(self, node):
             self.fail("Failed to start pacemaker_remote on node %s" % node)
             return
 
-        # convert node to baremetal node now that it has shutdow the cluster stack
+        # Convert node to baremetal now that it has shutdown the cluster stack
         pats = [ ]
         watch = self.create_watch(pats, 120)
         watch.setwatch()
@@ -2992,7 +2992,7 @@ def cleanup_metal(self, node):
 
     def setup_env(self, node):
 
-        self.remote_node = "remote_%s" % (node)
+        self.remote_node = "remote-%s" % (node)
 
         # we are assuming if all nodes have a key, that it is
         # the right key... If any node doesn't have a remote
@@ -3102,9 +3102,9 @@ def is_applicable(self):
     def errorstoignore(self):
         ignore_pats = [
             r"Unexpected disconnect on remote-node",
-            r"crmd.*:\s+error.*: Operation remote_.*_monitor",
-            r"crmd.*:\s+error.*: Result of monitor operation for remote_.*",
-            r"pengine.*:\s+Recover remote_.*\s*\(.*\)",
+            r"crmd.*:\s+error.*: Operation remote-.*_monitor",
+            r"crmd.*:\s+error.*: Result of monitor operation for remote-.*",
+            r"pengine.*:\s+Recover remote-.*\s*\(.*\)",
             r"Calculated [Tt]ransition .* /var/lib/pacemaker/pengine/pe-error",
             r"error.*: Resource .*ocf::.* is active on 2 nodes attempting recovery",
         ]

diff --git a/doc/Clusters_from_Scratch/en-US/Ch-Installation.txt b/doc/Clusters_from_Scratch/en-US/Ch-Installation.txt
@@ -393,7 +393,7 @@ To disable security measures:
 ----
 [root@pcmk-1 ~]# setenforce 0
 [root@pcmk-1 ~]# sed -i.bak "s/SELINUX=enforcing/SELINUX=permissive/g" /etc/selinux/config
-[root@pcmk-1 ~]# systemctl disable firewalld.service
+[root@pcmk-1 ~]# systemctl mask firewalld.service
 [root@pcmk-1 ~]# systemctl stop firewalld.service
 [root@pcmk-1 ~]# iptables --flush
 ----

diff --git a/doc/Pacemaker_Explained/en-US/Ch-Utilization.txt b/doc/Pacemaker_Explained/en-US/Ch-Utilization.txt
@@ -188,7 +188,7 @@ science problems -- a fancy way of saying "it takes a really long time
 to solve".
 
 Clearly in a HA cluster, it's not acceptable to spend minutes, let alone hours
-or days, finding an optional solution while services remain unavailable.
+or days, finding an optimal solution while services remain unavailable.
 
 So instead of trying to solve the problem completely, Pacemaker uses a
 'best effort' algorithm for determining which node should host a particular

diff --git a/doc/Pacemaker_Remote/en-US/Ch-Baremetal-Tutorial.txt b/doc/Pacemaker_Remote/en-US/Ch-Baremetal-Tutorial.txt
@@ -39,7 +39,7 @@ To disable security measures:
 ----
 # setenforce 0
 # sed -i.bak "s/SELINUX=enforcing/SELINUX=permissive/g" /etc/selinux/config
-# systemctl disable firewalld.service
+# systemctl mask firewalld.service
 # systemctl stop firewalld.service
 # iptables --flush
 ----

diff --git a/doc/Pacemaker_Remote/en-US/Ch-KVM-Tutorial.txt b/doc/Pacemaker_Remote/en-US/Ch-KVM-Tutorial.txt
@@ -43,7 +43,7 @@ To disable security measures:
 ----
 [root@pcmk-1 ~]# setenforce 0
 [root@pcmk-1 ~]# sed -i.bak "s/SELINUX=enforcing/SELINUX=permissive/g" /etc/selinux/config
-[root@pcmk-1 ~]# systemctl disable firewalld.service
+[root@pcmk-1 ~]# systemctl mask firewalld.service
 [root@pcmk-1 ~]# systemctl stop firewalld.service
 [root@pcmk-1 ~]# iptables --flush
 ----

diff --git a/lib/cluster/membership.c b/lib/cluster/membership.c
@@ -32,6 +32,8 @@
 #include <crm/msg_xml.h>
 #include <crm/stonith-ng.h>
 
+#define s_if_plural(i) (((i) == 1)? "" : "s")
+
 /* The peer cache remembers cluster nodes that have been seen.
  * This is managed mostly automatically by libcluster, based on
  * cluster membership events.
@@ -361,8 +363,8 @@ reap_crm_member(uint32_t id, const char *name)
     search.uname = name ? strdup(name) : NULL;
     matches = g_hash_table_foreach_remove(crm_peer_cache, crm_reap_dead_member, &search);
     if(matches) {
-        crm_notice("Purged %d peers with id=%u%s%s from the membership cache",
-                   matches, search.id,
+        crm_notice("Purged %d peer%s with id=%u%s%s from the membership cache",
+                   matches, s_if_plural(matches), search.id,
                    (search.uname? " and/or uname=" : ""),
                    (search.uname? search.uname : ""));
 

diff --git a/lib/common/utils.c b/lib/common/utils.c
@@ -894,6 +894,8 @@ filter_action_parameters(xmlNode * param_set, const char *version)
         XML_ATTR_ID,
         XML_ATTR_CRM_VERSION,
         XML_LRM_ATTR_OP_DIGEST,
+        XML_LRM_ATTR_TARGET,
+        XML_LRM_ATTR_TARGET_UUID,
     };
 
     gboolean do_delete = FALSE;

diff --git a/pengine/graph.c b/pengine/graph.c
@@ -948,6 +948,9 @@ action2xml(action_t * action, gboolean as_input, pe_working_set_t *data_set)
         if (router_node) {
             crm_xml_add(action_xml, XML_LRM_ATTR_ROUTER_NODE, router_node->details->uname);
         }
+
+        g_hash_table_insert(action->meta, strdup(XML_LRM_ATTR_TARGET), strdup(action->node->details->uname));
+        g_hash_table_insert(action->meta, strdup(XML_LRM_ATTR_TARGET_UUID), strdup(action->node->details->id));
     }
 
     /* No details if this action is only being listed in the inputs section */

diff --git a/pengine/test10/1-a-then-bm-move-b.exp b/pengine/test10/1-a-then-bm-move-b.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="10" operation="migrate_from" operation_key="B_migrate_from_0" on_node="18node1" on_node_uuid="1">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node2" CRM_meta_migrate_target="18node1" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node2" CRM_meta_migrate_target="18node1" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="9" operation="migrate_to" operation_key="B_migrate_to_0" on_node="18node2" on_node_uuid="2">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node2" CRM_meta_migrate_target="18node1" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node2" CRM_meta_migrate_target="18node1" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -25,7 +25,7 @@
     <action_set>
       <rsc_op id="8" operation="monitor" operation_key="B_monitor_60000" on_node="18node1" on_node_uuid="1">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -53,7 +53,7 @@
     <action_set>
       <rsc_op id="6" operation="stop" operation_key="B_stop_0" on_node="18node2" on_node_uuid="2">
         <primitive id="B" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>

diff --git a/pengine/test10/10-a-then-bm-b-move-a-clone.exp b/pengine/test10/10-a-then-bm-b-move-a-clone.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="4" operation="stop" operation_key="myclone_stop_0" internal_operation_key="myclone:1_stop_0" on_node="f20node1" on_node_uuid="1">
         <primitive id="myclone" long-id="myclone:1" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="f20node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -43,7 +43,7 @@
     <action_set>
       <rsc_op id="12" operation="migrate_from" operation_key="vm_migrate_from_0" on_node="f20node2" on_node_uuid="2">
         <primitive id="vm" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="f20node1" CRM_meta_migrate_target="f20node2" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="f20node1" CRM_meta_migrate_target="f20node2" CRM_meta_on_node="f20node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -56,7 +56,7 @@
     <action_set>
       <rsc_op id="11" operation="migrate_to" operation_key="vm_migrate_to_0" on_node="f20node1" on_node_uuid="1">
         <primitive id="vm" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="f20node1" CRM_meta_migrate_target="f20node2" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="f20node1" CRM_meta_migrate_target="f20node2" CRM_meta_on_node="f20node1" CRM_meta_on_node_uuid="1" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -80,7 +80,7 @@
     <action_set>
       <rsc_op id="9" operation="stop" operation_key="vm_stop_0" on_node="f20node1" on_node_uuid="1">
         <primitive id="vm" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="f20node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>

diff --git a/pengine/test10/11-a-then-bm-b-move-a-clone-starting.exp b/pengine/test10/11-a-then-bm-b-move-a-clone-starting.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="4" operation="start" operation_key="myclone_start_0" internal_operation_key="myclone:0_start_0" on_node="f20node2" on_node_uuid="2">
         <primitive id="myclone" long-id="myclone:0" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="f20node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -19,7 +19,7 @@
     <action_set>
       <rsc_op id="3" operation="stop" operation_key="myclone_stop_0" internal_operation_key="myclone:0_stop_0" on_node="f20node1" on_node_uuid="1">
         <primitive id="myclone" long-id="myclone:0" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="f20node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -35,7 +35,7 @@
     <action_set>
       <rsc_op id="2" operation="monitor" operation_key="myclone_monitor_0" internal_operation_key="myclone:0_monitor_0" on_node="f20node2" on_node_uuid="2">
         <primitive id="myclone" long-id="myclone:0" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="f20node2" CRM_meta_on_node_uuid="2" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -101,7 +101,7 @@
     <action_set>
       <rsc_op id="10" operation="start" operation_key="vm_start_0" on_node="f20node2" on_node_uuid="2">
         <primitive id="vm" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="f20node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -117,7 +117,7 @@
     <action_set>
       <rsc_op id="9" operation="stop" operation_key="vm_stop_0" on_node="f20node1" on_node_uuid="1">
         <primitive id="vm" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="f20node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>

diff --git a/pengine/test10/1360.exp b/pengine/test10/1360.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="9" operation="start" operation_key="dollies:0_start_0" on_node="ssgtest1b" on_node_uuid="c728b2aa-1e73-491f-a03c-8f0598bab169">
         <primitive id="dollies" long-id="dollies:0" class="ocf" provider="gn1" type="clone_server"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="ssgtest1b" CRM_meta_on_node_uuid="c728b2aa-1e73-491f-a03c-8f0598bab169" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
      <inputs>
@@ -19,7 +19,7 @@
      <action_set>
       <rsc_op id="8" operation="stop" operation_key="dollies:0_stop_0" on_node="ssgtest1a" on_node_uuid="94ef659b-5fd8-4d6b-b0ed-3b40339f8132">
         <primitive id="dollies" long-id="dollies:0" class="ocf" provider="gn1" type="clone_server"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="ssgtest1a" CRM_meta_on_node_uuid="94ef659b-5fd8-4d6b-b0ed-3b40339f8132" CRM_meta_timeout="20000" />
        </rsc_op>
      </action_set>
      <inputs>

diff --git a/pengine/test10/1484.exp b/pengine/test10/1484.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="3" operation="stop" operation_key="the-future-of-vaj_stop_0" on_node="hb2" on_node_uuid="86ad895f-1387-461e-a9b5-c52ed9537e13">
         <primitive id="the-future-of-vaj" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000"  target_role="started"/>
+        <attributes CRM_meta_on_node="hb2" CRM_meta_on_node_uuid="86ad895f-1387-461e-a9b5-c52ed9537e13" CRM_meta_timeout="20000"  target_role="started"/>
        </rsc_op>
      </action_set>
      <inputs/>

diff --git a/pengine/test10/1494.exp b/pengine/test10/1494.exp
@@ -3,7 +3,7 @@
      <action_set>
       <rsc_op id="2" operation="stop" operation_key="ima_rscid:0_stop_0" on_node="hb1" on_node_uuid="1ce670eb-d670-4f6d-811f-d415ffde76b7">
         <primitive id="ima_rscid:0" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_timeout="20000"  target_role="started"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="true" CRM_meta_notify="false" CRM_meta_on_node="hb1" CRM_meta_on_node_uuid="1ce670eb-d670-4f6d-811f-d415ffde76b7" CRM_meta_timeout="20000"  target_role="started"/>
        </rsc_op>
      </action_set>
      <inputs>

diff --git a/pengine/test10/2-am-then-b-move-a.exp b/pengine/test10/2-am-then-b-move-a.exp
@@ -3,7 +3,7 @@
     <action_set>
       <rsc_op id="8" operation="migrate_from" operation_key="A_migrate_from_0" on_node="18node2" on_node_uuid="2">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -16,7 +16,7 @@
     <action_set>
       <rsc_op id="7" operation="migrate_to" operation_key="A_migrate_to_0" on_node="18node1" on_node_uuid="1">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_migrate_source="18node1" CRM_meta_migrate_target="18node2" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_record_pending="true" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs/>
@@ -25,7 +25,7 @@
     <action_set>
       <rsc_op id="6" operation="monitor" operation_key="A_monitor_60000" on_node="18node2" on_node_uuid="2">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_timeout="20000" />
+        <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>
@@ -53,7 +53,7 @@
     <action_set>
       <rsc_op id="4" operation="stop" operation_key="A_stop_0" on_node="18node1" on_node_uuid="1">
         <primitive id="A" class="ocf" provider="heartbeat" type="Dummy"/>
-        <attributes CRM_meta_timeout="20000" />
+        <attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="20000" />
       </rsc_op>
     </action_set>
     <inputs>