|
 |
26ee02 |
From 058d45e6adff4627bcd8504002d45df79bc4d1f6 Mon Sep 17 00:00:00 2001
|
|
|
26ee02 |
From: Andrew Beekhof <andrew@beekhof.net>
|
|
|
26ee02 |
Date: Wed, 25 Oct 2017 10:26:34 +1100
|
|
|
26ee02 |
Subject: [PATCH 1/4] Fix: PE: Use the node we already have and know isnt NULL
|
|
|
26ee02 |
|
|
|
26ee02 |
---
|
|
|
26ee02 |
pengine/native.c | 8 ++++----
|
|
|
26ee02 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
26ee02 |
|
|
|
26ee02 |
diff --git a/pengine/native.c b/pengine/native.c
|
|
|
26ee02 |
index 64a8a90..82cfb57 100644
|
|
|
26ee02 |
--- a/pengine/native.c
|
|
|
26ee02 |
+++ b/pengine/native.c
|
|
|
26ee02 |
@@ -2884,8 +2884,8 @@ native_create_probe(resource_t * rsc, node_t * node, action_t * complete,
|
|
|
26ee02 |
return FALSE;
|
|
|
26ee02 |
}
|
|
|
26ee02 |
|
|
|
26ee02 |
- if(allowed != NULL && is_container_remote_node(allowed)) {
|
|
|
26ee02 |
- resource_t *remote = allowed->details->remote_rsc->container;
|
|
|
26ee02 |
+ if(is_container_remote_node(node)) {
|
|
|
26ee02 |
+ resource_t *remote = node->details->remote_rsc->container;
|
|
|
26ee02 |
|
|
|
26ee02 |
if(remote->role == RSC_ROLE_STOPPED) {
|
|
|
26ee02 |
/* If the container is stopped, then we know anything that
|
|
|
26ee02 |
@@ -2922,8 +2922,8 @@ native_create_probe(resource_t * rsc, node_t * node, action_t * complete,
|
|
|
26ee02 |
/* Here we really we want to check if remote->stop is required,
|
|
|
26ee02 |
* but that information doesn't exist yet
|
|
|
26ee02 |
*/
|
|
|
26ee02 |
- } else if(allowed->details->remote_requires_reset
|
|
|
26ee02 |
- || allowed->details->unclean
|
|
|
26ee02 |
+ } else if(node->details->remote_requires_reset
|
|
|
26ee02 |
+ || node->details->unclean
|
|
|
26ee02 |
|| is_set(remote->flags, pe_rsc_failed)
|
|
|
26ee02 |
|| remote->next_role == RSC_ROLE_STOPPED
|
|
|
26ee02 |
|| (remote->allocated_to
|
|
|
26ee02 |
--
|
|
|
26ee02 |
1.8.3.1
|
|
|
26ee02 |
|
|
|
26ee02 |
|
|
|
26ee02 |
From b322110dd85215ec58ba0a53c5bce3007959a8cd Mon Sep 17 00:00:00 2001
|
|
|
26ee02 |
From: Andrew Beekhof <andrew@beekhof.net>
|
|
|
26ee02 |
Date: Wed, 25 Oct 2017 10:27:09 +1100
|
|
|
26ee02 |
Subject: [PATCH 2/4] Fix: PE: Resources are allowed to stop before their state
|
|
|
26ee02 |
is known everywhere
|
|
|
26ee02 |
|
|
|
26ee02 |
---
|
|
|
26ee02 |
pengine/native.c | 10 ++++++++--
|
|
|
26ee02 |
1 file changed, 8 insertions(+), 2 deletions(-)
|
|
|
26ee02 |
|
|
|
26ee02 |
diff --git a/pengine/native.c b/pengine/native.c
|
|
|
26ee02 |
index 82cfb57..5ba7b5f 100644
|
|
|
26ee02 |
--- a/pengine/native.c
|
|
|
26ee02 |
+++ b/pengine/native.c
|
|
|
26ee02 |
@@ -3007,8 +3007,14 @@ native_create_probe(resource_t * rsc, node_t * node, action_t * complete,
|
|
|
26ee02 |
custom_action_order(rsc, NULL, probe,
|
|
|
26ee02 |
top, reload_key(rsc), NULL,
|
|
|
26ee02 |
pe_order_optional, data_set);
|
|
|
26ee02 |
-
|
|
|
26ee02 |
- if (node->details->shutdown == FALSE) {
|
|
|
26ee02 |
+
|
|
|
26ee02 |
+ if(node->details->shutdown == FALSE
|
|
|
26ee02 |
+ && is_not_set(rsc->flags, pe_rsc_failed)
|
|
|
26ee02 |
+ && rsc->next_role != RSC_ROLE_STOPPED) {
|
|
|
26ee02 |
+ /* Avoid trying to move resources before we know the location
|
|
|
26ee02 |
+ * elsewhere, but stopping should always be allowed.
|
|
|
26ee02 |
+ * Especially if the resource has failed.
|
|
|
26ee02 |
+ */
|
|
|
26ee02 |
custom_action_order(rsc, NULL, probe,
|
|
|
26ee02 |
rsc, generate_op_key(rsc->id, RSC_STOP, 0), NULL,
|
|
|
26ee02 |
pe_order_optional, data_set);
|
|
|
26ee02 |
--
|
|
|
26ee02 |
1.8.3.1
|
|
|
26ee02 |
|
|
|
26ee02 |
|
|
|
26ee02 |
From bc4228d8bc0bd074005dc9868f2cc892f9a763a6 Mon Sep 17 00:00:00 2001
|
|
|
26ee02 |
From: Andrew Beekhof <andrew@beekhof.net>
|
|
|
26ee02 |
Date: Wed, 25 Oct 2017 10:27:18 +1100
|
|
|
26ee02 |
Subject: [PATCH 3/4] Test: PE: Resources are allowed to stop before their
|
|
|
26ee02 |
state is known everywhere
|
|
|
26ee02 |
|
|
|
26ee02 |
---
|
|
|
26ee02 |
pengine/test10/594.dot | 1 -
|
|
|
26ee02 |
pengine/test10/594.exp | 3 -
|
|
|
26ee02 |
pengine/test10/662.dot | 2 -
|
|
|
26ee02 |
pengine/test10/662.exp | 6 --
|
|
|
26ee02 |
pengine/test10/829.dot | 1 -
|
|
|
26ee02 |
pengine/test10/829.exp | 3 -
|
|
|
26ee02 |
pengine/test10/bug-cl-5247.dot | 3 -
|
|
|
26ee02 |
pengine/test10/bug-cl-5247.exp | 12 +---
|
|
|
26ee02 |
pengine/test10/bug-cl-5247.summary | 4 +-
|
|
|
26ee02 |
pengine/test10/bug-rh-1097457.dot | 2 -
|
|
|
26ee02 |
pengine/test10/bug-rh-1097457.exp | 6 --
|
|
|
26ee02 |
pengine/test10/clone-no-shuffle.dot | 1 -
|
|
|
26ee02 |
pengine/test10/clone-no-shuffle.exp | 6 +-
|
|
|
26ee02 |
pengine/test10/clone-no-shuffle.summary | 2 +-
|
|
|
26ee02 |
pengine/test10/group9.dot | 2 -
|
|
|
26ee02 |
pengine/test10/group9.exp | 6 --
|
|
|
26ee02 |
pengine/test10/inc2.dot | 1 -
|
|
|
26ee02 |
pengine/test10/inc2.exp | 3 -
|
|
|
26ee02 |
pengine/test10/inc3.dot | 1 -
|
|
|
26ee02 |
pengine/test10/inc3.exp | 3 -
|
|
|
26ee02 |
pengine/test10/inc4.dot | 1 -
|
|
|
26ee02 |
pengine/test10/inc4.exp | 3 -
|
|
|
26ee02 |
pengine/test10/master-7.dot | 3 -
|
|
|
26ee02 |
pengine/test10/master-7.exp | 9 ---
|
|
|
26ee02 |
pengine/test10/master-9.dot | 1 -
|
|
|
26ee02 |
pengine/test10/master-9.exp | 3 -
|
|
|
26ee02 |
pengine/test10/migrate-3.dot | 1 -
|
|
|
26ee02 |
pengine/test10/migrate-3.exp | 6 +-
|
|
|
26ee02 |
pengine/test10/notify-3.dot | 1 -
|
|
|
26ee02 |
pengine/test10/notify-3.exp | 3 -
|
|
|
26ee02 |
pengine/test10/novell-252693-3.dot | 1 -
|
|
|
26ee02 |
pengine/test10/novell-252693-3.exp | 3 -
|
|
|
26ee02 |
pengine/test10/params-2.dot | 2 -
|
|
|
26ee02 |
pengine/test10/params-2.exp | 9 +--
|
|
|
26ee02 |
pengine/test10/params-2.summary | 6 +-
|
|
|
26ee02 |
pengine/test10/rec-rsc-1.dot | 1 -
|
|
|
26ee02 |
pengine/test10/rec-rsc-1.exp | 6 +-
|
|
|
26ee02 |
pengine/test10/rec-rsc-2.dot | 1 -
|
|
|
26ee02 |
pengine/test10/rec-rsc-2.exp | 6 +-
|
|
|
26ee02 |
pengine/test10/rec-rsc-5.dot | 1 -
|
|
|
26ee02 |
pengine/test10/rec-rsc-5.exp | 3 -
|
|
|
26ee02 |
pengine/test10/target-1.dot | 3 -
|
|
|
26ee02 |
pengine/test10/target-1.exp | 12 +---
|
|
|
26ee02 |
pengine/test10/target-1.summary | 2 +-
|
|
|
26ee02 |
pengine/test10/target-2.dot | 3 -
|
|
|
26ee02 |
pengine/test10/target-2.exp | 12 +---
|
|
|
26ee02 |
pengine/test10/target-2.summary | 2 +-
|
|
|
26ee02 |
pengine/test10/unrunnable-1.dot | 1 -
|
|
|
26ee02 |
pengine/test10/whitebox-fail1.dot | 1 -
|
|
|
26ee02 |
pengine/test10/whitebox-fail1.exp | 3 -
|
|
|
26ee02 |
pengine/test10/whitebox-fail2.dot | 1 -
|
|
|
26ee02 |
pengine/test10/whitebox-fail2.exp | 3 -
|
|
|
26ee02 |
pengine/test10/whitebox-imply-stop-on-fence.dot | 8 ---
|
|
|
26ee02 |
pengine/test10/whitebox-imply-stop-on-fence.exp | 24 -------
|
|
|
26ee02 |
pengine/test10/whitebox-ms-ordering.dot | 3 -
|
|
|
26ee02 |
pengine/test10/whitebox-ms-ordering.exp | 9 ---
|
|
|
26ee02 |
pengine/test10/whitebox-orphan-ms.dot | 18 -----
|
|
|
26ee02 |
pengine/test10/whitebox-orphan-ms.exp | 92 ++++++++++++-------------
|
|
|
26ee02 |
pengine/test10/whitebox-orphaned.dot | 3 -
|
|
|
26ee02 |
pengine/test10/whitebox-orphaned.exp | 70 +++++++++----------
|
|
|
26ee02 |
60 files changed, 97 insertions(+), 311 deletions(-)
|
|
|
26ee02 |
|
|
|
26ee02 |
diff --git a/pengine/test10/594.dot b/pengine/test10/594.dot
|
|
|
26ee02 |
index 853f468..648a8f6 100644
|
|
|
26ee02 |
--- a/pengine/test10/594.dot
|
|
|
26ee02 |
+++ b/pengine/test10/594.dot
|
|
|
26ee02 |
@@ -15,7 +15,6 @@ digraph "g" {
|
|
|
26ee02 |
"DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ]
|
|
|
26ee02 |
"DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ]
|
|
|
26ee02 |
"all_stopped" [ style=bold color="green" fontcolor="orange" ]
|
|
|
26ee02 |
-"child_DoFencing:0_monitor_0 hadev1" -> "child_DoFencing:0_stop_0 hadev2" [ style = bold]
|
|
|
26ee02 |
"child_DoFencing:0_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"child_DoFencing:0_stop_0 hadev2" -> "DoFencing_stopped_0" [ style = bold]
|
|
|
26ee02 |
"child_DoFencing:0_stop_0 hadev2" -> "all_stopped" [ style = bold]
|
|
|
26ee02 |
diff --git a/pengine/test10/594.exp b/pengine/test10/594.exp
|
|
|
26ee02 |
index 400a5e7..a0b9fe1 100644
|
|
|
26ee02 |
--- a/pengine/test10/594.exp
|
|
|
26ee02 |
+++ b/pengine/test10/594.exp
|
|
|
26ee02 |
@@ -125,9 +125,6 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="12" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="hadev1" on_node_uuid="6125a0df-456a-4395-829a-418e9a380d36"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
<pseudo_event id="31" operation="stop" operation_key="DoFencing_stop_0"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
diff --git a/pengine/test10/662.dot b/pengine/test10/662.dot
|
|
|
26ee02 |
index b0c45a6..3287044 100644
|
|
|
26ee02 |
--- a/pengine/test10/662.dot
|
|
|
26ee02 |
+++ b/pengine/test10/662.dot
|
|
|
26ee02 |
@@ -7,9 +7,7 @@
|
|
|
26ee02 |
"DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ]
|
|
|
26ee02 |
"DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ]
|
|
|
26ee02 |
"all_stopped" [ style=bold color="green" fontcolor="orange" ]
|
|
|
26ee02 |
-"child_DoFencing:0_monitor_0 c001n04" -> "child_DoFencing:0_stop_0 c001n02" [ style = bold]
|
|
|
26ee02 |
"child_DoFencing:0_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
-"child_DoFencing:0_monitor_0 c001n09" -> "child_DoFencing:0_stop_0 c001n02" [ style = bold]
|
|
|
26ee02 |
"child_DoFencing:0_monitor_0 c001n09" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = bold]
|
|
|
26ee02 |
"child_DoFencing:0_stop_0 c001n02" -> "all_stopped" [ style = bold]
|
|
|
26ee02 |
diff --git a/pengine/test10/662.exp b/pengine/test10/662.exp
|
|
|
26ee02 |
index d05f4d3..4d95ef6 100644
|
|
|
26ee02 |
--- a/pengine/test10/662.exp
|
|
|
26ee02 |
+++ b/pengine/test10/662.exp
|
|
|
26ee02 |
@@ -188,12 +188,6 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="26" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="c001n04" on_node_uuid="c2896699-96b8-4dbc-a94e-6c3b9252b559"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="32" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="c001n09" on_node_uuid="f67904e0-4dfc-4db1-83a2-e930fc1d20f4"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
<pseudo_event id="54" operation="stop" operation_key="DoFencing_stop_0"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
diff --git a/pengine/test10/829.dot b/pengine/test10/829.dot
|
|
|
26ee02 |
index 8b95e2d..a0ea381 100644
|
|
|
26ee02 |
--- a/pengine/test10/829.dot
|
|
|
26ee02 |
+++ b/pengine/test10/829.dot
|
|
|
26ee02 |
@@ -6,7 +6,6 @@ digraph "g" {
|
|
|
26ee02 |
"DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ]
|
|
|
26ee02 |
"DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ]
|
|
|
26ee02 |
"all_stopped" [ style=bold color="green" fontcolor="orange" ]
|
|
|
26ee02 |
-"child_DoFencing:0_monitor_0 c001n01" -> "child_DoFencing:0_stop_0 c001n02" [ style = bold]
|
|
|
26ee02 |
"child_DoFencing:0_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = bold]
|
|
|
26ee02 |
"child_DoFencing:0_stop_0 c001n02" -> "all_stopped" [ style = bold]
|
|
|
26ee02 |
diff --git a/pengine/test10/829.exp b/pengine/test10/829.exp
|
|
|
26ee02 |
index d1f85fa..a1617b9 100644
|
|
|
26ee02 |
--- a/pengine/test10/829.exp
|
|
|
26ee02 |
+++ b/pengine/test10/829.exp
|
|
|
26ee02 |
@@ -168,9 +168,6 @@
|
|
|
26ee02 |
<crm_event id="1" operation="stonith" operation_key="stonith-c001n02-reboot" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="14" operation="monitor" operation_key="child_DoFencing:0_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
<pseudo_event id="47" operation="stop" operation_key="DoFencing_stop_0"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
diff --git a/pengine/test10/bug-cl-5247.dot b/pengine/test10/bug-cl-5247.dot
|
|
|
26ee02 |
index decf5c3..41895a1 100644
|
|
|
26ee02 |
--- a/pengine/test10/bug-cl-5247.dot
|
|
|
26ee02 |
+++ b/pengine/test10/bug-cl-5247.dot
|
|
|
26ee02 |
@@ -90,7 +90,6 @@ digraph "g" {
|
|
|
26ee02 |
"pgsql_stop_0 pgsr02" -> "msPostgresql_stopped_0" [ style = bold]
|
|
|
26ee02 |
"pgsql_stop_0 pgsr02" [ style=bold color="green" fontcolor="orange"]
|
|
|
26ee02 |
"pgsr01_monitor_0 bl460g8n4" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
-"pgsr02_monitor_0 bl460g8n3" -> "pgsr02_stop_0 bl460g8n4" [ style = bold]
|
|
|
26ee02 |
"pgsr02_monitor_0 bl460g8n3" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"pgsr02_stop_0 bl460g8n4" -> "all_stopped" [ style = bold]
|
|
|
26ee02 |
"pgsr02_stop_0 bl460g8n4" -> "prmDB2_stop_0 bl460g8n4" [ style = bold]
|
|
|
26ee02 |
@@ -128,7 +127,6 @@ digraph "g" {
|
|
|
26ee02 |
"stonith_complete" -> "vip-rep_start_0 pgsr01" [ style = bold]
|
|
|
26ee02 |
"stonith_complete" [ style=bold color="green" fontcolor="orange"]
|
|
|
26ee02 |
"vip-master_monitor_0 pgsr01" -> "vip-master_start_0 pgsr01" [ style = bold]
|
|
|
26ee02 |
-"vip-master_monitor_0 pgsr01" -> "vip-master_stop_0 pgsr02" [ style = bold]
|
|
|
26ee02 |
"vip-master_monitor_0 pgsr01" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"vip-master_monitor_10000 pgsr01" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"vip-master_start_0 pgsr01" -> "master-group_running_0" [ style = bold]
|
|
|
26ee02 |
@@ -140,7 +138,6 @@ digraph "g" {
|
|
|
26ee02 |
"vip-master_stop_0 pgsr02" -> "vip-master_start_0 pgsr01" [ style = bold]
|
|
|
26ee02 |
"vip-master_stop_0 pgsr02" [ style=bold color="green" fontcolor="orange"]
|
|
|
26ee02 |
"vip-rep_monitor_0 pgsr01" -> "vip-rep_start_0 pgsr01" [ style = bold]
|
|
|
26ee02 |
-"vip-rep_monitor_0 pgsr01" -> "vip-rep_stop_0 pgsr02" [ style = bold]
|
|
|
26ee02 |
"vip-rep_monitor_0 pgsr01" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"vip-rep_monitor_10000 pgsr01" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"vip-rep_start_0 pgsr01" -> "master-group_running_0" [ style = bold]
|
|
|
26ee02 |
diff --git a/pengine/test10/bug-cl-5247.exp b/pengine/test10/bug-cl-5247.exp
|
|
|
26ee02 |
index 47c369a..7f55c64 100644
|
|
|
26ee02 |
--- a/pengine/test10/bug-cl-5247.exp
|
|
|
26ee02 |
+++ b/pengine/test10/bug-cl-5247.exp
|
|
|
26ee02 |
@@ -308,9 +308,6 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="13" operation="monitor" operation_key="vip-master_monitor_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
<pseudo_event id="30" operation="stop" operation_key="vip-rep_stop_0"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
@@ -376,9 +373,6 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="14" operation="monitor" operation_key="vip-rep_monitor_0" on_node="pgsr01" on_node_uuid="pgsr01" router_node="bl460g8n3"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
<pseudo_event id="35" operation="stop" operation_key="master-group_stop_0"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
@@ -718,11 +712,7 @@
|
|
|
26ee02 |
</downed>
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
- <inputs>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="11" operation="monitor" operation_key="pgsr02_monitor_0" on_node="bl460g8n3" on_node_uuid="3232261399"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- </inputs>
|
|
|
26ee02 |
+ <inputs/>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="50">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
diff --git a/pengine/test10/bug-cl-5247.summary b/pengine/test10/bug-cl-5247.summary
|
|
|
26ee02 |
index f15ef2e..99c00e9 100644
|
|
|
26ee02 |
--- a/pengine/test10/bug-cl-5247.summary
|
|
|
26ee02 |
+++ b/pengine/test10/bug-cl-5247.summary
|
|
|
26ee02 |
@@ -36,7 +36,9 @@ Executing cluster transition:
|
|
|
26ee02 |
* Resource action: vip-rep monitor on pgsr01
|
|
|
26ee02 |
* Pseudo action: msPostgresql_pre_notify_demote_0
|
|
|
26ee02 |
* Resource action: pgsr01 monitor on bl460g8n4
|
|
|
26ee02 |
+ * Resource action: pgsr02 stop on bl460g8n4
|
|
|
26ee02 |
* Resource action: pgsr02 monitor on bl460g8n3
|
|
|
26ee02 |
+ * Resource action: prmDB2 stop on bl460g8n4
|
|
|
26ee02 |
* Pseudo action: grpStonith1_stopped_0
|
|
|
26ee02 |
* Pseudo action: grpStonith1_start_0
|
|
|
26ee02 |
* Pseudo action: grpStonith2_stopped_0
|
|
|
26ee02 |
@@ -44,8 +46,6 @@ Executing cluster transition:
|
|
|
26ee02 |
* Resource action: pgsql notify on pgsr01
|
|
|
26ee02 |
* Pseudo action: msPostgresql_confirmed-pre_notify_demote_0
|
|
|
26ee02 |
* Pseudo action: msPostgresql_demote_0
|
|
|
26ee02 |
- * Resource action: pgsr02 stop on bl460g8n4
|
|
|
26ee02 |
- * Resource action: prmDB2 stop on bl460g8n4
|
|
|
26ee02 |
* Pseudo action: stonith-pgsr02-off on pgsr02
|
|
|
26ee02 |
* Pseudo action: stonith_complete
|
|
|
26ee02 |
* Pseudo action: pgsql_post_notify_stop_0
|
|
|
26ee02 |
diff --git a/pengine/test10/bug-rh-1097457.dot b/pengine/test10/bug-rh-1097457.dot
|
|
|
26ee02 |
index 7791e06..512510e 100644
|
|
|
26ee02 |
--- a/pengine/test10/bug-rh-1097457.dot
|
|
|
26ee02 |
+++ b/pengine/test10/bug-rh-1097457.dot
|
|
|
26ee02 |
@@ -60,10 +60,8 @@ digraph "g" {
|
|
|
26ee02 |
"FSlun1_monitor_0 lamaVM3" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"FSlun2_monitor_0 lamaVM3" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"FSlun3_monitor_0 lamaVM1" -> "FSlun3_start_0 lama2" [ style = bold]
|
|
|
26ee02 |
-"FSlun3_monitor_0 lamaVM1" -> "FSlun3_stop_0 lamaVM2" [ style = bold]
|
|
|
26ee02 |
"FSlun3_monitor_0 lamaVM1" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"FSlun3_monitor_0 lamaVM3" -> "FSlun3_start_0 lama2" [ style = bold]
|
|
|
26ee02 |
-"FSlun3_monitor_0 lamaVM3" -> "FSlun3_stop_0 lamaVM2" [ style = bold]
|
|
|
26ee02 |
"FSlun3_monitor_0 lamaVM3" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"FSlun3_monitor_10000 lama2" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"FSlun3_monitor_10000 lamaVM2" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
diff --git a/pengine/test10/bug-rh-1097457.exp b/pengine/test10/bug-rh-1097457.exp
|
|
|
26ee02 |
index 33c13bd..e7e0e67 100644
|
|
|
26ee02 |
--- a/pengine/test10/bug-rh-1097457.exp
|
|
|
26ee02 |
+++ b/pengine/test10/bug-rh-1097457.exp
|
|
|
26ee02 |
@@ -105,12 +105,6 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="26" operation="monitor" operation_key="FSlun3_monitor_0" on_node="lamaVM1" on_node_uuid="lamaVM1" router_node="lama2"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="35" operation="monitor" operation_key="FSlun3_monitor_0" on_node="lamaVM3" on_node_uuid="lamaVM3" router_node="lama3"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
<pseudo_event id="98" operation="stopped" operation_key="lamaVM2-G4_stopped_0"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
diff --git a/pengine/test10/clone-no-shuffle.dot b/pengine/test10/clone-no-shuffle.dot
|
|
|
26ee02 |
index 7996ef4..883e779 100644
|
|
|
26ee02 |
--- a/pengine/test10/clone-no-shuffle.dot
|
|
|
26ee02 |
+++ b/pengine/test10/clone-no-shuffle.dot
|
|
|
26ee02 |
@@ -76,7 +76,6 @@ digraph "g" {
|
|
|
26ee02 |
"stonith-1_monitor_0 dktest2sles10" -> "stonith-1_start_0 dktest1sles10" [ style = bold]
|
|
|
26ee02 |
"stonith-1_monitor_0 dktest2sles10" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"stonith-1_start_0 dktest1sles10" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
-"testip_monitor_0 dktest1sles10" -> "testip_stop_0 dktest2sles10" [ style = bold]
|
|
|
26ee02 |
"testip_monitor_0 dktest1sles10" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"testip_stop_0 dktest2sles10" -> "all_stopped" [ style = bold]
|
|
|
26ee02 |
"testip_stop_0 dktest2sles10" -> "ms-drbd1_demote_0" [ style = bold]
|
|
|
26ee02 |
diff --git a/pengine/test10/clone-no-shuffle.exp b/pengine/test10/clone-no-shuffle.exp
|
|
|
26ee02 |
index 126914b..1d5d70a 100644
|
|
|
26ee02 |
--- a/pengine/test10/clone-no-shuffle.exp
|
|
|
26ee02 |
+++ b/pengine/test10/clone-no-shuffle.exp
|
|
|
26ee02 |
@@ -419,11 +419,7 @@
|
|
|
26ee02 |
<attributes CRM_meta_on_node="dktest2sles10" CRM_meta_on_node_uuid="6676c8d5-552e-4a86-a2ea-172e954f7342" CRM_meta_timeout="20000" broadcast="10.200.200.255" cidr_netmask="24" ip="10.200.200.222" nic="eth1"/>
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
- <inputs>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="6" operation="monitor" operation_key="testip_monitor_0" on_node="dktest1sles10" on_node_uuid="c563f60c-45a8-439e-85dc-645f4ecc150d"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- </inputs>
|
|
|
26ee02 |
+ <inputs/>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="31">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
diff --git a/pengine/test10/clone-no-shuffle.summary b/pengine/test10/clone-no-shuffle.summary
|
|
|
26ee02 |
index c69d8f3..c9cb373 100644
|
|
|
26ee02 |
--- a/pengine/test10/clone-no-shuffle.summary
|
|
|
26ee02 |
+++ b/pengine/test10/clone-no-shuffle.summary
|
|
|
26ee02 |
@@ -19,11 +19,11 @@ Executing cluster transition:
|
|
|
26ee02 |
* Resource action: stonith-1 monitor on dktest1sles10
|
|
|
26ee02 |
* Resource action: drbd1:1 monitor on dktest1sles10
|
|
|
26ee02 |
* Pseudo action: ms-drbd1_pre_notify_demote_0
|
|
|
26ee02 |
+ * Resource action: testip stop on dktest2sles10
|
|
|
26ee02 |
* Resource action: testip monitor on dktest1sles10
|
|
|
26ee02 |
* Resource action: stonith-1 start on dktest1sles10
|
|
|
26ee02 |
* Resource action: drbd1:0 notify on dktest2sles10
|
|
|
26ee02 |
* Pseudo action: ms-drbd1_confirmed-pre_notify_demote_0
|
|
|
26ee02 |
- * Resource action: testip stop on dktest2sles10
|
|
|
26ee02 |
* Pseudo action: ms-drbd1_demote_0
|
|
|
26ee02 |
* Resource action: drbd1:0 demote on dktest2sles10
|
|
|
26ee02 |
* Pseudo action: ms-drbd1_demoted_0
|
|
|
26ee02 |
diff --git a/pengine/test10/group9.dot b/pengine/test10/group9.dot
|
|
|
26ee02 |
index a83b9ad..bc58f15 100644
|
|
|
26ee02 |
--- a/pengine/test10/group9.dot
|
|
|
26ee02 |
+++ b/pengine/test10/group9.dot
|
|
|
26ee02 |
@@ -28,7 +28,6 @@
|
|
|
26ee02 |
"rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"rsc4_monitor_0 node2" -> "rsc4_start_0 node1" [ style = bold]
|
|
|
26ee02 |
-"rsc4_monitor_0 node2" -> "rsc4_stop_0 node1" [ style = bold]
|
|
|
26ee02 |
"rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"rsc4_start_0 node1" -> "foo_running_0" [ style = bold]
|
|
|
26ee02 |
"rsc4_start_0 node1" -> "rsc5_start_0 node1" [ style = bold]
|
|
|
26ee02 |
@@ -58,7 +57,6 @@
|
|
|
26ee02 |
"rsc6_stop_0 node1" -> "rsc6_start_0 node2" [ style = bold]
|
|
|
26ee02 |
"rsc6_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"rsc7_monitor_0 node2" -> "rsc7_start_0 node2" [ style = bold]
|
|
|
26ee02 |
-"rsc7_monitor_0 node2" -> "rsc7_stop_0 node1" [ style = bold]
|
|
|
26ee02 |
"rsc7_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"rsc7_start_0 node2" -> "bar_running_0" [ style = bold]
|
|
|
26ee02 |
"rsc7_start_0 node2" -> "rsc8_start_0 node2" [ style = bold]
|
|
|
26ee02 |
diff --git a/pengine/test10/group9.exp b/pengine/test10/group9.exp
|
|
|
26ee02 |
index 66e85a4..f57f2b4 100644
|
|
|
26ee02 |
--- a/pengine/test10/group9.exp
|
|
|
26ee02 |
+++ b/pengine/test10/group9.exp
|
|
|
26ee02 |
@@ -119,9 +119,6 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="7" operation="monitor" operation_key="rsc4_monitor_0" on_node="node2" on_node_uuid="node2"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
<rsc_op id="19" operation="stop" operation_key="rsc5_stop_0" on_node="node1" on_node_uuid="node1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
@@ -325,9 +322,6 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="10" operation="monitor" operation_key="rsc7_monitor_0" on_node="node2" on_node_uuid="node2"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
<rsc_op id="28" operation="stop" operation_key="rsc8_stop_0" on_node="node1" on_node_uuid="node1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
diff --git a/pengine/test10/inc2.dot b/pengine/test10/inc2.dot
|
|
|
26ee02 |
index 88d210e..cd250e5 100644
|
|
|
26ee02 |
--- a/pengine/test10/inc2.dot
|
|
|
26ee02 |
+++ b/pengine/test10/inc2.dot
|
|
|
26ee02 |
@@ -22,7 +22,6 @@
|
|
|
26ee02 |
"child_rsc1:3_stop_0 node1" -> "child_rsc1:3_start_0 node2" [ style = bold]
|
|
|
26ee02 |
"child_rsc1:3_stop_0 node1" -> "rsc1_stopped_0" [ style = bold]
|
|
|
26ee02 |
"child_rsc1:3_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
-"child_rsc1:4_monitor_0 node2" -> "child_rsc1:4_stop_0 node1" [ style = bold]
|
|
|
26ee02 |
"child_rsc1:4_monitor_0 node2" -> "rsc1_start_0" [ style = bold]
|
|
|
26ee02 |
"child_rsc1:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"child_rsc1:4_stop_0 node1" -> "all_stopped" [ style = bold]
|
|
|
26ee02 |
diff --git a/pengine/test10/inc2.exp b/pengine/test10/inc2.exp
|
|
|
26ee02 |
index 3fb5134..92b4cf1 100644
|
|
|
26ee02 |
--- a/pengine/test10/inc2.exp
|
|
|
26ee02 |
+++ b/pengine/test10/inc2.exp
|
|
|
26ee02 |
@@ -108,9 +108,6 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="6" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
<pseudo_event id="18" operation="stop" operation_key="rsc1_stop_0"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
diff --git a/pengine/test10/inc3.dot b/pengine/test10/inc3.dot
|
|
|
26ee02 |
index eb3e7e9..113541a 100644
|
|
|
26ee02 |
--- a/pengine/test10/inc3.dot
|
|
|
26ee02 |
+++ b/pengine/test10/inc3.dot
|
|
|
26ee02 |
@@ -22,7 +22,6 @@
|
|
|
26ee02 |
"child_rsc1:3_stop_0 node1" -> "child_rsc1:3_start_0 node2" [ style = bold]
|
|
|
26ee02 |
"child_rsc1:3_stop_0 node1" -> "rsc1_stopped_0" [ style = bold]
|
|
|
26ee02 |
"child_rsc1:3_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
-"child_rsc1:4_monitor_0 node2" -> "child_rsc1:4_stop_0 node1" [ style = bold]
|
|
|
26ee02 |
"child_rsc1:4_monitor_0 node2" -> "rsc1_start_0" [ style = bold]
|
|
|
26ee02 |
"child_rsc1:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"child_rsc1:4_stop_0 node1" -> "all_stopped" [ style = bold]
|
|
|
26ee02 |
diff --git a/pengine/test10/inc3.exp b/pengine/test10/inc3.exp
|
|
|
26ee02 |
index e6b0982..4c1e46d 100644
|
|
|
26ee02 |
--- a/pengine/test10/inc3.exp
|
|
|
26ee02 |
+++ b/pengine/test10/inc3.exp
|
|
|
26ee02 |
@@ -108,9 +108,6 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="11" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
<pseudo_event id="23" operation="stop" operation_key="rsc1_stop_0"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
diff --git a/pengine/test10/inc4.dot b/pengine/test10/inc4.dot
|
|
|
26ee02 |
index 16f5f03..c5a1a00 100644
|
|
|
26ee02 |
--- a/pengine/test10/inc4.dot
|
|
|
26ee02 |
+++ b/pengine/test10/inc4.dot
|
|
|
26ee02 |
@@ -24,7 +24,6 @@
|
|
|
26ee02 |
"child_rsc1:3_stop_0 node1" -> "child_rsc1:3_start_0 node2" [ style = bold]
|
|
|
26ee02 |
"child_rsc1:3_stop_0 node1" -> "rsc1_stopped_0" [ style = bold]
|
|
|
26ee02 |
"child_rsc1:3_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
-"child_rsc1:4_monitor_0 node2" -> "child_rsc1:4_stop_0 node1" [ style = bold]
|
|
|
26ee02 |
"child_rsc1:4_monitor_0 node2" -> "rsc1_start_0" [ style = bold]
|
|
|
26ee02 |
"child_rsc1:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"child_rsc1:4_stop_0 node1" -> "all_stopped" [ style = bold]
|
|
|
26ee02 |
diff --git a/pengine/test10/inc4.exp b/pengine/test10/inc4.exp
|
|
|
26ee02 |
index 1f4e71c..0d767d6 100644
|
|
|
26ee02 |
--- a/pengine/test10/inc4.exp
|
|
|
26ee02 |
+++ b/pengine/test10/inc4.exp
|
|
|
26ee02 |
@@ -117,9 +117,6 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="11" operation="monitor" operation_key="child_rsc1:4_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
<pseudo_event id="23" operation="stop" operation_key="rsc1_stop_0"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
diff --git a/pengine/test10/master-7.dot b/pengine/test10/master-7.dot
|
|
|
26ee02 |
index c6bdd3c..51fcfd8 100644
|
|
|
26ee02 |
--- a/pengine/test10/master-7.dot
|
|
|
26ee02 |
+++ b/pengine/test10/master-7.dot
|
|
|
26ee02 |
@@ -80,11 +80,8 @@ digraph "g" {
|
|
|
26ee02 |
"ocf_msdummy:0_stop_0 c001n01" -> "all_stopped" [ style = bold]
|
|
|
26ee02 |
"ocf_msdummy:0_stop_0 c001n01" -> "master_rsc_1_stopped_0" [ style = bold]
|
|
|
26ee02 |
"ocf_msdummy:0_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ]
|
|
|
26ee02 |
-"ocf_msdummy:4_monitor_0 c001n02" -> "ocf_msdummy:4_stop_0 c001n01" [ style = bold]
|
|
|
26ee02 |
"ocf_msdummy:4_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
-"ocf_msdummy:4_monitor_0 c001n03" -> "ocf_msdummy:4_stop_0 c001n01" [ style = bold]
|
|
|
26ee02 |
"ocf_msdummy:4_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
-"ocf_msdummy:4_monitor_0 c001n08" -> "ocf_msdummy:4_stop_0 c001n01" [ style = bold]
|
|
|
26ee02 |
"ocf_msdummy:4_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"ocf_msdummy:4_stop_0 c001n01" -> "all_stopped" [ style = bold]
|
|
|
26ee02 |
"ocf_msdummy:4_stop_0 c001n01" -> "master_rsc_1_stopped_0" [ style = bold]
|
|
|
26ee02 |
diff --git a/pengine/test10/master-7.exp b/pengine/test10/master-7.exp
|
|
|
26ee02 |
index 971949d..33b5d49 100644
|
|
|
26ee02 |
--- a/pengine/test10/master-7.exp
|
|
|
26ee02 |
+++ b/pengine/test10/master-7.exp
|
|
|
26ee02 |
@@ -456,15 +456,6 @@
|
|
|
26ee02 |
<crm_event id="1" operation="stonith" operation_key="stonith-c001n01-reboot" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="20" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="25" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="29" operation="monitor" operation_key="ocf_msdummy:4_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
<pseudo_event id="88" operation="stop" operation_key="master_rsc_1_stop_0"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
diff --git a/pengine/test10/master-9.dot b/pengine/test10/master-9.dot
|
|
|
26ee02 |
index b6cc5e0..343bb2d 100644
|
|
|
26ee02 |
--- a/pengine/test10/master-9.dot
|
|
|
26ee02 |
+++ b/pengine/test10/master-9.dot
|
|
|
26ee02 |
@@ -5,7 +5,6 @@
|
|
|
26ee02 |
"DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ]
|
|
|
26ee02 |
"DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ]
|
|
|
26ee02 |
"all_stopped" [ style=bold color="green" fontcolor="orange"]
|
|
|
26ee02 |
-"child_DoFencing:1_monitor_0 va1" -> "child_DoFencing:1_stop_0 ibm1" [ style = bold]
|
|
|
26ee02 |
"child_DoFencing:1_monitor_0 va1" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"child_DoFencing:1_stop_0 ibm1" -> "DoFencing_stopped_0" [ style = bold]
|
|
|
26ee02 |
"child_DoFencing:1_stop_0 ibm1" -> "all_stopped" [ style = bold]
|
|
|
26ee02 |
diff --git a/pengine/test10/master-9.exp b/pengine/test10/master-9.exp
|
|
|
26ee02 |
index 51ab23e..e845751 100644
|
|
|
26ee02 |
--- a/pengine/test10/master-9.exp
|
|
|
26ee02 |
+++ b/pengine/test10/master-9.exp
|
|
|
26ee02 |
@@ -8,9 +8,6 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="12" operation="monitor" operation_key="child_DoFencing:1_monitor_0" on_node="va1" on_node_uuid="b8f81462-2d65-42bf-bbb1-70db0ea29e5b"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
<pseudo_event id="48" operation="stop" operation_key="DoFencing_stop_0"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
diff --git a/pengine/test10/migrate-3.dot b/pengine/test10/migrate-3.dot
|
|
|
26ee02 |
index 7b66503..a049b5b 100644
|
|
|
26ee02 |
--- a/pengine/test10/migrate-3.dot
|
|
|
26ee02 |
+++ b/pengine/test10/migrate-3.dot
|
|
|
26ee02 |
@@ -1,7 +1,6 @@
|
|
|
26ee02 |
digraph "g" {
|
|
|
26ee02 |
"all_stopped" [ style=bold color="green" fontcolor="orange" ]
|
|
|
26ee02 |
"rsc3_monitor_0 node2" -> "rsc3_start_0 node2" [ style = bold]
|
|
|
26ee02 |
-"rsc3_monitor_0 node2" -> "rsc3_stop_0 node1" [ style = bold]
|
|
|
26ee02 |
"rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"rsc3_stop_0 node1" -> "all_stopped" [ style = bold]
|
|
|
26ee02 |
diff --git a/pengine/test10/migrate-3.exp b/pengine/test10/migrate-3.exp
|
|
|
26ee02 |
index 1aeb422..6e8b041 100644
|
|
|
26ee02 |
--- a/pengine/test10/migrate-3.exp
|
|
|
26ee02 |
+++ b/pengine/test10/migrate-3.exp
|
|
|
26ee02 |
@@ -31,11 +31,7 @@
|
|
|
26ee02 |
<attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" allow_migrate="on" />
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
- <inputs>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="3" operation="monitor" operation_key="rsc3_monitor_0" on_node="node2" on_node_uuid="node2"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- </inputs>
|
|
|
26ee02 |
+ <inputs/>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="3">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
diff --git a/pengine/test10/notify-3.dot b/pengine/test10/notify-3.dot
|
|
|
26ee02 |
index bf0d8af..26b4899 100644
|
|
|
26ee02 |
--- a/pengine/test10/notify-3.dot
|
|
|
26ee02 |
+++ b/pengine/test10/notify-3.dot
|
|
|
26ee02 |
@@ -23,7 +23,6 @@
|
|
|
26ee02 |
"child_rsc1:1_stop_0 node2" -> "child_rsc1:1_start_0 node1" [ style = bold]
|
|
|
26ee02 |
"child_rsc1:1_stop_0 node2" -> "rsc1_stopped_0" [ style = bold]
|
|
|
26ee02 |
"child_rsc1:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
-"child_rsc2:0_monitor_0 node2" -> "child_rsc2:0_stop_0 node1" [ style = bold]
|
|
|
26ee02 |
"child_rsc2:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"child_rsc2:0_pre_notify_stop_0 node1" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold]
|
|
|
26ee02 |
"child_rsc2:0_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
diff --git a/pengine/test10/notify-3.exp b/pengine/test10/notify-3.exp
|
|
|
26ee02 |
index 20028dd..fb96109 100644
|
|
|
26ee02 |
--- a/pengine/test10/notify-3.exp
|
|
|
26ee02 |
+++ b/pengine/test10/notify-3.exp
|
|
|
26ee02 |
@@ -328,9 +328,6 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="5" operation="monitor" operation_key="child_rsc2:0_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
<pseudo_event id="30" operation="stop" operation_key="rsc2_stop_0"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
diff --git a/pengine/test10/novell-252693-3.dot b/pengine/test10/novell-252693-3.dot
|
|
|
26ee02 |
index 925ff92..e26b164 100644
|
|
|
26ee02 |
--- a/pengine/test10/novell-252693-3.dot
|
|
|
26ee02 |
+++ b/pengine/test10/novell-252693-3.dot
|
|
|
26ee02 |
@@ -70,7 +70,6 @@
|
|
|
26ee02 |
"evmsdcloneset_start_0" -> "evmsdclone:1_start_0 node1" [ style = bold]
|
|
|
26ee02 |
"evmsdcloneset_start_0" -> "evmsdcloneset_running_0" [ style = bold]
|
|
|
26ee02 |
"evmsdcloneset_start_0" [ style=bold color="green" fontcolor="orange" ]
|
|
|
26ee02 |
-"imagestoreclone:0_monitor_0 node1" -> "imagestoreclone:0_stop_0 node2" [ style = bold]
|
|
|
26ee02 |
"imagestoreclone:0_monitor_0 node1" -> "imagestorecloneset_start_0" [ style = bold]
|
|
|
26ee02 |
"imagestoreclone:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"imagestoreclone:0_monitor_20000 node1" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
diff --git a/pengine/test10/novell-252693-3.exp b/pengine/test10/novell-252693-3.exp
|
|
|
26ee02 |
index be4df36..9c97271 100644
|
|
|
26ee02 |
--- a/pengine/test10/novell-252693-3.exp
|
|
|
26ee02 |
+++ b/pengine/test10/novell-252693-3.exp
|
|
|
26ee02 |
@@ -349,9 +349,6 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="11" operation="monitor" operation_key="imagestoreclone:0_monitor_0" on_node="node1" on_node_uuid="85d23ecf-8b5b-4cd3-9344-e1ff5d869d6a"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
<pseudo_event id="55" operation="stop" operation_key="imagestorecloneset_stop_0"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
diff --git a/pengine/test10/params-2.dot b/pengine/test10/params-2.dot
|
|
|
26ee02 |
index 6a23fd7..67f2873 100644
|
|
|
26ee02 |
--- a/pengine/test10/params-2.dot
|
|
|
26ee02 |
+++ b/pengine/test10/params-2.dot
|
|
|
26ee02 |
@@ -1,9 +1,7 @@
|
|
|
26ee02 |
digraph "g" {
|
|
|
26ee02 |
"all_stopped" [ style=bold color="green" fontcolor="orange" ]
|
|
|
26ee02 |
"do_shutdown node1" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
-"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = bold]
|
|
|
26ee02 |
"rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
-"rsc1_monitor_0 node3" -> "rsc1_stop_0 node1" [ style = bold]
|
|
|
26ee02 |
"rsc1_monitor_0 node3" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"rsc1_stop_0 node1" -> "all_stopped" [ style = bold]
|
|
|
26ee02 |
"rsc1_stop_0 node1" -> "do_shutdown node1" [ style = bold]
|
|
|
26ee02 |
diff --git a/pengine/test10/params-2.exp b/pengine/test10/params-2.exp
|
|
|
26ee02 |
index 94f3773..3cbfe33 100644
|
|
|
26ee02 |
--- a/pengine/test10/params-2.exp
|
|
|
26ee02 |
+++ b/pengine/test10/params-2.exp
|
|
|
26ee02 |
@@ -6,14 +6,7 @@
|
|
|
26ee02 |
<attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="node1" CRM_meta_timeout="20000" />
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
- <inputs>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="8" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="node2"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="10" operation="monitor" operation_key="rsc1_monitor_0" on_node="node3" on_node_uuid="node3"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- </inputs>
|
|
|
26ee02 |
+ <inputs/>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="1">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
diff --git a/pengine/test10/params-2.summary b/pengine/test10/params-2.summary
|
|
|
26ee02 |
index 1e73e77..97510f6 100644
|
|
|
26ee02 |
--- a/pengine/test10/params-2.summary
|
|
|
26ee02 |
+++ b/pengine/test10/params-2.summary
|
|
|
26ee02 |
@@ -13,6 +13,7 @@ Transition Summary:
|
|
|
26ee02 |
* Start rsc3 (node3)
|
|
|
26ee02 |
|
|
|
26ee02 |
Executing cluster transition:
|
|
|
26ee02 |
+ * Resource action: rsc1 stop on node1
|
|
|
26ee02 |
* Resource action: rsc1 monitor on node3
|
|
|
26ee02 |
* Resource action: rsc1 monitor on node2
|
|
|
26ee02 |
* Resource action: rsc2 monitor on node3
|
|
|
26ee02 |
@@ -21,11 +22,10 @@ Executing cluster transition:
|
|
|
26ee02 |
* Resource action: rsc3 monitor on node2
|
|
|
26ee02 |
* Resource action: rsc3 monitor on node1
|
|
|
26ee02 |
* Resource action: rsc3 delete on node3
|
|
|
26ee02 |
- * Resource action: rsc1 stop on node1
|
|
|
26ee02 |
- * Resource action: rsc2 delete on node2
|
|
|
26ee02 |
- * Resource action: rsc3 start on node3
|
|
|
26ee02 |
* Cluster action: do_shutdown on node1
|
|
|
26ee02 |
* Pseudo action: all_stopped
|
|
|
26ee02 |
+ * Resource action: rsc2 delete on node2
|
|
|
26ee02 |
+ * Resource action: rsc3 start on node3
|
|
|
26ee02 |
* Resource action: rsc2 start on node2
|
|
|
26ee02 |
|
|
|
26ee02 |
Revised cluster status:
|
|
|
26ee02 |
diff --git a/pengine/test10/rec-rsc-1.dot b/pengine/test10/rec-rsc-1.dot
|
|
|
26ee02 |
index 9c44648..f3755dc 100644
|
|
|
26ee02 |
--- a/pengine/test10/rec-rsc-1.dot
|
|
|
26ee02 |
+++ b/pengine/test10/rec-rsc-1.dot
|
|
|
26ee02 |
@@ -1,7 +1,6 @@
|
|
|
26ee02 |
digraph "g" {
|
|
|
26ee02 |
"all_stopped" [ style=bold color="green" fontcolor="orange" ]
|
|
|
26ee02 |
"rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold]
|
|
|
26ee02 |
-"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = bold]
|
|
|
26ee02 |
"rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"rsc1_stop_0 node1" -> "all_stopped" [ style = bold]
|
|
|
26ee02 |
diff --git a/pengine/test10/rec-rsc-1.exp b/pengine/test10/rec-rsc-1.exp
|
|
|
26ee02 |
index f3db70c..32a3da6 100644
|
|
|
26ee02 |
--- a/pengine/test10/rec-rsc-1.exp
|
|
|
26ee02 |
+++ b/pengine/test10/rec-rsc-1.exp
|
|
|
26ee02 |
@@ -31,11 +31,7 @@
|
|
|
26ee02 |
<attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" />
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
- <inputs>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="3" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- </inputs>
|
|
|
26ee02 |
+ <inputs/>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="3">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
diff --git a/pengine/test10/rec-rsc-2.dot b/pengine/test10/rec-rsc-2.dot
|
|
|
26ee02 |
index d26a4cb..88b09df 100644
|
|
|
26ee02 |
--- a/pengine/test10/rec-rsc-2.dot
|
|
|
26ee02 |
+++ b/pengine/test10/rec-rsc-2.dot
|
|
|
26ee02 |
@@ -2,7 +2,6 @@
|
|
|
26ee02 |
"Cancel rsc1_monitor_1 node1" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"all_stopped" [ style=bold color="green" fontcolor="orange" ]
|
|
|
26ee02 |
"rsc1_monitor_0 node2" -> "rsc1_start_0 node1" [ style = bold]
|
|
|
26ee02 |
-"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = bold]
|
|
|
26ee02 |
"rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"rsc1_stop_0 node1" -> "Cancel rsc1_monitor_1 node1" [ style = bold]
|
|
|
26ee02 |
diff --git a/pengine/test10/rec-rsc-2.exp b/pengine/test10/rec-rsc-2.exp
|
|
|
26ee02 |
index 192b1ec..1d5bad7 100644
|
|
|
26ee02 |
--- a/pengine/test10/rec-rsc-2.exp
|
|
|
26ee02 |
+++ b/pengine/test10/rec-rsc-2.exp
|
|
|
26ee02 |
@@ -31,11 +31,7 @@
|
|
|
26ee02 |
<attributes CRM_meta_on_node="node1" CRM_meta_on_node_uuid="uuid1" CRM_meta_timeout="20000" />
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
- <inputs>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node2" on_node_uuid="uuid2"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- </inputs>
|
|
|
26ee02 |
+ <inputs/>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="3">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
diff --git a/pengine/test10/rec-rsc-5.dot b/pengine/test10/rec-rsc-5.dot
|
|
|
26ee02 |
index adc8b9f..7a20e74 100644
|
|
|
26ee02 |
--- a/pengine/test10/rec-rsc-5.dot
|
|
|
26ee02 |
+++ b/pengine/test10/rec-rsc-5.dot
|
|
|
26ee02 |
@@ -2,7 +2,6 @@ digraph "g" {
|
|
|
26ee02 |
"all_stopped" -> "stonith-1_start_0 node1" [ style = bold]
|
|
|
26ee02 |
"all_stopped" [ style=bold color="green" fontcolor="orange" ]
|
|
|
26ee02 |
"rsc1_monitor_0 node1" -> "rsc1_start_0 node1" [ style = bold]
|
|
|
26ee02 |
-"rsc1_monitor_0 node1" -> "rsc1_stop_0 node2" [ style = bold]
|
|
|
26ee02 |
"rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"rsc1_stop_0 node2" -> "all_stopped" [ style = bold]
|
|
|
26ee02 |
diff --git a/pengine/test10/rec-rsc-5.exp b/pengine/test10/rec-rsc-5.exp
|
|
|
26ee02 |
index b1f151b..3092adf 100644
|
|
|
26ee02 |
--- a/pengine/test10/rec-rsc-5.exp
|
|
|
26ee02 |
+++ b/pengine/test10/rec-rsc-5.exp
|
|
|
26ee02 |
@@ -53,9 +53,6 @@
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
<crm_event id="1" operation="stonith" operation_key="stonith-node2-reboot" on_node="node2" on_node_uuid="uuid2"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="4" operation="monitor" operation_key="rsc1_monitor_0" on_node="node1" on_node_uuid="uuid1"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="4">
|
|
|
26ee02 |
diff --git a/pengine/test10/target-1.dot b/pengine/test10/target-1.dot
|
|
|
26ee02 |
index 9d8e5bc..db6f64f 100644
|
|
|
26ee02 |
--- a/pengine/test10/target-1.dot
|
|
|
26ee02 |
+++ b/pengine/test10/target-1.dot
|
|
|
26ee02 |
@@ -9,11 +9,8 @@
|
|
|
26ee02 |
"rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
-"rsc_c001n08_monitor_0 c001n01" -> "rsc_c001n08_stop_0 c001n08" [ style = bold]
|
|
|
26ee02 |
"rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
-"rsc_c001n08_monitor_0 c001n02" -> "rsc_c001n08_stop_0 c001n08" [ style = bold]
|
|
|
26ee02 |
"rsc_c001n08_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
-"rsc_c001n08_monitor_0 c001n03" -> "rsc_c001n08_stop_0 c001n08" [ style = bold]
|
|
|
26ee02 |
"rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"rsc_c001n08_stop_0 c001n08" -> "all_stopped" [ style = bold]
|
|
|
26ee02 |
"rsc_c001n08_stop_0 c001n08" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
diff --git a/pengine/test10/target-1.exp b/pengine/test10/target-1.exp
|
|
|
26ee02 |
index 70d7f75..f4e79e7 100644
|
|
|
26ee02 |
--- a/pengine/test10/target-1.exp
|
|
|
26ee02 |
+++ b/pengine/test10/target-1.exp
|
|
|
26ee02 |
@@ -33,17 +33,7 @@
|
|
|
26ee02 |
<attributes CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_timeout="20000" ip="127.0.0.11" target_role="Stopped"/>
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
- <inputs>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="8" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="10" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="13" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- </inputs>
|
|
|
26ee02 |
+ <inputs/>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="4">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
diff --git a/pengine/test10/target-1.summary b/pengine/test10/target-1.summary
|
|
|
26ee02 |
index a94241e..12bbe4e 100644
|
|
|
26ee02 |
--- a/pengine/test10/target-1.summary
|
|
|
26ee02 |
+++ b/pengine/test10/target-1.summary
|
|
|
26ee02 |
@@ -17,6 +17,7 @@ Executing cluster transition:
|
|
|
26ee02 |
* Resource action: DcIPaddr monitor on c001n08
|
|
|
26ee02 |
* Resource action: DcIPaddr monitor on c001n03
|
|
|
26ee02 |
* Resource action: DcIPaddr monitor on c001n01
|
|
|
26ee02 |
+ * Resource action: rsc_c001n08 stop on c001n08
|
|
|
26ee02 |
* Resource action: rsc_c001n08 monitor on c001n03
|
|
|
26ee02 |
* Resource action: rsc_c001n08 monitor on c001n02
|
|
|
26ee02 |
* Resource action: rsc_c001n08 monitor on c001n01
|
|
|
26ee02 |
@@ -26,7 +27,6 @@ Executing cluster transition:
|
|
|
26ee02 |
* Resource action: rsc_c001n01 monitor on c001n08
|
|
|
26ee02 |
* Resource action: rsc_c001n01 monitor on c001n03
|
|
|
26ee02 |
* Resource action: rsc_c001n01 monitor on c001n02
|
|
|
26ee02 |
- * Resource action: rsc_c001n08 stop on c001n08
|
|
|
26ee02 |
* Pseudo action: all_stopped
|
|
|
26ee02 |
|
|
|
26ee02 |
Revised cluster status:
|
|
|
26ee02 |
diff --git a/pengine/test10/target-2.dot b/pengine/test10/target-2.dot
|
|
|
26ee02 |
index f151c43..55b9d85 100644
|
|
|
26ee02 |
--- a/pengine/test10/target-2.dot
|
|
|
26ee02 |
+++ b/pengine/test10/target-2.dot
|
|
|
26ee02 |
@@ -12,11 +12,8 @@ digraph "g" {
|
|
|
26ee02 |
"rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"rsc_c001n03_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
-"rsc_c001n08_monitor_0 c001n01" -> "rsc_c001n08_stop_0 c001n08" [ style = bold]
|
|
|
26ee02 |
"rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
-"rsc_c001n08_monitor_0 c001n02" -> "rsc_c001n08_stop_0 c001n08" [ style = bold]
|
|
|
26ee02 |
"rsc_c001n08_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
-"rsc_c001n08_monitor_0 c001n03" -> "rsc_c001n08_stop_0 c001n08" [ style = bold]
|
|
|
26ee02 |
"rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"rsc_c001n08_stop_0 c001n08" -> "all_stopped" [ style = bold]
|
|
|
26ee02 |
"rsc_c001n08_stop_0 c001n08" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
diff --git a/pengine/test10/target-2.exp b/pengine/test10/target-2.exp
|
|
|
26ee02 |
index 63a8eec..6ced2e2 100644
|
|
|
26ee02 |
--- a/pengine/test10/target-2.exp
|
|
|
26ee02 |
+++ b/pengine/test10/target-2.exp
|
|
|
26ee02 |
@@ -33,17 +33,7 @@
|
|
|
26ee02 |
<attributes CRM_meta_on_node="c001n08" CRM_meta_on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b" CRM_meta_timeout="20000" ip="127.0.0.11" target_role="Stopped"/>
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
- <inputs>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="8" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="11" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="15" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- </inputs>
|
|
|
26ee02 |
+ <inputs/>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="4">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
diff --git a/pengine/test10/target-2.summary b/pengine/test10/target-2.summary
|
|
|
26ee02 |
index bcefbef..a440494 100644
|
|
|
26ee02 |
--- a/pengine/test10/target-2.summary
|
|
|
26ee02 |
+++ b/pengine/test10/target-2.summary
|
|
|
26ee02 |
@@ -16,6 +16,7 @@ Executing cluster transition:
|
|
|
26ee02 |
* Resource action: DcIPaddr monitor on c001n08
|
|
|
26ee02 |
* Resource action: DcIPaddr monitor on c001n03
|
|
|
26ee02 |
* Resource action: DcIPaddr monitor on c001n01
|
|
|
26ee02 |
+ * Resource action: rsc_c001n08 stop on c001n08
|
|
|
26ee02 |
* Resource action: rsc_c001n08 monitor on c001n03
|
|
|
26ee02 |
* Resource action: rsc_c001n08 monitor on c001n02
|
|
|
26ee02 |
* Resource action: rsc_c001n08 monitor on c001n01
|
|
|
26ee02 |
@@ -28,7 +29,6 @@ Executing cluster transition:
|
|
|
26ee02 |
* Resource action: rsc_c001n01 monitor on c001n08
|
|
|
26ee02 |
* Resource action: rsc_c001n01 monitor on c001n03
|
|
|
26ee02 |
* Resource action: rsc_c001n01 monitor on c001n02
|
|
|
26ee02 |
- * Resource action: rsc_c001n08 stop on c001n08
|
|
|
26ee02 |
* Pseudo action: all_stopped
|
|
|
26ee02 |
|
|
|
26ee02 |
Revised cluster status:
|
|
|
26ee02 |
diff --git a/pengine/test10/unrunnable-1.dot b/pengine/test10/unrunnable-1.dot
|
|
|
26ee02 |
index 536864d..3e78165 100644
|
|
|
26ee02 |
--- a/pengine/test10/unrunnable-1.dot
|
|
|
26ee02 |
+++ b/pengine/test10/unrunnable-1.dot
|
|
|
26ee02 |
@@ -12,7 +12,6 @@
|
|
|
26ee02 |
"child_192.168.100.182_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ]
|
|
|
26ee02 |
"child_192.168.100.183_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"child_192.168.100.183_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ]
|
|
|
26ee02 |
-"child_DoFencing:1_monitor_0 c001n03" -> "child_DoFencing:1_stop_0 c001n02" [ style = dashed]
|
|
|
26ee02 |
"child_DoFencing:1_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
|
|
|
26ee02 |
"child_DoFencing:1_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = dashed]
|
|
|
26ee02 |
"child_DoFencing:1_stop_0 c001n02" -> "all_stopped" [ style = dashed]
|
|
|
26ee02 |
diff --git a/pengine/test10/whitebox-fail1.dot b/pengine/test10/whitebox-fail1.dot
|
|
|
26ee02 |
index 3cf4f76..bfff4bf 100644
|
|
|
26ee02 |
--- a/pengine/test10/whitebox-fail1.dot
|
|
|
26ee02 |
+++ b/pengine/test10/whitebox-fail1.dot
|
|
|
26ee02 |
@@ -1,7 +1,6 @@
|
|
|
26ee02 |
digraph "g" {
|
|
|
26ee02 |
"A_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"B_monitor_0 lxc2" -> "B_start_0 lxc1" [ style = bold]
|
|
|
26ee02 |
-"B_monitor_0 lxc2" -> "B_stop_0 lxc1" [ style = bold]
|
|
|
26ee02 |
"B_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"B_monitor_10000 lxc1" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"B_start_0 lxc1" -> "B_monitor_10000 lxc1" [ style = bold]
|
|
|
26ee02 |
diff --git a/pengine/test10/whitebox-fail1.exp b/pengine/test10/whitebox-fail1.exp
|
|
|
26ee02 |
index ab739b5..901a1e3 100644
|
|
|
26ee02 |
--- a/pengine/test10/whitebox-fail1.exp
|
|
|
26ee02 |
+++ b/pengine/test10/whitebox-fail1.exp
|
|
|
26ee02 |
@@ -196,9 +196,6 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="13" operation="monitor" operation_key="B_monitor_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
<pseudo_event id="49" operation="stonith" operation_key="stonith-lxc1-reboot" on_node="lxc1" on_node_uuid="lxc1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
diff --git a/pengine/test10/whitebox-fail2.dot b/pengine/test10/whitebox-fail2.dot
|
|
|
26ee02 |
index 3cf4f76..bfff4bf 100644
|
|
|
26ee02 |
--- a/pengine/test10/whitebox-fail2.dot
|
|
|
26ee02 |
+++ b/pengine/test10/whitebox-fail2.dot
|
|
|
26ee02 |
@@ -1,7 +1,6 @@
|
|
|
26ee02 |
digraph "g" {
|
|
|
26ee02 |
"A_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"B_monitor_0 lxc2" -> "B_start_0 lxc1" [ style = bold]
|
|
|
26ee02 |
-"B_monitor_0 lxc2" -> "B_stop_0 lxc1" [ style = bold]
|
|
|
26ee02 |
"B_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"B_monitor_10000 lxc1" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"B_start_0 lxc1" -> "B_monitor_10000 lxc1" [ style = bold]
|
|
|
26ee02 |
diff --git a/pengine/test10/whitebox-fail2.exp b/pengine/test10/whitebox-fail2.exp
|
|
|
26ee02 |
index ab739b5..901a1e3 100644
|
|
|
26ee02 |
--- a/pengine/test10/whitebox-fail2.exp
|
|
|
26ee02 |
+++ b/pengine/test10/whitebox-fail2.exp
|
|
|
26ee02 |
@@ -196,9 +196,6 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="13" operation="monitor" operation_key="B_monitor_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
<pseudo_event id="49" operation="stonith" operation_key="stonith-lxc1-reboot" on_node="lxc1" on_node_uuid="lxc1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
diff --git a/pengine/test10/whitebox-imply-stop-on-fence.dot b/pengine/test10/whitebox-imply-stop-on-fence.dot
|
|
|
26ee02 |
index 1c41ad2..7b536ea 100644
|
|
|
26ee02 |
--- a/pengine/test10/whitebox-imply-stop-on-fence.dot
|
|
|
26ee02 |
+++ b/pengine/test10/whitebox-imply-stop-on-fence.dot
|
|
|
26ee02 |
@@ -24,9 +24,7 @@
|
|
|
26ee02 |
"clvmd-clone_stop_0" [ style=bold color="green" fontcolor="orange"]
|
|
|
26ee02 |
"clvmd-clone_stopped_0" -> "dlm-clone_stop_0" [ style = bold]
|
|
|
26ee02 |
"clvmd-clone_stopped_0" [ style=bold color="green" fontcolor="orange"]
|
|
|
26ee02 |
-"clvmd_monitor_0 lxc-01_kiff-02" -> "clvmd_stop_0 kiff-01" [ style = bold]
|
|
|
26ee02 |
"clvmd_monitor_0 lxc-01_kiff-02" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
-"clvmd_monitor_0 lxc-02_kiff-02" -> "clvmd_stop_0 kiff-01" [ style = bold]
|
|
|
26ee02 |
"clvmd_monitor_0 lxc-02_kiff-02" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"clvmd_stop_0 kiff-01" -> "all_stopped" [ style = bold]
|
|
|
26ee02 |
"clvmd_stop_0 kiff-01" -> "clvmd-clone_stopped_0" [ style = bold]
|
|
|
26ee02 |
@@ -36,9 +34,7 @@
|
|
|
26ee02 |
"dlm-clone_stop_0" -> "dlm_stop_0 kiff-01" [ style = bold]
|
|
|
26ee02 |
"dlm-clone_stop_0" [ style=bold color="green" fontcolor="orange"]
|
|
|
26ee02 |
"dlm-clone_stopped_0" [ style=bold color="green" fontcolor="orange"]
|
|
|
26ee02 |
-"dlm_monitor_0 lxc-01_kiff-02" -> "dlm_stop_0 kiff-01" [ style = bold]
|
|
|
26ee02 |
"dlm_monitor_0 lxc-01_kiff-02" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
-"dlm_monitor_0 lxc-02_kiff-02" -> "dlm_stop_0 kiff-01" [ style = bold]
|
|
|
26ee02 |
"dlm_monitor_0 lxc-02_kiff-02" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"dlm_stop_0 kiff-01" -> "all_stopped" [ style = bold]
|
|
|
26ee02 |
"dlm_stop_0 kiff-01" -> "dlm-clone_stopped_0" [ style = bold]
|
|
|
26ee02 |
@@ -70,9 +66,7 @@
|
|
|
26ee02 |
"shared0-clone_stop_0" [ style=bold color="green" fontcolor="orange"]
|
|
|
26ee02 |
"shared0-clone_stopped_0" -> "clvmd-clone_stop_0" [ style = bold]
|
|
|
26ee02 |
"shared0-clone_stopped_0" [ style=bold color="green" fontcolor="orange"]
|
|
|
26ee02 |
-"shared0_monitor_0 lxc-01_kiff-02" -> "shared0_stop_0 kiff-01" [ style = bold]
|
|
|
26ee02 |
"shared0_monitor_0 lxc-01_kiff-02" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
-"shared0_monitor_0 lxc-02_kiff-02" -> "shared0_stop_0 kiff-01" [ style = bold]
|
|
|
26ee02 |
"shared0_monitor_0 lxc-02_kiff-02" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"shared0_stop_0 kiff-01" -> "all_stopped" [ style = bold]
|
|
|
26ee02 |
"shared0_stop_0 kiff-01" -> "clvmd_stop_0 kiff-01" [ style = bold]
|
|
|
26ee02 |
@@ -105,10 +99,8 @@
|
|
|
26ee02 |
"stonith_complete" -> "vm-fs_start_0 lxc-01_kiff-01" [ style = bold]
|
|
|
26ee02 |
"stonith_complete" [ style=bold color="green" fontcolor="orange"]
|
|
|
26ee02 |
"vm-fs_monitor_0 lxc-01_kiff-02" -> "vm-fs_start_0 lxc-01_kiff-01" [ style = bold]
|
|
|
26ee02 |
-"vm-fs_monitor_0 lxc-01_kiff-02" -> "vm-fs_stop_0 lxc-01_kiff-01" [ style = bold]
|
|
|
26ee02 |
"vm-fs_monitor_0 lxc-01_kiff-02" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"vm-fs_monitor_0 lxc-02_kiff-02" -> "vm-fs_start_0 lxc-01_kiff-01" [ style = bold]
|
|
|
26ee02 |
-"vm-fs_monitor_0 lxc-02_kiff-02" -> "vm-fs_stop_0 lxc-01_kiff-01" [ style = bold]
|
|
|
26ee02 |
"vm-fs_monitor_0 lxc-02_kiff-02" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"vm-fs_monitor_20000 lxc-01_kiff-01" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"vm-fs_start_0 lxc-01_kiff-01" -> "vm-fs_monitor_20000 lxc-01_kiff-01" [ style = bold]
|
|
|
26ee02 |
diff --git a/pengine/test10/whitebox-imply-stop-on-fence.exp b/pengine/test10/whitebox-imply-stop-on-fence.exp
|
|
|
26ee02 |
index 9a469f2..f80dde1 100644
|
|
|
26ee02 |
--- a/pengine/test10/whitebox-imply-stop-on-fence.exp
|
|
|
26ee02 |
+++ b/pengine/test10/whitebox-imply-stop-on-fence.exp
|
|
|
26ee02 |
@@ -47,12 +47,6 @@
|
|
|
26ee02 |
<crm_event id="1" operation="stonith" operation_key="stonith-kiff-01-reboot" on_node="kiff-01" on_node_uuid="1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="11" operation="monitor" operation_key="dlm_monitor_0" internal_operation_key="dlm:0_monitor_0" on_node="lxc-01_kiff-02" on_node_uuid="lxc-01_kiff-02" router_node="kiff-02"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="15" operation="monitor" operation_key="dlm_monitor_0" internal_operation_key="dlm:0_monitor_0" on_node="lxc-02_kiff-02" on_node_uuid="lxc-02_kiff-02" router_node="kiff-02"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
<pseudo_event id="29" operation="stop" operation_key="dlm-clone_stop_0"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
@@ -119,12 +113,6 @@
|
|
|
26ee02 |
<crm_event id="1" operation="stonith" operation_key="stonith-kiff-01-reboot" on_node="kiff-01" on_node_uuid="1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="12" operation="monitor" operation_key="clvmd_monitor_0" internal_operation_key="clvmd:0_monitor_0" on_node="lxc-01_kiff-02" on_node_uuid="lxc-01_kiff-02" router_node="kiff-02"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="16" operation="monitor" operation_key="clvmd_monitor_0" internal_operation_key="clvmd:0_monitor_0" on_node="lxc-02_kiff-02" on_node_uuid="lxc-02_kiff-02" router_node="kiff-02"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
<pseudo_event id="36" operation="stop" operation_key="clvmd-clone_stop_0"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
@@ -191,12 +179,6 @@
|
|
|
26ee02 |
<crm_event id="1" operation="stonith" operation_key="stonith-kiff-01-reboot" on_node="kiff-01" on_node_uuid="1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="13" operation="monitor" operation_key="shared0_monitor_0" internal_operation_key="shared0:0_monitor_0" on_node="lxc-01_kiff-02" on_node_uuid="lxc-01_kiff-02" router_node="kiff-02"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="17" operation="monitor" operation_key="shared0_monitor_0" internal_operation_key="shared0:0_monitor_0" on_node="lxc-02_kiff-02" on_node_uuid="lxc-02_kiff-02" router_node="kiff-02"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
<pseudo_event id="43" operation="stop" operation_key="shared0-clone_stop_0"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
@@ -395,12 +377,6 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="14" operation="monitor" operation_key="vm-fs_monitor_0" on_node="lxc-01_kiff-02" on_node_uuid="lxc-01_kiff-02" router_node="kiff-02"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="18" operation="monitor" operation_key="vm-fs_monitor_0" on_node="lxc-02_kiff-02" on_node_uuid="lxc-02_kiff-02" router_node="kiff-02"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
<pseudo_event id="69" operation="stonith" operation_key="stonith-lxc-01_kiff-01-reboot" on_node="lxc-01_kiff-01" on_node_uuid="lxc-01_kiff-01"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
diff --git a/pengine/test10/whitebox-ms-ordering.dot b/pengine/test10/whitebox-ms-ordering.dot
|
|
|
26ee02 |
index 84a0984..1f4d95b 100644
|
|
|
26ee02 |
--- a/pengine/test10/whitebox-ms-ordering.dot
|
|
|
26ee02 |
+++ b/pengine/test10/whitebox-ms-ordering.dot
|
|
|
26ee02 |
@@ -47,13 +47,10 @@
|
|
|
26ee02 |
"lxc-ms_demote_0 lxc1" -> "lxc-ms_stop_0 lxc1" [ style = bold]
|
|
|
26ee02 |
"lxc-ms_demote_0 lxc1" [ style=bold color="green" fontcolor="orange"]
|
|
|
26ee02 |
"lxc-ms_monitor_0 18node1" -> "lxc-ms-master_start_0" [ style = bold]
|
|
|
26ee02 |
-"lxc-ms_monitor_0 18node1" -> "lxc-ms_stop_0 lxc1" [ style = bold]
|
|
|
26ee02 |
"lxc-ms_monitor_0 18node1" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"lxc-ms_monitor_0 18node2" -> "lxc-ms-master_start_0" [ style = bold]
|
|
|
26ee02 |
-"lxc-ms_monitor_0 18node2" -> "lxc-ms_stop_0 lxc1" [ style = bold]
|
|
|
26ee02 |
"lxc-ms_monitor_0 18node2" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"lxc-ms_monitor_0 18node3" -> "lxc-ms-master_start_0" [ style = bold]
|
|
|
26ee02 |
-"lxc-ms_monitor_0 18node3" -> "lxc-ms_stop_0 lxc1" [ style = bold]
|
|
|
26ee02 |
"lxc-ms_monitor_0 18node3" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"lxc-ms_monitor_10000 lxc2" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"lxc-ms_promote_0 lxc1" -> "lxc-ms-master_promoted_0" [ style = bold]
|
|
|
26ee02 |
diff --git a/pengine/test10/whitebox-ms-ordering.exp b/pengine/test10/whitebox-ms-ordering.exp
|
|
|
26ee02 |
index e5eb99c..c8fee5e 100644
|
|
|
26ee02 |
--- a/pengine/test10/whitebox-ms-ordering.exp
|
|
|
26ee02 |
+++ b/pengine/test10/whitebox-ms-ordering.exp
|
|
|
26ee02 |
@@ -158,15 +158,6 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="5" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="10" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
- <rsc_op id="15" operation="monitor" operation_key="lxc-ms_monitor_0" internal_operation_key="lxc-ms:0_monitor_0" on_node="18node3" on_node_uuid="3"/>
|
|
|
26ee02 |
- </trigger>
|
|
|
26ee02 |
- <trigger>
|
|
|
26ee02 |
<pseudo_event id="22" operation="demote" operation_key="lxc-ms_demote_0" internal_operation_key="lxc-ms:0_demote_0"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
diff --git a/pengine/test10/whitebox-orphan-ms.dot b/pengine/test10/whitebox-orphan-ms.dot
|
|
|
26ee02 |
index 4e2e211..46b6cda 100644
|
|
|
26ee02 |
--- a/pengine/test10/whitebox-orphan-ms.dot
|
|
|
26ee02 |
+++ b/pengine/test10/whitebox-orphan-ms.dot
|
|
|
26ee02 |
@@ -25,8 +25,6 @@
|
|
|
26ee02 |
"container2_stop_0 18node1" -> "container2_delete_0 18node2" [ style = bold]
|
|
|
26ee02 |
"container2_stop_0 18node1" -> "container2_delete_0 18node3" [ style = bold]
|
|
|
26ee02 |
"container2_stop_0 18node1" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
-"lsb-dummy_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"]
|
|
|
26ee02 |
-"lsb-dummy_monitor_0 lxc2" [ style=dashed color="red" fontcolor="black"]
|
|
|
26ee02 |
"lxc-ms_clear_failcount_0 lxc1" -> "lxc-ms_stop_0 lxc1" [ style = dashed]
|
|
|
26ee02 |
"lxc-ms_clear_failcount_0 lxc1" -> "lxc-ms_stop_0 lxc2" [ style = dashed]
|
|
|
26ee02 |
"lxc-ms_clear_failcount_0 lxc1" [ style=dashed color="red" fontcolor="black"]
|
|
|
26ee02 |
@@ -71,20 +69,4 @@
|
|
|
26ee02 |
"lxc2_stop_0 18node1" -> "lxc2_delete_0 18node2" [ style = bold]
|
|
|
26ee02 |
"lxc2_stop_0 18node1" -> "lxc2_delete_0 18node3" [ style = bold]
|
|
|
26ee02 |
"lxc2_stop_0 18node1" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
-"migrator_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"]
|
|
|
26ee02 |
-"migrator_monitor_0 lxc2" [ style=dashed color="red" fontcolor="black"]
|
|
|
26ee02 |
-"ping-1_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"]
|
|
|
26ee02 |
-"ping-1_monitor_0 lxc2" [ style=dashed color="red" fontcolor="black"]
|
|
|
26ee02 |
-"r192.168.122.87_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"]
|
|
|
26ee02 |
-"r192.168.122.87_monitor_0 lxc2" [ style=dashed color="red" fontcolor="black"]
|
|
|
26ee02 |
-"r192.168.122.88_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"]
|
|
|
26ee02 |
-"r192.168.122.88_monitor_0 lxc2" [ style=dashed color="red" fontcolor="black"]
|
|
|
26ee02 |
-"r192.168.122.89_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"]
|
|
|
26ee02 |
-"r192.168.122.89_monitor_0 lxc2" [ style=dashed color="red" fontcolor="black"]
|
|
|
26ee02 |
-"rsc_18node1_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"]
|
|
|
26ee02 |
-"rsc_18node1_monitor_0 lxc2" [ style=dashed color="red" fontcolor="black"]
|
|
|
26ee02 |
-"rsc_18node2_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"]
|
|
|
26ee02 |
-"rsc_18node2_monitor_0 lxc2" [ style=dashed color="red" fontcolor="black"]
|
|
|
26ee02 |
-"rsc_18node3_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"]
|
|
|
26ee02 |
-"rsc_18node3_monitor_0 lxc2" [ style=dashed color="red" fontcolor="black"]
|
|
|
26ee02 |
}
|
|
|
26ee02 |
diff --git a/pengine/test10/whitebox-orphan-ms.exp b/pengine/test10/whitebox-orphan-ms.exp
|
|
|
26ee02 |
index 564e92d..ef81317 100644
|
|
|
26ee02 |
--- a/pengine/test10/whitebox-orphan-ms.exp
|
|
|
26ee02 |
+++ b/pengine/test10/whitebox-orphan-ms.exp
|
|
|
26ee02 |
@@ -1,20 +1,20 @@
|
|
|
26ee02 |
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="1" transition_id="0">
|
|
|
26ee02 |
<synapse id="0">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <rsc_op id="59" operation="start" operation_key="FencingFail_start_0" on_node="18node1" on_node_uuid="1">
|
|
|
26ee02 |
+ <rsc_op id="41" operation="start" operation_key="FencingFail_start_0" on_node="18node1" on_node_uuid="1">
|
|
|
26ee02 |
<primitive id="FencingFail" class="stonith" type="fence_dummy"/>
|
|
|
26ee02 |
<attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="90000" delay="20" mode="fail" pcmk_host_list="18node1 18node3" random_sleep_range="30"/>
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="58" operation="stop" operation_key="FencingFail_stop_0" on_node="18node3" on_node_uuid="3"/>
|
|
|
26ee02 |
+ <rsc_op id="40" operation="stop" operation_key="FencingFail_stop_0" on_node="18node3" on_node_uuid="3"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="1">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <rsc_op id="58" operation="stop" operation_key="FencingFail_stop_0" on_node="18node3" on_node_uuid="3">
|
|
|
26ee02 |
+ <rsc_op id="40" operation="stop" operation_key="FencingFail_stop_0" on_node="18node3" on_node_uuid="3">
|
|
|
26ee02 |
<primitive id="FencingFail" class="stonith" type="fence_dummy"/>
|
|
|
26ee02 |
<attributes CRM_meta_on_node="18node3" CRM_meta_on_node_uuid="3" CRM_meta_timeout="90000" delay="20" mode="fail" pcmk_host_list="18node1 18node3" random_sleep_range="30"/>
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
@@ -23,14 +23,14 @@
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="2">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <rsc_op id="106" operation="stop" operation_key="container2_stop_0" on_node="18node1" on_node_uuid="1">
|
|
|
26ee02 |
+ <rsc_op id="88" operation="stop" operation_key="container2_stop_0" on_node="18node1" on_node_uuid="1">
|
|
|
26ee02 |
<primitive id="container2" class="ocf" provider="heartbeat" type="VirtualDomain"/>
|
|
|
26ee02 |
<attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="90000" />
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="112" operation="stop" operation_key="lxc2_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
+ <rsc_op id="94" operation="stop" operation_key="lxc2_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
@@ -43,7 +43,7 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="106" operation="stop" operation_key="container2_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
+ <rsc_op id="88" operation="stop" operation_key="container2_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
@@ -56,7 +56,7 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="106" operation="stop" operation_key="container2_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
+ <rsc_op id="88" operation="stop" operation_key="container2_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
@@ -69,13 +69,13 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="106" operation="stop" operation_key="container2_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
+ <rsc_op id="88" operation="stop" operation_key="container2_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="6">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <rsc_op id="107" operation="stop" operation_key="lxc1_stop_0" on_node="18node1" on_node_uuid="1">
|
|
|
26ee02 |
+ <rsc_op id="89" operation="stop" operation_key="lxc1_stop_0" on_node="18node1" on_node_uuid="1">
|
|
|
26ee02 |
<primitive id="lxc1" class="ocf" provider="pacemaker" type="remote"/>
|
|
|
26ee02 |
<attributes CRM_meta_container="container1" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="90000" />
|
|
|
26ee02 |
<downed>
|
|
|
26ee02 |
@@ -85,10 +85,10 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="108" operation="demote" operation_key="lxc-ms_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
|
|
|
26ee02 |
+ <rsc_op id="90" operation="demote" operation_key="lxc-ms_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="110" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
|
|
|
26ee02 |
+ <rsc_op id="92" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
@@ -101,7 +101,7 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="107" operation="stop" operation_key="lxc1_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
+ <rsc_op id="89" operation="stop" operation_key="lxc1_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
@@ -114,7 +114,7 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="107" operation="stop" operation_key="lxc1_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
+ <rsc_op id="89" operation="stop" operation_key="lxc1_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
@@ -127,45 +127,45 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="107" operation="stop" operation_key="lxc1_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
+ <rsc_op id="89" operation="stop" operation_key="lxc1_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="10">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <rsc_op id="111" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1">
|
|
|
26ee02 |
+ <rsc_op id="93" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1">
|
|
|
26ee02 |
<primitive id="lxc-ms" class="ocf" provider="pacemaker" type="Stateful"/>
|
|
|
26ee02 |
<attributes CRM_meta_on_node="lxc2" CRM_meta_on_node_uuid="lxc2" CRM_meta_physical_host="18node1" CRM_meta_timeout="90000" />
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="108" operation="demote" operation_key="lxc-ms_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
|
|
|
26ee02 |
+ <rsc_op id="90" operation="demote" operation_key="lxc-ms_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="109" operation="demote" operation_key="lxc-ms_demote_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
|
|
|
26ee02 |
+ <rsc_op id="91" operation="demote" operation_key="lxc-ms_demote_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="11">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <rsc_op id="110" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1">
|
|
|
26ee02 |
+ <rsc_op id="92" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1">
|
|
|
26ee02 |
<primitive id="lxc-ms" class="ocf" provider="pacemaker" type="Stateful"/>
|
|
|
26ee02 |
<attributes CRM_meta_on_node="lxc1" CRM_meta_on_node_uuid="lxc1" CRM_meta_physical_host="18node1" CRM_meta_timeout="90000" />
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="108" operation="demote" operation_key="lxc-ms_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
|
|
|
26ee02 |
+ <rsc_op id="90" operation="demote" operation_key="lxc-ms_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="109" operation="demote" operation_key="lxc-ms_demote_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
|
|
|
26ee02 |
+ <rsc_op id="91" operation="demote" operation_key="lxc-ms_demote_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="12">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <rsc_op id="109" operation="demote" operation_key="lxc-ms_demote_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1">
|
|
|
26ee02 |
+ <rsc_op id="91" operation="demote" operation_key="lxc-ms_demote_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1">
|
|
|
26ee02 |
<primitive id="lxc-ms" class="ocf" provider="pacemaker" type="Stateful"/>
|
|
|
26ee02 |
<attributes CRM_meta_on_node="lxc2" CRM_meta_on_node_uuid="lxc2" CRM_meta_physical_host="18node1" CRM_meta_timeout="90000" />
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
@@ -174,7 +174,7 @@
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="13">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <rsc_op id="108" operation="demote" operation_key="lxc-ms_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1">
|
|
|
26ee02 |
+ <rsc_op id="90" operation="demote" operation_key="lxc-ms_demote_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1">
|
|
|
26ee02 |
<primitive id="lxc-ms" class="ocf" provider="pacemaker" type="Stateful"/>
|
|
|
26ee02 |
<attributes CRM_meta_on_node="lxc1" CRM_meta_on_node_uuid="lxc1" CRM_meta_physical_host="18node1" CRM_meta_timeout="90000" />
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
@@ -190,10 +190,10 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="110" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
|
|
|
26ee02 |
+ <rsc_op id="92" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="111" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
|
|
|
26ee02 |
+ <rsc_op id="93" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
@@ -206,10 +206,10 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="110" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
|
|
|
26ee02 |
+ <rsc_op id="92" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="111" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
|
|
|
26ee02 |
+ <rsc_op id="93" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
@@ -222,16 +222,16 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="110" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
|
|
|
26ee02 |
+ <rsc_op id="92" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="111" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
|
|
|
26ee02 |
+ <rsc_op id="93" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="17">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <rsc_op id="112" operation="stop" operation_key="lxc2_stop_0" on_node="18node1" on_node_uuid="1">
|
|
|
26ee02 |
+ <rsc_op id="94" operation="stop" operation_key="lxc2_stop_0" on_node="18node1" on_node_uuid="1">
|
|
|
26ee02 |
<primitive id="lxc2" class="ocf" provider="pacemaker" type="remote"/>
|
|
|
26ee02 |
<attributes CRM_meta_container="container2" CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="90000" />
|
|
|
26ee02 |
<downed>
|
|
|
26ee02 |
@@ -241,10 +241,10 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="109" operation="demote" operation_key="lxc-ms_demote_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
|
|
|
26ee02 |
+ <rsc_op id="91" operation="demote" operation_key="lxc-ms_demote_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="111" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
|
|
|
26ee02 |
+ <rsc_op id="93" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
@@ -257,7 +257,7 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="112" operation="stop" operation_key="lxc2_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
+ <rsc_op id="94" operation="stop" operation_key="lxc2_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
@@ -270,7 +270,7 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="112" operation="stop" operation_key="lxc2_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
+ <rsc_op id="94" operation="stop" operation_key="lxc2_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
@@ -283,20 +283,20 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="112" operation="stop" operation_key="lxc2_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
+ <rsc_op id="94" operation="stop" operation_key="lxc2_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="21">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <rsc_op id="113" operation="stop" operation_key="container1_stop_0" on_node="18node1" on_node_uuid="1">
|
|
|
26ee02 |
+ <rsc_op id="95" operation="stop" operation_key="container1_stop_0" on_node="18node1" on_node_uuid="1">
|
|
|
26ee02 |
<primitive id="container1" class="ocf" provider="heartbeat" type="VirtualDomain"/>
|
|
|
26ee02 |
<attributes CRM_meta_on_node="18node1" CRM_meta_on_node_uuid="1" CRM_meta_timeout="90000" />
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="107" operation="stop" operation_key="lxc1_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
+ <rsc_op id="89" operation="stop" operation_key="lxc1_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
@@ -309,7 +309,7 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="113" operation="stop" operation_key="container1_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
+ <rsc_op id="95" operation="stop" operation_key="container1_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
@@ -322,7 +322,7 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="113" operation="stop" operation_key="container1_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
+ <rsc_op id="95" operation="stop" operation_key="container1_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
@@ -335,7 +335,7 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="113" operation="stop" operation_key="container1_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
+ <rsc_op id="95" operation="stop" operation_key="container1_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
@@ -347,25 +347,25 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="58" operation="stop" operation_key="FencingFail_stop_0" on_node="18node3" on_node_uuid="3"/>
|
|
|
26ee02 |
+ <rsc_op id="40" operation="stop" operation_key="FencingFail_stop_0" on_node="18node3" on_node_uuid="3"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="106" operation="stop" operation_key="container2_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
+ <rsc_op id="88" operation="stop" operation_key="container2_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="107" operation="stop" operation_key="lxc1_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
+ <rsc_op id="89" operation="stop" operation_key="lxc1_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="110" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
|
|
|
26ee02 |
+ <rsc_op id="92" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="111" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
|
|
|
26ee02 |
+ <rsc_op id="93" operation="stop" operation_key="lxc-ms_stop_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="112" operation="stop" operation_key="lxc2_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
+ <rsc_op id="94" operation="stop" operation_key="lxc2_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="113" operation="stop" operation_key="container1_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
+ <rsc_op id="95" operation="stop" operation_key="container1_stop_0" on_node="18node1" on_node_uuid="1"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
diff --git a/pengine/test10/whitebox-orphaned.dot b/pengine/test10/whitebox-orphaned.dot
|
|
|
26ee02 |
index 4ef1f7e..48e167f 100644
|
|
|
26ee02 |
--- a/pengine/test10/whitebox-orphaned.dot
|
|
|
26ee02 |
+++ b/pengine/test10/whitebox-orphaned.dot
|
|
|
26ee02 |
@@ -1,5 +1,4 @@
|
|
|
26ee02 |
digraph "g" {
|
|
|
26ee02 |
-"A_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"]
|
|
|
26ee02 |
"A_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"B_monitor_0 lxc2" -> "B_start_0 lxc2" [ style = bold]
|
|
|
26ee02 |
"B_monitor_0 lxc2" -> "B_stop_0 lxc1" [ style = bold]
|
|
|
26ee02 |
@@ -11,8 +10,6 @@
|
|
|
26ee02 |
"B_stop_0 lxc1" -> "all_stopped" [ style = bold]
|
|
|
26ee02 |
"B_stop_0 lxc1" -> "lxc1_stop_0 18node2" [ style = bold]
|
|
|
26ee02 |
"B_stop_0 lxc1" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
-"C_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"]
|
|
|
26ee02 |
-"D_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"]
|
|
|
26ee02 |
"D_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"]
|
|
|
26ee02 |
"M-clone_stop_0" -> "M-clone_stopped_0" [ style = bold]
|
|
|
26ee02 |
"M-clone_stop_0" -> "M_stop_0 lxc1" [ style = bold]
|
|
|
26ee02 |
diff --git a/pengine/test10/whitebox-orphaned.exp b/pengine/test10/whitebox-orphaned.exp
|
|
|
26ee02 |
index 843f186..b267010 100644
|
|
|
26ee02 |
--- a/pengine/test10/whitebox-orphaned.exp
|
|
|
26ee02 |
+++ b/pengine/test10/whitebox-orphaned.exp
|
|
|
26ee02 |
@@ -1,35 +1,35 @@
|
|
|
26ee02 |
<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" transition_id="0">
|
|
|
26ee02 |
<synapse id="0">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <rsc_op id="39" operation="stop" operation_key="M_stop_0" internal_operation_key="M:4_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2">
|
|
|
26ee02 |
+ <rsc_op id="36" operation="stop" operation_key="M_stop_0" internal_operation_key="M:4_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2">
|
|
|
26ee02 |
<primitive id="M" long-id="M:4" class="ocf" provider="pacemaker" type="Dummy"/>
|
|
|
26ee02 |
<attributes CRM_meta_clone="4" CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_on_node="lxc1" CRM_meta_on_node_uuid="lxc1" CRM_meta_physical_host="18node2" CRM_meta_timeout="20000" />
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <pseudo_event id="42" operation="stop" operation_key="M-clone_stop_0"/>
|
|
|
26ee02 |
+ <pseudo_event id="39" operation="stop" operation_key="M-clone_stop_0"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="1" priority="1000000">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <pseudo_event id="43" operation="stopped" operation_key="M-clone_stopped_0">
|
|
|
26ee02 |
+ <pseudo_event id="40" operation="stopped" operation_key="M-clone_stopped_0">
|
|
|
26ee02 |
<attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
|
|
|
26ee02 |
</pseudo_event>
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="39" operation="stop" operation_key="M_stop_0" internal_operation_key="M:4_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2"/>
|
|
|
26ee02 |
+ <rsc_op id="36" operation="stop" operation_key="M_stop_0" internal_operation_key="M:4_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <pseudo_event id="42" operation="stop" operation_key="M-clone_stop_0"/>
|
|
|
26ee02 |
+ <pseudo_event id="39" operation="stop" operation_key="M-clone_stop_0"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="2">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <pseudo_event id="42" operation="stop" operation_key="M-clone_stop_0">
|
|
|
26ee02 |
+ <pseudo_event id="39" operation="stop" operation_key="M-clone_stop_0">
|
|
|
26ee02 |
<attributes CRM_meta_clone_max="4" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" />
|
|
|
26ee02 |
</pseudo_event>
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
@@ -37,7 +37,7 @@
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="3">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <rsc_op id="22" operation="monitor" operation_key="A_monitor_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2">
|
|
|
26ee02 |
+ <rsc_op id="19" operation="monitor" operation_key="A_monitor_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2">
|
|
|
26ee02 |
<primitive id="A" class="ocf" provider="pacemaker" type="Dummy"/>
|
|
|
26ee02 |
<attributes CRM_meta_on_node="lxc2" CRM_meta_on_node_uuid="lxc2" CRM_meta_op_target_rc="7" CRM_meta_physical_host="18node2" CRM_meta_timeout="20000" />
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
@@ -46,49 +46,49 @@
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="4">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <rsc_op id="48" operation="monitor" operation_key="B_monitor_10000" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2">
|
|
|
26ee02 |
+ <rsc_op id="45" operation="monitor" operation_key="B_monitor_10000" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2">
|
|
|
26ee02 |
<primitive id="B" class="ocf" provider="pacemaker" type="Dummy"/>
|
|
|
26ee02 |
<attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_node="lxc2" CRM_meta_on_node_uuid="lxc2" CRM_meta_physical_host="18node2" CRM_meta_timeout="20000" />
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="47" operation="start" operation_key="B_start_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2"/>
|
|
|
26ee02 |
+ <rsc_op id="44" operation="start" operation_key="B_start_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="5">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <rsc_op id="47" operation="start" operation_key="B_start_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2">
|
|
|
26ee02 |
+ <rsc_op id="44" operation="start" operation_key="B_start_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2">
|
|
|
26ee02 |
<primitive id="B" class="ocf" provider="pacemaker" type="Dummy"/>
|
|
|
26ee02 |
<attributes CRM_meta_on_node="lxc2" CRM_meta_on_node_uuid="lxc2" CRM_meta_physical_host="18node2" CRM_meta_timeout="20000" />
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="23" operation="monitor" operation_key="B_monitor_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2"/>
|
|
|
26ee02 |
+ <rsc_op id="20" operation="monitor" operation_key="B_monitor_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="46" operation="stop" operation_key="B_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2"/>
|
|
|
26ee02 |
+ <rsc_op id="43" operation="stop" operation_key="B_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="6">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <rsc_op id="46" operation="stop" operation_key="B_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2">
|
|
|
26ee02 |
+ <rsc_op id="43" operation="stop" operation_key="B_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2">
|
|
|
26ee02 |
<primitive id="B" class="ocf" provider="pacemaker" type="Dummy"/>
|
|
|
26ee02 |
<attributes CRM_meta_on_node="lxc1" CRM_meta_on_node_uuid="lxc1" CRM_meta_physical_host="18node2" CRM_meta_timeout="20000" />
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="23" operation="monitor" operation_key="B_monitor_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2"/>
|
|
|
26ee02 |
+ <rsc_op id="20" operation="monitor" operation_key="B_monitor_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="7">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <rsc_op id="23" operation="monitor" operation_key="B_monitor_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2">
|
|
|
26ee02 |
+ <rsc_op id="20" operation="monitor" operation_key="B_monitor_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2">
|
|
|
26ee02 |
<primitive id="B" class="ocf" provider="pacemaker" type="Dummy"/>
|
|
|
26ee02 |
<attributes CRM_meta_on_node="lxc2" CRM_meta_on_node_uuid="lxc2" CRM_meta_op_target_rc="7" CRM_meta_physical_host="18node2" CRM_meta_timeout="20000" />
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
@@ -97,7 +97,7 @@
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="8">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <rsc_op id="24" operation="monitor" operation_key="D_monitor_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2">
|
|
|
26ee02 |
+ <rsc_op id="21" operation="monitor" operation_key="D_monitor_0" on_node="lxc2" on_node_uuid="lxc2" router_node="18node2">
|
|
|
26ee02 |
<primitive id="D" class="ocf" provider="pacemaker" type="Dummy"/>
|
|
|
26ee02 |
<attributes CRM_meta_on_node="lxc2" CRM_meta_on_node_uuid="lxc2" CRM_meta_op_target_rc="7" CRM_meta_physical_host="18node2" CRM_meta_timeout="20000" />
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
@@ -106,23 +106,23 @@
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="9">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <rsc_op id="55" operation="stop" operation_key="container1_stop_0" on_node="18node2" on_node_uuid="2">
|
|
|
26ee02 |
+ <rsc_op id="52" operation="stop" operation_key="container1_stop_0" on_node="18node2" on_node_uuid="2">
|
|
|
26ee02 |
<primitive id="container1" class="ocf" provider="heartbeat" type="VirtualDomain"/>
|
|
|
26ee02 |
<attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
|
|
|
26ee02 |
</rsc_op>
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <crm_event id="25" operation="clear_failcount" operation_key="container1_clear_failcount_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
+ <crm_event id="22" operation="clear_failcount" operation_key="container1_clear_failcount_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="56" operation="stop" operation_key="lxc1_stop_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
+ <rsc_op id="53" operation="stop" operation_key="lxc1_stop_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="10">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <crm_event id="25" operation="clear_failcount" operation_key="container1_clear_failcount_0" on_node="18node2" on_node_uuid="2">
|
|
|
26ee02 |
+ <crm_event id="22" operation="clear_failcount" operation_key="container1_clear_failcount_0" on_node="18node2" on_node_uuid="2">
|
|
|
26ee02 |
<primitive id="container1" class="ocf" provider="heartbeat" type="VirtualDomain"/>
|
|
|
26ee02 |
<attributes CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_op_no_wait="true" CRM_meta_timeout="20000" />
|
|
|
26ee02 |
</crm_event>
|
|
|
26ee02 |
@@ -138,7 +138,7 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="55" operation="stop" operation_key="container1_stop_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
+ <rsc_op id="52" operation="stop" operation_key="container1_stop_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
@@ -151,7 +151,7 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="55" operation="stop" operation_key="container1_stop_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
+ <rsc_op id="52" operation="stop" operation_key="container1_stop_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
@@ -164,13 +164,13 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="55" operation="stop" operation_key="container1_stop_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
+ <rsc_op id="52" operation="stop" operation_key="container1_stop_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="14">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <rsc_op id="56" operation="stop" operation_key="lxc1_stop_0" on_node="18node2" on_node_uuid="2">
|
|
|
26ee02 |
+ <rsc_op id="53" operation="stop" operation_key="lxc1_stop_0" on_node="18node2" on_node_uuid="2">
|
|
|
26ee02 |
<primitive id="lxc1" class="ocf" provider="pacemaker" type="remote"/>
|
|
|
26ee02 |
<attributes CRM_meta_container="container1" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_timeout="20000" />
|
|
|
26ee02 |
<downed>
|
|
|
26ee02 |
@@ -180,19 +180,19 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <crm_event id="26" operation="clear_failcount" operation_key="lxc1_clear_failcount_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
+ <crm_event id="23" operation="clear_failcount" operation_key="lxc1_clear_failcount_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="39" operation="stop" operation_key="M_stop_0" internal_operation_key="M:4_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2"/>
|
|
|
26ee02 |
+ <rsc_op id="36" operation="stop" operation_key="M_stop_0" internal_operation_key="M:4_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="46" operation="stop" operation_key="B_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2"/>
|
|
|
26ee02 |
+ <rsc_op id="43" operation="stop" operation_key="B_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
<synapse id="15">
|
|
|
26ee02 |
<action_set>
|
|
|
26ee02 |
- <crm_event id="26" operation="clear_failcount" operation_key="lxc1_clear_failcount_0" on_node="18node2" on_node_uuid="2">
|
|
|
26ee02 |
+ <crm_event id="23" operation="clear_failcount" operation_key="lxc1_clear_failcount_0" on_node="18node2" on_node_uuid="2">
|
|
|
26ee02 |
<primitive id="lxc1" class="ocf" provider="pacemaker" type="remote"/>
|
|
|
26ee02 |
<attributes CRM_meta_container="container1" CRM_meta_on_node="18node2" CRM_meta_on_node_uuid="2" CRM_meta_op_no_wait="true" CRM_meta_timeout="20000" />
|
|
|
26ee02 |
</crm_event>
|
|
|
26ee02 |
@@ -208,7 +208,7 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="56" operation="stop" operation_key="lxc1_stop_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
+ <rsc_op id="53" operation="stop" operation_key="lxc1_stop_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
@@ -221,7 +221,7 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="56" operation="stop" operation_key="lxc1_stop_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
+ <rsc_op id="53" operation="stop" operation_key="lxc1_stop_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
@@ -234,7 +234,7 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="56" operation="stop" operation_key="lxc1_stop_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
+ <rsc_op id="53" operation="stop" operation_key="lxc1_stop_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
@@ -246,16 +246,16 @@
|
|
|
26ee02 |
</action_set>
|
|
|
26ee02 |
<inputs>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="39" operation="stop" operation_key="M_stop_0" internal_operation_key="M:4_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2"/>
|
|
|
26ee02 |
+ <rsc_op id="36" operation="stop" operation_key="M_stop_0" internal_operation_key="M:4_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="46" operation="stop" operation_key="B_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2"/>
|
|
|
26ee02 |
+ <rsc_op id="43" operation="stop" operation_key="B_stop_0" on_node="lxc1" on_node_uuid="lxc1" router_node="18node2"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="55" operation="stop" operation_key="container1_stop_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
+ <rsc_op id="52" operation="stop" operation_key="container1_stop_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
<trigger>
|
|
|
26ee02 |
- <rsc_op id="56" operation="stop" operation_key="lxc1_stop_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
+ <rsc_op id="53" operation="stop" operation_key="lxc1_stop_0" on_node="18node2" on_node_uuid="2"/>
|
|
|
26ee02 |
</trigger>
|
|
|
26ee02 |
</inputs>
|
|
|
26ee02 |
</synapse>
|
|
|
26ee02 |
--
|
|
|
26ee02 |
1.8.3.1
|
|
|
26ee02 |
|
|
|
26ee02 |
|
|
|
26ee02 |
From 7bc58b42080989abd7080940f29543b09207f51f Mon Sep 17 00:00:00 2001
|
|
|
26ee02 |
From: Andrew Beekhof <andrew@beekhof.net>
|
|
|
26ee02 |
Date: Wed, 25 Oct 2017 13:59:53 +1100
|
|
|
26ee02 |
Subject: [PATCH 4/4] Fix: PE: Have bundles log to stderr so that 'docker logs'
|
|
|
26ee02 |
works
|
|
|
26ee02 |
|
|
|
26ee02 |
---
|
|
|
26ee02 |
lib/pengine/container.c | 2 ++
|
|
|
26ee02 |
1 file changed, 2 insertions(+)
|
|
|
26ee02 |
|
|
|
26ee02 |
diff --git a/lib/pengine/container.c b/lib/pengine/container.c
|
|
|
26ee02 |
index f1f66a5..affe5ea 100644
|
|
|
26ee02 |
--- a/lib/pengine/container.c
|
|
|
26ee02 |
+++ b/lib/pengine/container.c
|
|
|
26ee02 |
@@ -215,6 +215,8 @@ create_docker_resource(
|
|
|
26ee02 |
data->prefix, tuple->offset);
|
|
|
26ee02 |
}
|
|
|
26ee02 |
|
|
|
26ee02 |
+ offset += snprintf(buffer+offset, max-offset, " -e PCMK_stderr=1");
|
|
|
26ee02 |
+
|
|
|
26ee02 |
if(data->docker_network) {
|
|
|
26ee02 |
// offset += snprintf(buffer+offset, max-offset, " --link-local-ip=%s", tuple->ipaddr);
|
|
|
26ee02 |
offset += snprintf(buffer+offset, max-offset, " --net=%s", data->docker_network);
|
|
|
26ee02 |
--
|
|
|
26ee02 |
1.8.3.1
|
|
|
26ee02 |
|