4 files changed, 110 insertions(+), 100 deletions(-)
lib/pengine/clone.c | 30 ++++++
lib/pengine/native.c | 10 +-
pengine/test10/master-ordering.dot | 4
pengine/test10/master-ordering.exp | 166 +++++++++++++++---------------------
# HG changeset patch
# User Andrew Beekhof <[EMAIL PROTECTED]>
# Date 1226501802 -3600
# Branch stable-1.0
# Node ID 3df4fa1b1b92deb2e16706da24114079c484e37f
# Parent 72cc9ef914d749d584b605a36122a95afc3ae411
Medium: PE: Prevent lsb scripts from being used in globally unique clones
diff --git a/lib/pengine/clone.c b/lib/pengine/clone.c
--- a/lib/pengine/clone.c
+++ b/lib/pengine/clone.c
@@ -30,6 +30,7 @@ void clone_create_notifications(
void clone_create_notifications(
resource_t *rsc, action_t *action, action_t *action_complete,
pe_working_set_t *data_set);
+void force_non_unique_clone(resource_t *rsc, const char *rid, pe_working_set_t *data_set);
gboolean create_child_clone(resource_t *rsc, int sub_id, pe_working_set_t *data_set);
static void mark_as_orphan(resource_t *rsc)
@@ -39,6 +40,34 @@ static void mark_as_orphan(resource_t *r
child, resource_t, rsc->children, lpc,
mark_as_orphan(child);
);
+}
+
+static void clear_bit_recursive(resource_t *rsc, unsigned long long flag)
+{
+ clear_bit_inplace(rsc->flags, flag);
+ if(rsc->children) {
+ slist_iter(
+ child_rsc, resource_t, rsc->children, lpc,
+ clear_bit_recursive(child_rsc, flag);
+ );
+ }
+}
+
+void force_non_unique_clone(resource_t *rsc, const char *rid, pe_working_set_t *data_set)
+{
+ if(rsc->variant == pe_clone || rsc->variant == pe_master) {
+ clone_variant_data_t *clone_data = NULL;
+ get_clone_variant_data(clone_data, rsc);
+
+ crm_config_warn("Clones %s contains non-OCF resource %s and so "
+ "can only be used as an anonymous clone. "
+ "Set the "XML_RSC_ATTR_UNIQUE" meta attribute to false",
+ rsc->id, rid);
+
+ clone_data->clone_node_max = 1;
+ clone_data->clone_max = g_list_length(data_set->nodes);
+ clear_bit_recursive(rsc, pe_rsc_unique);
+ }
}
gboolean
@@ -216,6 +245,7 @@ gboolean clone_unpack(resource_t *rsc, p
return FALSE;
}
+ crm_debug_2("\tClone is unique (fixed): %s", is_set(rsc->flags, pe_rsc_unique)?"true":"false");
clone_data->notify_confirm = is_set(rsc->flags, pe_rsc_notify);
for(lpc = 0; lpc < clone_data->clone_max; lpc++) {
diff --git a/lib/pengine/native.c b/lib/pengine/native.c
--- a/lib/pengine/native.c
+++ b/lib/pengine/native.c
@@ -95,10 +95,10 @@ native_add_running(resource_t *rsc, node
if(rsc->parent != NULL) {
native_add_running(rsc->parent, node, data_set);
}
-
}
+extern void force_non_unique_clone(resource_t *rsc, const char *rid, pe_working_set_t *data_set);
gboolean native_unpack(resource_t *rsc, pe_working_set_t *data_set)
{
native_variant_data_t *native_data = NULL;
@@ -110,6 +110,14 @@ gboolean native_unpack(resource_t *rsc,
rsc->allowed_nodes = NULL;
rsc->running_on = NULL;
+ if(is_set(rsc->flags, pe_rsc_unique) && rsc->parent) {
+ const char *class = crm_element_value(rsc->xml, XML_AGENT_ATTR_CLASS);
+ if(safe_str_eq(class, "lsb")) {
+ resource_t *top = uber_parent(rsc);
+ force_non_unique_clone(top, rsc->id, data_set);
+ }
+ }
+
rsc->variant_opaque = native_data;
return TRUE;
}
diff --git a/pengine/test10/master-ordering.dot b/pengine/test10/master-ordering.dot
--- a/pengine/test10/master-ordering.dot
+++ b/pengine/test10/master-ordering.dot
@@ -1,8 +1,6 @@ digraph "g" {
digraph "g" {
"apache2:0_monitor_0 webcluster01" -> "probe_complete webcluster01" [ style = bold]
"apache2:0_monitor_0 webcluster01" [ style=bold color="green" fontcolor="black" ]
-"apache2:1_monitor_0 webcluster01" -> "probe_complete webcluster01" [ style = bold]
-"apache2:1_monitor_0 webcluster01" [ style=bold color="green" fontcolor="black" ]
"drbd_mysql:0_monitor_0 webcluster01" -> "probe_complete webcluster01" [ style = bold]
"drbd_mysql:0_monitor_0 webcluster01" [ style=bold color="green" fontcolor="black" ]
"drbd_mysql:0_post_notify_start_0 webcluster01" -> "ms_drbd_mysql_confirmed-post_notify_start_0" [ style = bold]
@@ -75,8 +73,6 @@ digraph "g" {
"ms_drbd_www_stop_0" [ style=bold color="green" fontcolor="orange" ]
"mysql-proxy:0_monitor_0 webcluster01" -> "probe_complete webcluster01" [ style = bold]
"mysql-proxy:0_monitor_0 webcluster01" [ style=bold color="green" fontcolor="black" ]
-"mysql-proxy:1_monitor_0 webcluster01" -> "probe_complete webcluster01" [ style = bold]
-"mysql-proxy:1_monitor_0 webcluster01" [ style=bold color="green" fontcolor="black" ]
"mysql-server_monitor_0 webcluster01" -> "probe_complete webcluster01" [ style = bold]
"mysql-server_monitor_0 webcluster01" [ style=bold color="green" fontcolor="black" ]
"ocfs2_www:0_monitor_0 webcluster01" -> "probe_complete webcluster01" [ style = bold]
diff --git a/pengine/test10/master-ordering.exp b/pengine/test10/master-ordering.exp
--- a/pengine/test10/master-ordering.exp
+++ b/pengine/test10/master-ordering.exp
@@ -19,7 +19,7 @@
</synapse>
<synapse id="2">
<action_set>
- <rsc_op id="19" operation="start" operation_key="extip_1_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
+ <rsc_op id="17" operation="start" operation_key="extip_1_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
<primitive id="extip_1" long-id="extip_1" class="ocf" provider="heartbeat" type="IPaddr2"/>
<attributes CRM_meta_timeout="20000" crm_feature_set="3.0" ip="85.125.191.221" netmask="28" nic="eth0" target_role="started"/>
</rsc_op>
@@ -32,14 +32,14 @@
</synapse>
<synapse id="3">
<action_set>
- <rsc_op id="20" operation="monitor" operation_key="extip_1_monitor_30000" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
+ <rsc_op id="18" operation="monitor" operation_key="extip_1_monitor_30000" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
<primitive id="extip_1" long-id="extip_1" class="ocf" provider="heartbeat" type="IPaddr2"/>
<attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_timeout="30000" crm_feature_set="3.0" ip="85.125.191.221" netmask="28" nic="eth0" target_role="started"/>
</rsc_op>
</action_set>
<inputs>
<trigger>
- <rsc_op id="19" operation="start" operation_key="extip_1_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
+ <rsc_op id="17" operation="start" operation_key="extip_1_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
</trigger>
</inputs>
</synapse>
@@ -54,7 +54,7 @@
</synapse>
<synapse id="5">
<action_set>
- <rsc_op id="21" operation="start" operation_key="extip_2_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
+ <rsc_op id="19" operation="start" operation_key="extip_2_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
<primitive id="extip_2" long-id="extip_2" class="ocf" provider="heartbeat" type="IPaddr2"/>
<attributes CRM_meta_timeout="20000" crm_feature_set="3.0" ip="85.125.191.222" netmask="28" nic="eth0" target_role="started"/>
</rsc_op>
@@ -67,14 +67,14 @@
</synapse>
<synapse id="6">
<action_set>
- <rsc_op id="22" operation="monitor" operation_key="extip_2_monitor_30000" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
+ <rsc_op id="20" operation="monitor" operation_key="extip_2_monitor_30000" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
<primitive id="extip_2" long-id="extip_2" class="ocf" provider="heartbeat" type="IPaddr2"/>
<attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_timeout="30000" crm_feature_set="3.0" ip="85.125.191.222" netmask="28" nic="eth0" target_role="started"/>
</rsc_op>
</action_set>
<inputs>
<trigger>
- <rsc_op id="21" operation="start" operation_key="extip_2_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
+ <rsc_op id="19" operation="start" operation_key="extip_2_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
</trigger>
</inputs>
</synapse>
@@ -98,7 +98,7 @@
</synapse>
<synapse id="9">
<action_set>
- <rsc_op id="27" operation="start" operation_key="intip_1_master_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
+ <rsc_op id="25" operation="start" operation_key="intip_1_master_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
<primitive id="intip_1_master" long-id="intip_1_master" class="ocf" provider="heartbeat" type="IPaddr2"/>
<attributes CRM_meta_timeout="20000" crm_feature_set="3.0" ip="192.168.100.201" netmask="24" nic="eth1" target_role="started"/>
</rsc_op>
@@ -111,14 +111,14 @@
</synapse>
<synapse id="10">
<action_set>
- <rsc_op id="28" operation="monitor" operation_key="intip_1_master_monitor_30000" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
+ <rsc_op id="26" operation="monitor" operation_key="intip_1_master_monitor_30000" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
<primitive id="intip_1_master" long-id="intip_1_master" class="ocf" provider="heartbeat" type="IPaddr2"/>
<attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_timeout="30000" crm_feature_set="3.0" ip="192.168.100.201" netmask="24" nic="eth1" target_role="started"/>
</rsc_op>
</action_set>
<inputs>
<trigger>
- <rsc_op id="27" operation="start" operation_key="intip_1_master_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
+ <rsc_op id="25" operation="start" operation_key="intip_1_master_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
</trigger>
</inputs>
</synapse>
@@ -133,7 +133,7 @@
</synapse>
<synapse id="12">
<action_set>
- <rsc_op id="29" operation="start" operation_key="intip_2_slave_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
+ <rsc_op id="27" operation="start" operation_key="intip_2_slave_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
<primitive id="intip_2_slave" long-id="intip_2_slave" class="ocf" provider="heartbeat" type="IPaddr2"/>
<attributes CRM_meta_timeout="20000" crm_feature_set="3.0" ip="192.168.100.202" netmask="24" nic="eth1" target_role="started"/>
</rsc_op>
@@ -146,14 +146,14 @@
</synapse>
<synapse id="13">
<action_set>
- <rsc_op id="30" operation="monitor" operation_key="intip_2_slave_monitor_30000" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
+ <rsc_op id="28" operation="monitor" operation_key="intip_2_slave_monitor_30000" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
<primitive id="intip_2_slave" long-id="intip_2_slave" class="ocf" provider="heartbeat" type="IPaddr2"/>
<attributes CRM_meta_interval="30000" CRM_meta_name="monitor" CRM_meta_timeout="30000" crm_feature_set="3.0" ip="192.168.100.202" netmask="24" nic="eth1" target_role="started"/>
</rsc_op>
</action_set>
<inputs>
<trigger>
- <rsc_op id="29" operation="start" operation_key="intip_2_slave_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
+ <rsc_op id="27" operation="start" operation_key="intip_2_slave_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
</trigger>
</inputs>
</synapse>
@@ -168,7 +168,7 @@
</synapse>
<synapse id="15">
<action_set>
- <rsc_op id="31" operation="start" operation_key="drbd_www:0_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
+ <rsc_op id="29" operation="start" operation_key="drbd_www:0_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
<primitive id="drbd_www:0" long-id="ms_drbd_www:drbd_www:0" class="ocf" provider="heartbeat" type="drbd"/>
<attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd_www:0 drbd_www:1 " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd_www:0 " CRM_meta_notify_start_uname="webcluster01 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_stateful="true" CRM_meta_timeout="20000" clone_overrides_hostname="yes" crm_feature_set="3.0" drbd_resource="www" target_role="started"/>
</rsc_op>
@@ -178,26 +178,26 @@
<pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
</trigger>
<trigger>
- <pseudo_event id="32" operation="start" operation_key="ms_drbd_www_start_0"/>
+ <pseudo_event id="30" operation="start" operation_key="ms_drbd_www_start_0"/>
</trigger>
</inputs>
</synapse>
<synapse id="16" priority="1000000">
<action_set>
- <rsc_op id="133" operation="notify" operation_key="drbd_www:0_post_notify_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
+ <rsc_op id="131" operation="notify" operation_key="drbd_www:0_post_notify_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
<primitive id="drbd_www:0" long-id="ms_drbd_www:drbd_www:0" class="ocf" provider="heartbeat" type="drbd"/>
<attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_confirm="yes" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd_www:0 drbd_www:1 " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd_www:0 " CRM_meta_notify_start_uname="webcluster01 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_stateful="true" CRM_meta_timeout="20000" clone_overrides_hostname="yes" crm_feature_set="3.0" drbd_resource="www" target_role="started"/>
</rsc_op>
</action_set>
<inputs>
<trigger>
- <pseudo_event id="36" operation="notify" operation_key="ms_drbd_www_post_notify_start_0"/>
+ <pseudo_event id="34" operation="notify" operation_key="ms_drbd_www_post_notify_start_0"/>
</trigger>
</inputs>
</synapse>
<synapse id="17">
<action_set>
- <pseudo_event id="32" operation="start" operation_key="ms_drbd_www_start_0">
+ <pseudo_event id="30" operation="start" operation_key="ms_drbd_www_start_0">
<attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_stateful="true" CRM_meta_timeout="20000" crm_feature_set="3.0"/>
</pseudo_event>
</action_set>
@@ -206,37 +206,37 @@
<pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
</trigger>
<trigger>
- <rsc_op id="27" operation="start" operation_key="intip_1_master_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
+ <rsc_op id="25" operation="start" operation_key="intip_1_master_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
</trigger>
<trigger>
- <rsc_op id="29" operation="start" operation_key="intip_2_slave_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
+ <rsc_op id="27" operation="start" operation_key="intip_2_slave_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
</trigger>
<trigger>
- <pseudo_event id="35" operation="notified" operation_key="ms_drbd_www_confirmed-pre_notify_start_0"/>
+ <pseudo_event id="33" operation="notified" operation_key="ms_drbd_www_confirmed-pre_notify_start_0"/>
</trigger>
<trigger>
- <pseudo_event id="38" operation="stop" operation_key="ms_drbd_www_stop_0"/>
+ <pseudo_event id="36" operation="stop" operation_key="ms_drbd_www_stop_0"/>
</trigger>
</inputs>
</synapse>
<synapse id="18" priority="1000000">
<action_set>
- <pseudo_event id="33" operation="running" operation_key="ms_drbd_www_running_0">
+ <pseudo_event id="31" operation="running" operation_key="ms_drbd_www_running_0">
<attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_stateful="true" CRM_meta_timeout="20000" crm_feature_set="3.0"/>
</pseudo_event>
</action_set>
<inputs>
<trigger>
- <rsc_op id="31" operation="start" operation_key="drbd_www:0_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
+ <rsc_op id="29" operation="start" operation_key="drbd_www:0_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
</trigger>
<trigger>
- <pseudo_event id="32" operation="start" operation_key="ms_drbd_www_start_0"/>
+ <pseudo_event id="30" operation="start" operation_key="ms_drbd_www_start_0"/>
</trigger>
</inputs>
</synapse>
<synapse id="19">
<action_set>
- <pseudo_event id="34" operation="notify" operation_key="ms_drbd_www_pre_notify_start_0">
+ <pseudo_event id="32" operation="notify" operation_key="ms_drbd_www_pre_notify_start_0">
<attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify_confirm="yes" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_stateful="true" CRM_meta_timeout="20000" crm_feature_set="3.0"/>
</pseudo_event>
</action_set>
@@ -244,46 +244,46 @@
</synapse>
<synapse id="20">
<action_set>
- <pseudo_event id="35" operation="notified" operation_key="ms_drbd_www_confirmed-pre_notify_start_0">
+ <pseudo_event id="33" operation="notified" operation_key="ms_drbd_www_confirmed-pre_notify_start_0">
<attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_stateful="true" CRM_meta_timeout="20000" crm_feature_set="3.0"/>
</pseudo_event>
</action_set>
<inputs>
<trigger>
- <pseudo_event id="34" operation="notify" operation_key="ms_drbd_www_pre_notify_start_0"/>
+ <pseudo_event id="32" operation="notify" operation_key="ms_drbd_www_pre_notify_start_0"/>
</trigger>
</inputs>
</synapse>
<synapse id="21" priority="1000000">
<action_set>
- <pseudo_event id="36" operation="notify" operation_key="ms_drbd_www_post_notify_start_0">
+ <pseudo_event id="34" operation="notify" operation_key="ms_drbd_www_post_notify_start_0">
<attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify_confirm="yes" CRM_meta_notify_operation="start" CRM_meta_notify_type="post" CRM_meta_stateful="true" CRM_meta_timeout="20000" crm_feature_set="3.0"/>
</pseudo_event>
</action_set>
<inputs>
<trigger>
- <pseudo_event id="33" operation="running" operation_key="ms_drbd_www_running_0"/>
+ <pseudo_event id="31" operation="running" operation_key="ms_drbd_www_running_0"/>
</trigger>
</inputs>
</synapse>
<synapse id="22" priority="1000000">
<action_set>
- <pseudo_event id="37" operation="notified" operation_key="ms_drbd_www_confirmed-post_notify_start_0">
+ <pseudo_event id="35" operation="notified" operation_key="ms_drbd_www_confirmed-post_notify_start_0">
<attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_stateful="true" CRM_meta_timeout="20000" crm_feature_set="3.0"/>
</pseudo_event>
</action_set>
<inputs>
<trigger>
- <pseudo_event id="36" operation="notify" operation_key="ms_drbd_www_post_notify_start_0"/>
+ <pseudo_event id="34" operation="notify" operation_key="ms_drbd_www_post_notify_start_0"/>
</trigger>
<trigger>
- <rsc_op id="133" operation="notify" operation_key="drbd_www:0_post_notify_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
+ <rsc_op id="131" operation="notify" operation_key="drbd_www:0_post_notify_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
</trigger>
</inputs>
</synapse>
<synapse id="23">
<action_set>
- <pseudo_event id="38" operation="stop" operation_key="ms_drbd_www_stop_0">
+ <pseudo_event id="36" operation="stop" operation_key="ms_drbd_www_stop_0">
<attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="2" CRM_meta_master_node_max="1" CRM_meta_timeout="20000" crm_feature_set="3.0"/>
</pseudo_event>
</action_set>
@@ -331,34 +331,16 @@
</synapse>
<synapse id="28">
<action_set>
- <rsc_op id="15" operation="monitor" operation_key="apache2:1_monitor_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
- <primitive id="apache2:1" long-id="clone_webservice:group_webservice:1:apache2:1" class="ocf" provider="heartbeat" type="apache"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" configfile="/etc/apache2/apache2.conf" crm_feature_set="3.0" httpd="/usr/sbin/apache2" options="-k start" target_role="started"/>
+ <rsc_op id="15" operation="monitor" operation_key="drbd_mysql:0_monitor_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
+ <primitive id="drbd_mysql:0" long-id="ms_drbd_mysql:drbd_mysql:0" class="ocf" provider="heartbeat" type="drbd"/>
+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_op_target_rc="7" CRM_meta_stateful="true" CRM_meta_timeout="20000" clone_overrides_hostname="yes" crm_feature_set="3.0" drbd_resource="mysql1" target_role="started"/>
</rsc_op>
</action_set>
<inputs/>
</synapse>
<synapse id="29">
<action_set>
- <rsc_op id="16" operation="monitor" operation_key="mysql-proxy:1_monitor_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
- <primitive id="mysql-proxy:1" long-id="clone_webservice:group_webservice:1:mysql-proxy:1" class="lsb" type="mysql-proxy"/>
- <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0" target_role="started"/>
- </rsc_op>
- </action_set>
- <inputs/>
- </synapse>
- <synapse id="30">
- <action_set>
- <rsc_op id="17" operation="monitor" operation_key="drbd_mysql:0_monitor_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
- <primitive id="drbd_mysql:0" long-id="ms_drbd_mysql:drbd_mysql:0" class="ocf" provider="heartbeat" type="drbd"/>
- <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_op_target_rc="7" CRM_meta_stateful="true" CRM_meta_timeout="20000" clone_overrides_hostname="yes" crm_feature_set="3.0" drbd_resource="mysql1" target_role="started"/>
- </rsc_op>
- </action_set>
- <inputs/>
- </synapse>
- <synapse id="31">
- <action_set>
- <rsc_op id="72" operation="start" operation_key="drbd_mysql:0_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
+ <rsc_op id="70" operation="start" operation_key="drbd_mysql:0_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
<primitive id="drbd_mysql:0" long-id="ms_drbd_mysql:drbd_mysql:0" class="ocf" provider="heartbeat" type="drbd"/>
<attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd_mysql:0 drbd_mysql:1 " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd_mysql:0 " CRM_meta_notify_start_uname="webcluster01 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_stateful="true" CRM_meta_timeout="20000" clone_overrides_hostname="yes" crm_feature_set="3.0" drbd_resource="mysql1" target_role="started"/>
</rsc_op>
@@ -368,26 +350,26 @@
<pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
</trigger>
<trigger>
- <pseudo_event id="73" operation="start" operation_key="ms_drbd_mysql_start_0"/>
+ <pseudo_event id="71" operation="start" operation_key="ms_drbd_mysql_start_0"/>
</trigger>
</inputs>
</synapse>
- <synapse id="32" priority="1000000">
+ <synapse id="30" priority="1000000">
<action_set>
- <rsc_op id="135" operation="notify" operation_key="drbd_mysql:0_post_notify_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
+ <rsc_op id="133" operation="notify" operation_key="drbd_mysql:0_post_notify_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
<primitive id="drbd_mysql:0" long-id="ms_drbd_mysql:drbd_mysql:0" class="ocf" provider="heartbeat" type="drbd"/>
<attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify_active_resource=" " CRM_meta_notify_active_uname=" " CRM_meta_notify_confirm="yes" CRM_meta_notify_demote_resource=" " CRM_meta_notify_demote_uname=" " CRM_meta_notify_inactive_resource="drbd_mysql:0 drbd_mysql:1 " CRM_meta_notify_master_resource=" " CRM_meta_notify_master_uname=" " CRM_meta_notify_operation="start" CRM_meta_notify_promote_resource=" " CRM_meta_notify_promote_uname=" " CRM_meta_notify_slave_resource=" " CRM_meta_notify_slave_uname=" " CRM_meta_notify_start_resource="drbd_mysql:0 " CRM_meta_notify_start_uname="webcluster01 " CRM_meta_notify_stop_resource=" " CRM_meta_notify_stop_uname=" " CRM_meta_notify_type="post" CRM_meta_stateful="true" CRM_meta_timeout="20000" clone_overrides_hostname="yes" crm_feature_set="3.0" drbd_resource="mysql1" target_role="started"/>
</rsc_op>
</action_set>
<inputs>
<trigger>
- <pseudo_event id="77" operation="notify" operation_key="ms_drbd_mysql_post_notify_start_0"/>
+ <pseudo_event id="75" operation="notify" operation_key="ms_drbd_mysql_post_notify_start_0"/>
</trigger>
</inputs>
</synapse>
- <synapse id="33">
+ <synapse id="31">
<action_set>
- <pseudo_event id="73" operation="start" operation_key="ms_drbd_mysql_start_0">
+ <pseudo_event id="71" operation="start" operation_key="ms_drbd_mysql_start_0">
<attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_stateful="true" CRM_meta_timeout="20000" crm_feature_set="3.0"/>
</pseudo_event>
</action_set>
@@ -396,84 +378,84 @@
<pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
</trigger>
<trigger>
- <rsc_op id="27" operation="start" operation_key="intip_1_master_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
+ <rsc_op id="25" operation="start" operation_key="intip_1_master_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
</trigger>
<trigger>
- <rsc_op id="29" operation="start" operation_key="intip_2_slave_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
+ <rsc_op id="27" operation="start" operation_key="intip_2_slave_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
</trigger>
<trigger>
- <pseudo_event id="76" operation="notified" operation_key="ms_drbd_mysql_confirmed-pre_notify_start_0"/>
+ <pseudo_event id="74" operation="notified" operation_key="ms_drbd_mysql_confirmed-pre_notify_start_0"/>
</trigger>
<trigger>
- <pseudo_event id="79" operation="stop" operation_key="ms_drbd_mysql_stop_0"/>
+ <pseudo_event id="77" operation="stop" operation_key="ms_drbd_mysql_stop_0"/>
</trigger>
</inputs>
</synapse>
- <synapse id="34" priority="1000000">
+ <synapse id="32" priority="1000000">
<action_set>
- <pseudo_event id="74" operation="running" operation_key="ms_drbd_mysql_running_0">
+ <pseudo_event id="72" operation="running" operation_key="ms_drbd_mysql_running_0">
<attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_stateful="true" CRM_meta_timeout="20000" crm_feature_set="3.0"/>
</pseudo_event>
</action_set>
<inputs>
<trigger>
- <rsc_op id="72" operation="start" operation_key="drbd_mysql:0_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
+ <rsc_op id="70" operation="start" operation_key="drbd_mysql:0_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
</trigger>
<trigger>
- <pseudo_event id="73" operation="start" operation_key="ms_drbd_mysql_start_0"/>
+ <pseudo_event id="71" operation="start" operation_key="ms_drbd_mysql_start_0"/>
</trigger>
</inputs>
</synapse>
- <synapse id="35">
+ <synapse id="33">
<action_set>
- <pseudo_event id="75" operation="notify" operation_key="ms_drbd_mysql_pre_notify_start_0">
+ <pseudo_event id="73" operation="notify" operation_key="ms_drbd_mysql_pre_notify_start_0">
<attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify_confirm="yes" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_stateful="true" CRM_meta_timeout="20000" crm_feature_set="3.0"/>
</pseudo_event>
</action_set>
<inputs/>
</synapse>
- <synapse id="36">
+ <synapse id="34">
<action_set>
- <pseudo_event id="76" operation="notified" operation_key="ms_drbd_mysql_confirmed-pre_notify_start_0">
+ <pseudo_event id="74" operation="notified" operation_key="ms_drbd_mysql_confirmed-pre_notify_start_0">
<attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_stateful="true" CRM_meta_timeout="20000" crm_feature_set="3.0"/>
</pseudo_event>
</action_set>
<inputs>
<trigger>
- <pseudo_event id="75" operation="notify" operation_key="ms_drbd_mysql_pre_notify_start_0"/>
+ <pseudo_event id="73" operation="notify" operation_key="ms_drbd_mysql_pre_notify_start_0"/>
</trigger>
</inputs>
</synapse>
- <synapse id="37" priority="1000000">
+ <synapse id="35" priority="1000000">
<action_set>
- <pseudo_event id="77" operation="notify" operation_key="ms_drbd_mysql_post_notify_start_0">
+ <pseudo_event id="75" operation="notify" operation_key="ms_drbd_mysql_post_notify_start_0">
<attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify_confirm="yes" CRM_meta_notify_operation="start" CRM_meta_notify_type="post" CRM_meta_stateful="true" CRM_meta_timeout="20000" crm_feature_set="3.0"/>
</pseudo_event>
</action_set>
<inputs>
<trigger>
- <pseudo_event id="74" operation="running" operation_key="ms_drbd_mysql_running_0"/>
+ <pseudo_event id="72" operation="running" operation_key="ms_drbd_mysql_running_0"/>
</trigger>
</inputs>
</synapse>
- <synapse id="38" priority="1000000">
+ <synapse id="36" priority="1000000">
<action_set>
- <pseudo_event id="78" operation="notified" operation_key="ms_drbd_mysql_confirmed-post_notify_start_0">
+ <pseudo_event id="76" operation="notified" operation_key="ms_drbd_mysql_confirmed-post_notify_start_0">
<attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_notify_operation="start" CRM_meta_notify_type="pre" CRM_meta_stateful="true" CRM_meta_timeout="20000" crm_feature_set="3.0"/>
</pseudo_event>
</action_set>
<inputs>
<trigger>
- <pseudo_event id="77" operation="notify" operation_key="ms_drbd_mysql_post_notify_start_0"/>
+ <pseudo_event id="75" operation="notify" operation_key="ms_drbd_mysql_post_notify_start_0"/>
</trigger>
<trigger>
- <rsc_op id="135" operation="notify" operation_key="drbd_mysql:0_post_notify_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
+ <rsc_op id="133" operation="notify" operation_key="drbd_mysql:0_post_notify_start_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
</trigger>
</inputs>
</synapse>
- <synapse id="39">
+ <synapse id="37">
<action_set>
- <pseudo_event id="79" operation="stop" operation_key="ms_drbd_mysql_stop_0">
+ <pseudo_event id="77" operation="stop" operation_key="ms_drbd_mysql_stop_0">
<attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_master_max="1" CRM_meta_master_node_max="1" CRM_meta_timeout="20000" crm_feature_set="3.0"/>
</pseudo_event>
</action_set>
@@ -483,16 +465,16 @@
</trigger>
</inputs>
</synapse>
- <synapse id="40">
+ <synapse id="38">
<action_set>
- <rsc_op id="18" operation="monitor" operation_key="fs_mysql_monitor_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
+ <rsc_op id="16" operation="monitor" operation_key="fs_mysql_monitor_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
<primitive id="fs_mysql" long-id="fs_mysql" class="ocf" provider="heartbeat" type="Filesystem"/>
<attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0" device="/dev/drbd1" directory="/data/mysql" fstype="ext3"/>
</rsc_op>
</action_set>
<inputs/>
</synapse>
- <synapse id="41">
+ <synapse id="39">
<action_set>
<pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
<attributes crm_feature_set="3.0"/>
@@ -504,7 +486,7 @@
</trigger>
</inputs>
</synapse>
- <synapse id="42" priority="1000000">
+ <synapse id="40" priority="1000000">
<action_set>
<rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298">
<attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0"/>
@@ -545,16 +527,10 @@
<rsc_op id="14" operation="monitor" operation_key="mysql-proxy:0_monitor_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
</trigger>
<trigger>
- <rsc_op id="15" operation="monitor" operation_key="apache2:1_monitor_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
+ <rsc_op id="15" operation="monitor" operation_key="drbd_mysql:0_monitor_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
</trigger>
<trigger>
- <rsc_op id="16" operation="monitor" operation_key="mysql-proxy:1_monitor_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
- </trigger>
- <trigger>
- <rsc_op id="17" operation="monitor" operation_key="drbd_mysql:0_monitor_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
- </trigger>
- <trigger>
- <rsc_op id="18" operation="monitor" operation_key="fs_mysql_monitor_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
+ <rsc_op id="16" operation="monitor" operation_key="fs_mysql_monitor_0" on_node="webcluster01" on_node_uuid="49e81295-8e2f-4aeb-98f3-a14de6f62298"/>
</trigger>
</inputs>
</synapse>
_______________________________________________
Pacemaker mailing list
[email protected]
http://list.clusterlabs.org/mailman/listinfo/pacemaker
