commit 261c6b836e4a44c6d20d5abd7550ef1f0b25c17c

Author: David Vossel <dvossel@redhat.com>

Date:   Wed Sep 25 17:47:04 2013 -0400

    fix orphaned connection resources

diff --git a/crmd/lrm.c b/crmd/lrm.c

index 7157e24..5f4d3bb 100644

--- a/crmd/lrm.c

+++ b/crmd/lrm.c

@@ -729,6 +729,13 @@ build_active_RAs(lrm_state_t * lrm_state, xmlNode * rsc_list)

         crm_xml_add(xml_rsc, XML_AGENT_ATTR_CLASS, entry->rsc.class);

         crm_xml_add(xml_rsc, XML_AGENT_ATTR_PROVIDER, entry->rsc.provider);

+        if (entry->last && entry->last->params) {

+            const char *container = g_hash_table_lookup(entry->last->params, CRM_META"_"XML_RSC_ATTR_CONTAINER);

+            if (container) {

+                crm_trace("Resource %s is a part of container resource %s", entry->id, container);

+                crm_xml_add(xml_rsc, XML_RSC_ATTR_CONTAINER, container);

+            }

+        }

         build_operation_update(xml_rsc, &(entry->rsc), entry->last, __FUNCTION__);

         build_operation_update(xml_rsc, &(entry->rsc), entry->failed, __FUNCTION__);

         for (gIter = entry->recurring_op_list; gIter != NULL; gIter = gIter->next) {

@@ -1930,10 +1937,20 @@ do_update_resource(lrm_state_t * lrm_state, lrmd_rsc_info_t * rsc, lrmd_event_da

     build_operation_update(iter, rsc, op, __FUNCTION__);

     if (rsc) {

+        const char *container = NULL;

+

         crm_xml_add(iter, XML_ATTR_TYPE, rsc->type);

         crm_xml_add(iter, XML_AGENT_ATTR_CLASS, rsc->class);

         crm_xml_add(iter, XML_AGENT_ATTR_PROVIDER, rsc->provider);

+        if (op->params) {

+            container = g_hash_table_lookup(op->params, CRM_META"_"XML_RSC_ATTR_CONTAINER);

+        }

+        if (container) {

+            crm_trace("Resource %s is a part of container resource %s", op->rsc_id, container);

+            crm_xml_add(iter, XML_RSC_ATTR_CONTAINER, container);

+        }

+

         CRM_CHECK(rsc->type != NULL, crm_err("Resource %s has no value for type", op->rsc_id));

         CRM_CHECK(rsc->class != NULL, crm_err("Resource %s has no value for class", op->rsc_id));

diff --git a/include/crm/pengine/status.h b/include/crm/pengine/status.h

index bd3d923..8eb4a1d 100644

--- a/include/crm/pengine/status.h

+++ b/include/crm/pengine/status.h

@@ -160,6 +160,7 @@ struct node_s {

 #  define pe_rsc_orphan		0x00000001ULL

 #  define pe_rsc_managed	0x00000002ULL

 #  define pe_rsc_block          0x00000004ULL   /* Further operations are prohibited due to failure policy */

+#  define pe_rsc_orphan_container_filler	0x00000008ULL

 #  define pe_rsc_notify		0x00000010ULL

 #  define pe_rsc_unique		0x00000020ULL

diff --git a/lib/cib/cib_attrs.c b/lib/cib/cib_attrs.c

index d1e1b74..5e21eef 100644

--- a/lib/cib/cib_attrs.c

+++ b/lib/cib/cib_attrs.c

@@ -414,40 +414,54 @@ delete_attr_delegate(cib_t * the_cib, int options,

     return rc;

 }

-static int

-get_remote_node_uuid(cib_t * the_cib, const char *uname, char **uuid)

+static gboolean

+found_remote_node_xpath(cib_t *the_cib, const char *xpath)

 {

-#define REMOTE_NODE_XPATH "//nvpair[@name='remote-node'][@value='%s']"

-#define REMOTE_NODE_XPATH2 "//primitive[@type='remote'][@provider='pacemaker'][@id='%s']"

     int rc = pcmk_ok;

-    char *xpath_string = NULL;

-    size_t len = strlen(REMOTE_NODE_XPATH) + strlen(uname) + 1;

     xmlNode *xml_search = NULL;

-    xpath_string = calloc(1, len);

-    sprintf(xpath_string, REMOTE_NODE_XPATH, uname);

-    rc = cib_internal_op(the_cib, CIB_OP_QUERY, NULL, xpath_string, NULL, &xml_search,

+    rc = cib_internal_op(the_cib, CIB_OP_QUERY, NULL, xpath, NULL, &xml_search,

                          cib_sync_call | cib_scope_local | cib_xpath, NULL);

-    free(xpath_string);

     free(xml_search);

-    xml_search = NULL;

-    xpath_string = NULL;

-    if (rc != pcmk_ok) {

-        len = strlen(REMOTE_NODE_XPATH2) + strlen(uname) + 1;

-        xpath_string = calloc(1, len);

-        sprintf(xpath_string, REMOTE_NODE_XPATH2, uname);

-        rc = cib_internal_op(the_cib, CIB_OP_QUERY, NULL, xpath_string, NULL, &xml_search,

-                             cib_sync_call | cib_scope_local | cib_xpath, NULL);

+    return rc == pcmk_ok ? TRUE : FALSE;

+}

-        free(xpath_string);

-        free(xml_search);

+static int

+get_remote_node_uuid(cib_t * the_cib, const char *uname, char **uuid)

+{

+#define CONTAINER_REMOTE_NODE_XPATH "//" XML_CIB_TAG_NVPAIR "[@name='remote-node'][@value='%s']"

+#define BAREMETAL_REMOTE_NODE_XPATH "//" XML_CIB_TAG_RESOURCE "[@type='remote'][@provider='pacemaker'][@id='%s']"

+#define ORPHAN_REMOTE_NODE_XPATH "//" XML_CIB_TAG_STATUS "//" XML_CIB_TAG_STATE "[@id='%s'][@remote_node='true']"

+    int len = 128 + strlen(uname);

+    int rc = pcmk_ok;

+    char *xpath_string = calloc(1, len);

+

+    sprintf(xpath_string, CONTAINER_REMOTE_NODE_XPATH, uname);

+    if (found_remote_node_xpath(the_cib, xpath_string)) {

+        goto found_remote;

     }

-    if (rc == pcmk_ok) {

-        *uuid = strdup(uname);

+    sprintf(xpath_string, BAREMETAL_REMOTE_NODE_XPATH, uname);

+    if (found_remote_node_xpath(the_cib, xpath_string)) {

+        goto found_remote;

+    }

+

+    sprintf(xpath_string, ORPHAN_REMOTE_NODE_XPATH, uname);

+    if (found_remote_node_xpath(the_cib, xpath_string)) {

+        goto found_remote;

     }

+    rc = -1;

+found_remote:

+    if (rc == pcmk_ok) {

+        /* reuse allocation */

+        *uuid = xpath_string;

+        strcpy(*uuid, uname);

+    } else {

+        *uuid = NULL;

+        free(xpath_string);

+    }

     return rc;

 }

diff --git a/lib/pengine/complex.c b/lib/pengine/complex.c

index 5e2f4e0..8a6049d 100644

--- a/lib/pengine/complex.c

+++ b/lib/pengine/complex.c

@@ -159,6 +159,10 @@ get_rsc_attributes(GHashTable * meta_hash, resource_t * rsc,

     unpack_instance_attributes(data_set->input, rsc->xml, XML_TAG_ATTR_SETS, node_hash,

                                meta_hash, NULL, FALSE, data_set->now);

+    if (rsc->container) {

+        g_hash_table_replace(meta_hash, strdup(CRM_META"_"XML_RSC_ATTR_CONTAINER), strdup(rsc->container->id));

+    }

+

     /* set anything else based on the parent */

     if (rsc->parent != NULL) {

         get_rsc_attributes(meta_hash, rsc->parent, node, data_set);

diff --git a/lib/pengine/unpack.c b/lib/pengine/unpack.c

index b4986dd..26cecb2 100644

--- a/lib/pengine/unpack.c

+++ b/lib/pengine/unpack.c

@@ -248,6 +248,7 @@ create_node(const char *id, const char *uname, const char *type, const char *sco

     if (safe_str_eq(type, "remote")) {

         new_node->details->type = node_remote;

+        set_bit(data_set->flags, pe_flag_have_remote_nodes);

     } else if (type == NULL || safe_str_eq(type, "member")

         || safe_str_eq(type, NORMALNODE)) {

         new_node->details->type = node_member;

@@ -612,7 +613,6 @@ unpack_remote_nodes(xmlNode * xml_resources, pe_working_set_t * data_set)

         }

         if (new_node_id) {

-            set_bit(data_set->flags, pe_flag_have_remote_nodes);

             crm_trace("detected remote node %s", new_node_id);

             create_node(new_node_id, new_node_id, "remote", NULL, data_set);

         }

@@ -1399,6 +1399,22 @@ create_fake_resource(const char *rsc_id, xmlNode * rsc_entry, pe_working_set_t *

         return NULL;

     }

+    if (is_remote_node(xml_rsc)) {

+        node_t *node;

+

+        crm_debug("Detected orphaned remote node %s", rsc_id);

+        rsc->is_remote_node = TRUE;

+        node = create_node(rsc_id, rsc_id, "remote", NULL, data_set);

+        

+        CRM_ASSERT(node != NULL);

+        node->details->remote_rsc = rsc;

+    }

+

+    if (crm_element_value(rsc_entry, XML_RSC_ATTR_CONTAINER)) {

+        /* This orphaned rsc needs to be mapped to a container. */

+        crm_trace("Detected orphaned container filler %s", rsc_id);

+        set_bit(rsc->flags, pe_rsc_orphan_container_filler);

+    }

     set_bit(rsc->flags, pe_rsc_orphan);

     data_set->resources = g_list_append(data_set->resources, rsc);

     return rsc;

@@ -1860,7 +1876,7 @@ calculate_active_ops(GListPtr sorted_op_list, int *start_index, int *stop_index)

     }

 }

-static void

+static resource_t *

 unpack_lrm_rsc_state(node_t * node, xmlNode * rsc_entry, pe_working_set_t * data_set)

 {

     GListPtr gIter = NULL;

@@ -1896,7 +1912,7 @@ unpack_lrm_rsc_state(node_t * node, xmlNode * rsc_entry, pe_working_set_t * data

     if (op_list == NULL) {

         /* if there are no operations, there is nothing to do */

-        return;

+        return NULL;

     }

     /* find the resource */

@@ -1949,12 +1965,55 @@ unpack_lrm_rsc_state(node_t * node, xmlNode * rsc_entry, pe_working_set_t * data

     if (saved_role > rsc->role) {

         rsc->role = saved_role;

     }

+

+    return rsc;

+}

+

+static void

+handle_orphaned_container_fillers(xmlNode * lrm_rsc_list, pe_working_set_t * data_set)

+{

+    xmlNode *rsc_entry = NULL;

+    for (rsc_entry = __xml_first_child(lrm_rsc_list); rsc_entry != NULL;

+        rsc_entry = __xml_next(rsc_entry)) {

+

+        resource_t *rsc;

+        resource_t *container;

+        const char *rsc_id;

+        const char *container_id;

+

+        if (safe_str_neq((const char *)rsc_entry->name, XML_LRM_TAG_RESOURCE)) {

+            continue;

+        }

+

+        container_id = crm_element_value(rsc_entry, XML_RSC_ATTR_CONTAINER);

+        rsc_id = crm_element_value(rsc_entry, XML_ATTR_ID);

+        if (container_id == NULL || rsc_id == NULL) {

+            continue;

+        }

+

+        container = pe_find_resource(data_set->resources, container_id);

+        if (container == NULL) {

+            continue;

+        }

+

+        rsc = pe_find_resource(data_set->resources, rsc_id);

+        if (rsc == NULL ||

+            is_set(rsc->flags, pe_rsc_orphan_container_filler) == FALSE ||

+            rsc->container != NULL) {

+            continue;

+        }

+

+        pe_rsc_trace(rsc, "Mapped orphaned rsc %s's container to  %s", rsc->id, container_id);

+        rsc->container = container;

+        container->fillers = g_list_append(container->fillers, rsc);

+    }

 }

 gboolean

 unpack_lrm_resources(node_t * node, xmlNode * lrm_rsc_list, pe_working_set_t * data_set)

 {

     xmlNode *rsc_entry = NULL;

+    gboolean found_orphaned_container_filler = FALSE;

     CRM_CHECK(node != NULL, return FALSE);

@@ -1962,11 +2021,23 @@ unpack_lrm_resources(node_t * node, xmlNode * lrm_rsc_list, pe_working_set_t * d

     for (rsc_entry = __xml_first_child(lrm_rsc_list); rsc_entry != NULL;

          rsc_entry = __xml_next(rsc_entry)) {

+

         if (crm_str_eq((const char *)rsc_entry->name, XML_LRM_TAG_RESOURCE, TRUE)) {

-            unpack_lrm_rsc_state(node, rsc_entry, data_set);

+            resource_t *rsc;

+            rsc = unpack_lrm_rsc_state(node, rsc_entry, data_set);

+            if (rsc && is_set(rsc->flags, pe_rsc_orphan_container_filler)) {

+                found_orphaned_container_filler = TRUE;

+            }

         }

     }

+    /* now that all the resource state has been unpacked for this node

+     * we have to go back and map any orphaned container fillers to their

+     * container resource */

+    if (found_orphaned_container_filler) {

+        handle_orphaned_container_fillers(lrm_rsc_list, data_set);

+    }

+

     return TRUE;

 }

diff --git a/pengine/allocate.c b/pengine/allocate.c

index bfa8e7b..e535b84 100644

--- a/pengine/allocate.c

+++ b/pengine/allocate.c

@@ -1576,10 +1576,10 @@ apply_remote_node_ordering(pe_working_set_t *data_set)

         remote_rsc = action->node->details->remote_rsc;

         container = remote_rsc->container;

+

         if (safe_str_eq(action->task, "monitor") ||

             safe_str_eq(action->task, "start") ||

             safe_str_eq(action->task, "promote") ||

-            safe_str_eq(action->task, "demote") ||

             safe_str_eq(action->task, CRM_OP_LRM_REFRESH) ||

             safe_str_eq(action->task, CRM_OP_CLEAR_FAILCOUNT) ||

             safe_str_eq(action->task, "delete")) {

@@ -1593,6 +1593,39 @@ apply_remote_node_ordering(pe_working_set_t *data_set)

                 pe_order_implies_then | pe_order_runnable_left,

                 data_set);

+        } else if (safe_str_eq(action->task, "demote")) {

+

+            /* If the connection is being torn down, we don't want

+             * to build a constraint between a resource's demotion and

+             * the connection resource starting... because the connection

+             * resource can not start. The connection might already be up,

+             * but the START action would not be allowed which in turn would

+             * block the demotion of any resournces living in the remote-node.

+             *

+             * In this case, only build the constraint between the demotion and

+             * the connection's stop action. This allows the connection and all the

+             * resources within the remote-node to be torn down properly. */

+            if (remote_rsc->next_role == RSC_ROLE_STOPPED) {

+                custom_action_order(action->rsc,

+                    NULL,

+                    action,

+                    remote_rsc,

+                    generate_op_key(remote_rsc->id, RSC_STOP, 0),

+                    NULL,

+                    pe_order_implies_first,

+                    data_set);

+            } else {

+

+                custom_action_order(remote_rsc,

+                    generate_op_key(remote_rsc->id, RSC_START, 0),

+                    NULL,

+                    action->rsc,

+                    NULL,

+                    action,

+                    pe_order_implies_then | pe_order_runnable_left,

+                    data_set);

+            }

+

         } else if (safe_str_eq(action->task, "stop") &&

                    container &&

                    is_set(container->flags, pe_rsc_failed)) {

diff --git a/pengine/test10/container-1.exp b/pengine/test10/container-1.exp

index 1924ef8..522b0f1 100644

--- a/pengine/test10/container-1.exp

+++ b/pengine/test10/container-1.exp

@@ -47,7 +47,7 @@

     <action_set>

       <rsc_op id="10" operation="monitor" operation_key="rsc1_monitor_10000" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -60,7 +60,7 @@

     <action_set>

       <rsc_op id="9" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -73,7 +73,7 @@

     <action_set>

       <rsc_op id="12" operation="monitor" operation_key="rsc2_monitor_5000" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -86,7 +86,7 @@

     <action_set>

       <rsc_op id="11" operation="start" operation_key="rsc2_start_0" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

diff --git a/pengine/test10/container-2.exp b/pengine/test10/container-2.exp

index d699d28..c5f9e9e 100644

--- a/pengine/test10/container-2.exp

+++ b/pengine/test10/container-2.exp

@@ -45,7 +45,7 @@

     <action_set>

       <rsc_op id="11" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -61,7 +61,7 @@

     <action_set>

       <rsc_op id="10" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs/>

@@ -70,7 +70,7 @@

     <action_set>

       <rsc_op id="2" operation="monitor" operation_key="rsc1_monitor_10000" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -83,7 +83,7 @@

     <action_set>

       <rsc_op id="13" operation="start" operation_key="rsc2_start_0" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -99,7 +99,7 @@

     <action_set>

       <rsc_op id="12" operation="stop" operation_key="rsc2_stop_0" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs/>

@@ -108,7 +108,7 @@

     <action_set>

       <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_5000" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

diff --git a/pengine/test10/container-3.exp b/pengine/test10/container-3.exp

index cc774da..3c2703a 100644

--- a/pengine/test10/container-3.exp

+++ b/pengine/test10/container-3.exp

@@ -42,7 +42,7 @@

     <action_set>

       <rsc_op id="10" operation="monitor" operation_key="rsc1_monitor_10000" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -55,7 +55,7 @@

     <action_set>

       <rsc_op id="9" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -68,7 +68,7 @@

     <action_set>

       <rsc_op id="12" operation="start" operation_key="rsc2_start_0" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -84,7 +84,7 @@

     <action_set>

       <rsc_op id="11" operation="stop" operation_key="rsc2_stop_0" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs/>

@@ -93,7 +93,7 @@

     <action_set>

       <rsc_op id="3" operation="monitor" operation_key="rsc2_monitor_5000" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

diff --git a/pengine/test10/container-4.exp b/pengine/test10/container-4.exp

index 72f50cc..d1da381 100644

--- a/pengine/test10/container-4.exp

+++ b/pengine/test10/container-4.exp

@@ -45,7 +45,7 @@

     <action_set>

       <rsc_op id="13" operation="monitor" operation_key="rsc1_monitor_10000" on_node="node2" on_node_uuid="node2">

         <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -58,7 +58,7 @@

     <action_set>

       <rsc_op id="12" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="node2">

         <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -74,7 +74,7 @@

     <action_set>

       <rsc_op id="11" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs/>

@@ -83,7 +83,7 @@

     <action_set>

       <rsc_op id="16" operation="monitor" operation_key="rsc2_monitor_5000" on_node="node2" on_node_uuid="node2">

         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -96,7 +96,7 @@

     <action_set>

       <rsc_op id="15" operation="start" operation_key="rsc2_start_0" on_node="node2" on_node_uuid="node2">

         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -112,7 +112,7 @@

     <action_set>

       <rsc_op id="14" operation="stop" operation_key="rsc2_stop_0" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs/>

diff --git a/pengine/test10/container-group-1.exp b/pengine/test10/container-group-1.exp

index a007f84..b14aa4c 100644

--- a/pengine/test10/container-group-1.exp

+++ b/pengine/test10/container-group-1.exp

@@ -79,7 +79,7 @@

     <action_set>

       <rsc_op id="10" operation="monitor" operation_key="rsc1_monitor_10000" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -92,7 +92,7 @@

     <action_set>

       <rsc_op id="9" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -111,7 +111,7 @@

     <action_set>

       <rsc_op id="12" operation="monitor" operation_key="rsc2_monitor_5000" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -124,7 +124,7 @@

     <action_set>

       <rsc_op id="11" operation="start" operation_key="rsc2_start_0" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

diff --git a/pengine/test10/container-group-2.exp b/pengine/test10/container-group-2.exp

index 6d5e283..ce32cc3 100644

--- a/pengine/test10/container-group-2.exp

+++ b/pengine/test10/container-group-2.exp

@@ -113,7 +113,7 @@

     <action_set>

       <rsc_op id="11" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -132,7 +132,7 @@

     <action_set>

       <rsc_op id="10" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -148,7 +148,7 @@

     <action_set>

       <rsc_op id="2" operation="monitor" operation_key="rsc1_monitor_10000" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -161,7 +161,7 @@

     <action_set>

       <rsc_op id="13" operation="start" operation_key="rsc2_start_0" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -183,7 +183,7 @@

     <action_set>

       <rsc_op id="12" operation="stop" operation_key="rsc2_stop_0" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -196,7 +196,7 @@

     <action_set>

       <rsc_op id="4" operation="monitor" operation_key="rsc2_monitor_5000" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

diff --git a/pengine/test10/container-group-3.exp b/pengine/test10/container-group-3.exp

index 4df7279..96d99c6 100644

--- a/pengine/test10/container-group-3.exp

+++ b/pengine/test10/container-group-3.exp

@@ -101,7 +101,7 @@

     <action_set>

       <rsc_op id="9" operation="monitor" operation_key="rsc1_monitor_10000" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -114,7 +114,7 @@

     <action_set>

       <rsc_op id="8" operation="start" operation_key="rsc1_start_0" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -130,7 +130,7 @@

     <action_set>

       <rsc_op id="11" operation="monitor" operation_key="rsc2_monitor_5000" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -143,7 +143,7 @@

     <action_set>

       <rsc_op id="10" operation="start" operation_key="rsc2_start_0" on_node="node1" on_node_uuid="node1">

         <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

diff --git a/pengine/test10/container-group-4.exp b/pengine/test10/container-group-4.exp

index dd5aad7..6128599 100644

--- a/pengine/test10/container-group-4.exp

+++ b/pengine/test10/container-group-4.exp

@@ -113,7 +113,7 @@

     <action_set>

       <rsc_op id="13" operation="monitor" operation_key="rsc1_monitor_10000" on_node="node2" on_node_uuid="node2">

         <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -126,7 +126,7 @@

     <action_set>

       <rsc_op id="12" operation="start" operation_key="rsc1_start_0" on_node="node2" on_node_uuid="node2">

         <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy"/>

-        <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

+        <attributes CRM_meta_container="container1" CRM_meta_timeout="20000" crm_feature_set="3.0.7"/>

       </rsc_op>

     </action_set>

     <inputs>

@@ -145,7 +145,7 @@

     <action_set>

       <rsc_op id="11" operation="stop" operation_key="rsc1_stop_0" on_node="node1" on_node_uuid="node1">