diff --git a/crm/pengine/testcases/master-10.dot b/crm/pengine/testcases/master-10.dot index 8999243067..9655ed485e 100644 --- a/crm/pengine/testcases/master-10.dot +++ b/crm/pengine/testcases/master-10.dot @@ -1,156 +1,157 @@ digraph "g" { size = "30,30" "probe_complete" [ style=bold color="green" fontcolor="orange" ] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_promote_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_monitor_11000 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_promote_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_monitor_11000 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_monitor_1000 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_1000 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_pre_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_confirmed-pre_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_post_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_confirmed-post_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_promote_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_promoted_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_pre_notify_promote_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-pre_notify_promote_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_post_notify_promote_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-post_notify_promote_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_demote_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_demoted_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_pre_notify_demote_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_confirmed-pre_notify_demote_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_post_notify_demote_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_confirmed-post_notify_demote_0" [ style="dashed" color="blue" fontcolor="orange" ] "child_rsc1:2_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_pre_notify_promote_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_post_notify_promote_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_post_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_pre_notify_promote_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_post_notify_promote_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_pre_notify_promote_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_post_notify_promote_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_post_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_pre_notify_promote_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_post_notify_promote_0 node2" [ style=bold color="green" fontcolor="black" ] "probe_complete node1" -> "probe_complete" [ style = bold] "probe_complete node2" -> "probe_complete" [ style = bold] "child_rsc1:0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1:3_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1:4_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:4_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1_start_0" -> "child_rsc1:2_start_0 node1" [ style = bold] "child_rsc1:2_start_0 node1" -> "child_rsc1:2_promote_0 node1" [ style = bold] "rsc1_promote_0" -> "child_rsc1:2_promote_0 node1" [ style = bold] "child_rsc1:2_start_0 node1" -> "child_rsc1:2_monitor_11000 node1" [ style = bold] "child_rsc1:2_promote_0 node1" -> "child_rsc1:2_monitor_11000 node1" [ style = bold] -"rsc1_post_notify_start_0" -> "child_rsc1:2_monitor_11000 node1" [ style = bold] -"rsc1_post_notify_promote_0" -> "child_rsc1:2_monitor_11000 node1" [ style = bold] +"rsc1_confirmed-post_notify_start_0" -> "child_rsc1:2_monitor_11000 node1" [ style = bold] +"rsc1_confirmed-post_notify_promote_0" -> "child_rsc1:2_monitor_11000 node1" [ style = bold] "rsc1_start_0" -> "child_rsc1:3_start_0 node2" [ style = bold] "child_rsc1:3_start_0 node2" -> "child_rsc1:3_promote_0 node2" [ style = bold] "rsc1_promote_0" -> "child_rsc1:3_promote_0 node2" [ style = bold] "child_rsc1:3_start_0 node2" -> "child_rsc1:3_monitor_11000 node2" [ style = bold] "child_rsc1:3_promote_0 node2" -> "child_rsc1:3_monitor_11000 node2" [ style = bold] -"rsc1_post_notify_start_0" -> "child_rsc1:3_monitor_11000 node2" [ style = bold] -"rsc1_post_notify_promote_0" -> "child_rsc1:3_monitor_11000 node2" [ style = bold] +"rsc1_confirmed-post_notify_start_0" -> "child_rsc1:3_monitor_11000 node2" [ style = bold] +"rsc1_confirmed-post_notify_promote_0" -> "child_rsc1:3_monitor_11000 node2" [ style = bold] "rsc1_start_0" -> "child_rsc1:0_start_0 node1" [ style = bold] "child_rsc1:0_start_0 node1" -> "child_rsc1:0_monitor_1000 node1" [ style = bold] -"rsc1_post_notify_start_0" -> "child_rsc1:0_monitor_1000 node1" [ style = bold] -"rsc1_post_notify_promote_0" -> "child_rsc1:0_monitor_1000 node1" [ style = bold] +"rsc1_confirmed-post_notify_start_0" -> "child_rsc1:0_monitor_1000 node1" [ style = bold] +"rsc1_confirmed-post_notify_promote_0" -> "child_rsc1:0_monitor_1000 node1" [ style = bold] "rsc1_start_0" -> "child_rsc1:1_start_0 node2" [ style = bold] "child_rsc1:1_start_0 node2" -> "child_rsc1:1_monitor_1000 node2" [ style = bold] -"rsc1_post_notify_start_0" -> "child_rsc1:1_monitor_1000 node2" [ style = bold] -"rsc1_post_notify_promote_0" -> "child_rsc1:1_monitor_1000 node2" [ style = bold] +"rsc1_confirmed-post_notify_start_0" -> "child_rsc1:1_monitor_1000 node2" [ style = bold] +"rsc1_confirmed-post_notify_promote_0" -> "child_rsc1:1_monitor_1000 node2" [ style = bold] "probe_complete" -> "rsc1_start_0" [ style = bold] "rsc1_confirmed-pre_notify_start_0" -> "rsc1_start_0" [ style = bold] "rsc1_stop_0" -> "rsc1_start_0" [ style = dashed] "rsc1_stopped_0" -> "rsc1_start_0" [ style = dashed] "rsc1_confirmed-post_notify_stop_0" -> "rsc1_start_0" [ style = dashed] "rsc1_demoted_0" -> "rsc1_start_0" [ style = dashed] "child_rsc1:2_start_0 node1" -> "rsc1_running_0" [ style = bold] "child_rsc1:3_start_0 node2" -> "rsc1_running_0" [ style = bold] "child_rsc1:0_start_0 node1" -> "rsc1_running_0" [ style = bold] "child_rsc1:1_start_0 node2" -> "rsc1_running_0" [ style = bold] "rsc1_start_0" -> "rsc1_running_0" [ style = bold] +"rsc1_confirmed-post_notify_stop_0" -> "rsc1_pre_notify_start_0" [ style = dashed] "rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold] "rsc1_running_0" -> "rsc1_post_notify_start_0" [ style = bold] "rsc1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "child_rsc1:2_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "child_rsc1:3_post_notify_start_0 node2" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "child_rsc1:0_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "child_rsc1:1_post_notify_start_0 node2" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "rsc1_confirmed-pre_notify_stop_0" -> "rsc1_stop_0" [ style = dashed] "rsc1_confirmed-post_notify_demote_0" -> "rsc1_stop_0" [ style = dashed] "rsc1_demote_0" -> "rsc1_stop_0" [ style = dashed] "rsc1_demoted_0" -> "rsc1_stop_0" [ style = dashed] "rsc1_stop_0" -> "rsc1_stopped_0" [ style = dashed] "rsc1_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0" [ style = dashed] "rsc1_stopped_0" -> "rsc1_post_notify_stop_0" [ style = dashed] "rsc1_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0" [ style = dashed] "rsc1_start_0" -> "rsc1_promote_0" [ style = bold] "rsc1_running_0" -> "rsc1_promote_0" [ style = bold] "rsc1_confirmed-post_notify_start_0" -> "rsc1_promote_0" [ style = bold] "rsc1_confirmed-pre_notify_promote_0" -> "rsc1_promote_0" [ style = bold] "child_rsc1:2_promote_0 node1" -> "rsc1_promoted_0" [ style = bold] "child_rsc1:3_promote_0 node2" -> "rsc1_promoted_0" [ style = bold] "rsc1_pre_notify_promote_0" -> "rsc1_confirmed-pre_notify_promote_0" [ style = bold] "child_rsc1:2_pre_notify_promote_0 node1" -> "rsc1_confirmed-pre_notify_promote_0" [ style = bold] "child_rsc1:3_pre_notify_promote_0 node2" -> "rsc1_confirmed-pre_notify_promote_0" [ style = bold] "child_rsc1:0_pre_notify_promote_0 node1" -> "rsc1_confirmed-pre_notify_promote_0" [ style = bold] "child_rsc1:1_pre_notify_promote_0 node2" -> "rsc1_confirmed-pre_notify_promote_0" [ style = bold] "rsc1_promoted_0" -> "rsc1_post_notify_promote_0" [ style = bold] "rsc1_post_notify_promote_0" -> "rsc1_confirmed-post_notify_promote_0" [ style = bold] "child_rsc1:2_post_notify_promote_0 node1" -> "rsc1_confirmed-post_notify_promote_0" [ style = bold] "child_rsc1:3_post_notify_promote_0 node2" -> "rsc1_confirmed-post_notify_promote_0" [ style = bold] "child_rsc1:0_post_notify_promote_0 node1" -> "rsc1_confirmed-post_notify_promote_0" [ style = bold] "child_rsc1:1_post_notify_promote_0 node2" -> "rsc1_confirmed-post_notify_promote_0" [ style = bold] "rsc1_confirmed-pre_notify_demote_0" -> "rsc1_demote_0" [ style = dashed] "rsc1_demote_0" -> "rsc1_demoted_0" [ style = dashed] "rsc1_pre_notify_demote_0" -> "rsc1_confirmed-pre_notify_demote_0" [ style = dashed] "rsc1_demoted_0" -> "rsc1_post_notify_demote_0" [ style = dashed] "rsc1_post_notify_demote_0" -> "rsc1_confirmed-post_notify_demote_0" [ style = dashed] "rsc1_post_notify_start_0" -> "child_rsc1:2_post_notify_start_0 node1" [ style = bold] "rsc1_pre_notify_promote_0" -> "child_rsc1:2_pre_notify_promote_0 node1" [ style = bold] "rsc1_post_notify_promote_0" -> "child_rsc1:2_post_notify_promote_0 node1" [ style = bold] "rsc1_post_notify_start_0" -> "child_rsc1:3_post_notify_start_0 node2" [ style = bold] "rsc1_pre_notify_promote_0" -> "child_rsc1:3_pre_notify_promote_0 node2" [ style = bold] "rsc1_post_notify_promote_0" -> "child_rsc1:3_post_notify_promote_0 node2" [ style = bold] "rsc1_post_notify_start_0" -> "child_rsc1:0_post_notify_start_0 node1" [ style = bold] "rsc1_pre_notify_promote_0" -> "child_rsc1:0_pre_notify_promote_0 node1" [ style = bold] "rsc1_post_notify_promote_0" -> "child_rsc1:0_post_notify_promote_0 node1" [ style = bold] "rsc1_post_notify_start_0" -> "child_rsc1:1_post_notify_start_0 node2" [ style = bold] "rsc1_pre_notify_promote_0" -> "child_rsc1:1_pre_notify_promote_0 node2" [ style = bold] "rsc1_post_notify_promote_0" -> "child_rsc1:1_post_notify_promote_0 node2" [ style = bold] } diff --git a/crm/pengine/testcases/master-10.exp b/crm/pengine/testcases/master-10.exp index 9ef15f376b..baf7d8ff80 100644 --- a/crm/pengine/testcases/master-10.exp +++ b/crm/pengine/testcases/master-10.exp @@ -1,677 +1,677 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/crm/pengine/testcases/master-2.dot b/crm/pengine/testcases/master-2.dot index 3eb12dedfa..fa6fbb4720 100644 --- a/crm/pengine/testcases/master-2.dot +++ b/crm/pengine/testcases/master-2.dot @@ -1,138 +1,139 @@ digraph "g" { size = "30,30" "probe_complete" [ style=bold color="green" fontcolor="orange" ] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_promote_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_promote_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_pre_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_confirmed-pre_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_post_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_confirmed-post_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_promote_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_promoted_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_pre_notify_promote_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-pre_notify_promote_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_post_notify_promote_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-post_notify_promote_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_demote_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_demoted_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_pre_notify_demote_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_confirmed-pre_notify_demote_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_post_notify_demote_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_confirmed-post_notify_demote_0" [ style="dashed" color="blue" fontcolor="orange" ] "child_rsc1:2_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_pre_notify_promote_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_post_notify_promote_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_post_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_pre_notify_promote_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_post_notify_promote_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_pre_notify_promote_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_post_notify_promote_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_post_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_pre_notify_promote_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_post_notify_promote_0 node2" [ style=bold color="green" fontcolor="black" ] "probe_complete node1" -> "probe_complete" [ style = bold] "probe_complete node2" -> "probe_complete" [ style = bold] "child_rsc1:0_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1:2_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1:3_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1:4_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:2_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:3_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc1:4_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1_start_0" -> "child_rsc1:2_start_0 node1" [ style = bold] "child_rsc1:2_start_0 node1" -> "child_rsc1:2_promote_0 node1" [ style = bold] "rsc1_promote_0" -> "child_rsc1:2_promote_0 node1" [ style = bold] "rsc1_start_0" -> "child_rsc1:3_start_0 node2" [ style = bold] "child_rsc1:3_start_0 node2" -> "child_rsc1:3_promote_0 node2" [ style = bold] "rsc1_promote_0" -> "child_rsc1:3_promote_0 node2" [ style = bold] "rsc1_start_0" -> "child_rsc1:0_start_0 node1" [ style = bold] "rsc1_start_0" -> "child_rsc1:1_start_0 node2" [ style = bold] "probe_complete" -> "rsc1_start_0" [ style = bold] "rsc1_confirmed-pre_notify_start_0" -> "rsc1_start_0" [ style = bold] "rsc1_stop_0" -> "rsc1_start_0" [ style = dashed] "rsc1_stopped_0" -> "rsc1_start_0" [ style = dashed] "rsc1_confirmed-post_notify_stop_0" -> "rsc1_start_0" [ style = dashed] "rsc1_demoted_0" -> "rsc1_start_0" [ style = dashed] "child_rsc1:2_start_0 node1" -> "rsc1_running_0" [ style = bold] "child_rsc1:3_start_0 node2" -> "rsc1_running_0" [ style = bold] "child_rsc1:0_start_0 node1" -> "rsc1_running_0" [ style = bold] "child_rsc1:1_start_0 node2" -> "rsc1_running_0" [ style = bold] "rsc1_start_0" -> "rsc1_running_0" [ style = bold] +"rsc1_confirmed-post_notify_stop_0" -> "rsc1_pre_notify_start_0" [ style = dashed] "rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold] "rsc1_running_0" -> "rsc1_post_notify_start_0" [ style = bold] "rsc1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "child_rsc1:2_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "child_rsc1:3_post_notify_start_0 node2" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "child_rsc1:0_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "child_rsc1:1_post_notify_start_0 node2" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "rsc1_confirmed-pre_notify_stop_0" -> "rsc1_stop_0" [ style = dashed] "rsc1_confirmed-post_notify_demote_0" -> "rsc1_stop_0" [ style = dashed] "rsc1_demote_0" -> "rsc1_stop_0" [ style = dashed] "rsc1_demoted_0" -> "rsc1_stop_0" [ style = dashed] "rsc1_stop_0" -> "rsc1_stopped_0" [ style = dashed] "rsc1_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0" [ style = dashed] "rsc1_stopped_0" -> "rsc1_post_notify_stop_0" [ style = dashed] "rsc1_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0" [ style = dashed] "rsc1_start_0" -> "rsc1_promote_0" [ style = bold] "rsc1_running_0" -> "rsc1_promote_0" [ style = bold] "rsc1_confirmed-post_notify_start_0" -> "rsc1_promote_0" [ style = bold] "rsc1_confirmed-pre_notify_promote_0" -> "rsc1_promote_0" [ style = bold] "child_rsc1:2_promote_0 node1" -> "rsc1_promoted_0" [ style = bold] "child_rsc1:3_promote_0 node2" -> "rsc1_promoted_0" [ style = bold] "rsc1_pre_notify_promote_0" -> "rsc1_confirmed-pre_notify_promote_0" [ style = bold] "child_rsc1:2_pre_notify_promote_0 node1" -> "rsc1_confirmed-pre_notify_promote_0" [ style = bold] "child_rsc1:3_pre_notify_promote_0 node2" -> "rsc1_confirmed-pre_notify_promote_0" [ style = bold] "child_rsc1:0_pre_notify_promote_0 node1" -> "rsc1_confirmed-pre_notify_promote_0" [ style = bold] "child_rsc1:1_pre_notify_promote_0 node2" -> "rsc1_confirmed-pre_notify_promote_0" [ style = bold] "rsc1_promoted_0" -> "rsc1_post_notify_promote_0" [ style = bold] "rsc1_post_notify_promote_0" -> "rsc1_confirmed-post_notify_promote_0" [ style = bold] "child_rsc1:2_post_notify_promote_0 node1" -> "rsc1_confirmed-post_notify_promote_0" [ style = bold] "child_rsc1:3_post_notify_promote_0 node2" -> "rsc1_confirmed-post_notify_promote_0" [ style = bold] "child_rsc1:0_post_notify_promote_0 node1" -> "rsc1_confirmed-post_notify_promote_0" [ style = bold] "child_rsc1:1_post_notify_promote_0 node2" -> "rsc1_confirmed-post_notify_promote_0" [ style = bold] "rsc1_confirmed-pre_notify_demote_0" -> "rsc1_demote_0" [ style = dashed] "rsc1_demote_0" -> "rsc1_demoted_0" [ style = dashed] "rsc1_pre_notify_demote_0" -> "rsc1_confirmed-pre_notify_demote_0" [ style = dashed] "rsc1_demoted_0" -> "rsc1_post_notify_demote_0" [ style = dashed] "rsc1_post_notify_demote_0" -> "rsc1_confirmed-post_notify_demote_0" [ style = dashed] "rsc1_post_notify_start_0" -> "child_rsc1:2_post_notify_start_0 node1" [ style = bold] "rsc1_pre_notify_promote_0" -> "child_rsc1:2_pre_notify_promote_0 node1" [ style = bold] "rsc1_post_notify_promote_0" -> "child_rsc1:2_post_notify_promote_0 node1" [ style = bold] "rsc1_post_notify_start_0" -> "child_rsc1:3_post_notify_start_0 node2" [ style = bold] "rsc1_pre_notify_promote_0" -> "child_rsc1:3_pre_notify_promote_0 node2" [ style = bold] "rsc1_post_notify_promote_0" -> "child_rsc1:3_post_notify_promote_0 node2" [ style = bold] "rsc1_post_notify_start_0" -> "child_rsc1:0_post_notify_start_0 node1" [ style = bold] "rsc1_pre_notify_promote_0" -> "child_rsc1:0_pre_notify_promote_0 node1" [ style = bold] "rsc1_post_notify_promote_0" -> "child_rsc1:0_post_notify_promote_0 node1" [ style = bold] "rsc1_post_notify_start_0" -> "child_rsc1:1_post_notify_start_0 node2" [ style = bold] "rsc1_pre_notify_promote_0" -> "child_rsc1:1_pre_notify_promote_0 node2" [ style = bold] "rsc1_post_notify_promote_0" -> "child_rsc1:1_post_notify_promote_0 node2" [ style = bold] } diff --git a/crm/pengine/testcases/master-2.exp b/crm/pengine/testcases/master-2.exp index 7a4164c5ef..5f24e556f9 100644 --- a/crm/pengine/testcases/master-2.exp +++ b/crm/pengine/testcases/master-2.exp @@ -1,595 +1,595 @@ - + - + - + - + diff --git a/crm/pengine/testcases/notify-1.dot b/crm/pengine/testcases/notify-1.dot index f2503d1a49..4be91bd2fc 100644 --- a/crm/pengine/testcases/notify-1.dot +++ b/crm/pengine/testcases/notify-1.dot @@ -1,93 +1,95 @@ digraph "g" { size = "30,30" "probe_complete" [ style=bold color="green" fontcolor="orange" ] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "child_rsc1:0_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "child_rsc1:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_pre_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_confirmed-pre_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_post_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_confirmed-post_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "child_rsc2:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_running_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_pre_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_confirmed-pre_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_post_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_confirmed-post_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_confirmed-post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "child_rsc1:0_pre_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_pre_notify_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "child_rsc1:0_post_notify_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "child_rsc1:1_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node1" -> "probe_complete" [ style = bold] "child_rsc1:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1_stop_0" -> "child_rsc1:0_stop_0 node1" [ style = dashed] "child_rsc1:0_stop_0 node1" -> "child_rsc1:0_start_0 node1" [ style = dashed] "rsc1_start_0" -> "child_rsc1:0_start_0 node1" [ style = dashed] "rsc1_start_0" -> "child_rsc1:1_start_0 node1" [ style = bold] "probe_complete" -> "rsc1_start_0" [ style = bold] "rsc1_confirmed-pre_notify_start_0" -> "rsc1_start_0" [ style = bold] "rsc1_stop_0" -> "rsc1_start_0" [ style = dashed] "rsc1_stopped_0" -> "rsc1_start_0" [ style = dashed] "rsc1_confirmed-post_notify_stop_0" -> "rsc1_start_0" [ style = dashed] "child_rsc1:0_start_0 node1" -> "rsc1_running_0" [ style = dashed] "child_rsc1:1_start_0 node1" -> "rsc1_running_0" [ style = bold] "rsc1_start_0" -> "rsc1_running_0" [ style = bold] +"rsc1_confirmed-post_notify_stop_0" -> "rsc1_pre_notify_start_0" [ style = dashed] "rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold] "child_rsc1:0_pre_notify_start_0 node1" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold] "rsc1_running_0" -> "rsc1_post_notify_start_0" [ style = bold] "rsc1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "child_rsc1:0_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "child_rsc1:1_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "rsc1_confirmed-pre_notify_stop_0" -> "rsc1_stop_0" [ style = dashed] "rsc1_stop_0" -> "rsc1_stopped_0" [ style = dashed] "child_rsc1:0_stop_0 node1" -> "rsc1_stopped_0" [ style = dashed] "rsc1_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0" [ style = dashed] "child_rsc1:0_pre_notify_stop_0 node1" -> "rsc1_confirmed-pre_notify_stop_0" [ style = dashed] "rsc1_stopped_0" -> "rsc1_post_notify_stop_0" [ style = dashed] "rsc1_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0" [ style = dashed] "child_rsc1:0_post_notify_stop_0 node1" -> "rsc1_confirmed-post_notify_stop_0" [ style = dashed] "rsc2_stop_0" -> "child_rsc2:0_stop_0 node1" [ style = bold] "probe_complete" -> "rsc2_start_0" [ style = dashed] "rsc2_confirmed-pre_notify_start_0" -> "rsc2_start_0" [ style = dashed] "rsc2_confirmed-post_notify_stop_0" -> "rsc2_start_0" [ style = dashed] "rsc2_stop_0" -> "rsc2_start_0" [ style = dashed] "rsc2_stopped_0" -> "rsc2_start_0" [ style = dashed] "rsc2_start_0" -> "rsc2_running_0" [ style = dashed] +"rsc2_confirmed-post_notify_stop_0" -> "rsc2_pre_notify_start_0" [ style = dashed] "rsc2_pre_notify_start_0" -> "rsc2_confirmed-pre_notify_start_0" [ style = dashed] "rsc2_running_0" -> "rsc2_post_notify_start_0" [ style = dashed] "rsc2_post_notify_start_0" -> "rsc2_confirmed-post_notify_start_0" [ style = dashed] "rsc2_confirmed-pre_notify_stop_0" -> "rsc2_stop_0" [ style = bold] "child_rsc2:0_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "rsc2_stop_0" -> "rsc2_stopped_0" [ style = bold] "rsc2_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold] "child_rsc2:0_pre_notify_stop_0 node1" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold] "rsc2_stopped_0" -> "rsc2_post_notify_stop_0" [ style = bold] "rsc2_post_notify_stop_0" -> "rsc2_confirmed-post_notify_stop_0" [ style = bold] "rsc1_pre_notify_start_0" -> "child_rsc1:0_pre_notify_start_0 node1" [ style = bold] "rsc1_post_notify_start_0" -> "child_rsc1:0_post_notify_start_0 node1" [ style = bold] "rsc1_pre_notify_stop_0" -> "child_rsc1:0_pre_notify_stop_0 node1" [ style = dashed] "rsc1_post_notify_stop_0" -> "child_rsc1:0_post_notify_stop_0 node1" [ style = dashed] "rsc1_post_notify_start_0" -> "child_rsc1:1_post_notify_start_0 node1" [ style = bold] "rsc2_pre_notify_stop_0" -> "child_rsc2:0_pre_notify_stop_0 node1" [ style = bold] } diff --git a/crm/pengine/testcases/notify-1.exp b/crm/pengine/testcases/notify-1.exp index b76ad9d28b..cd4f9c3736 100644 --- a/crm/pengine/testcases/notify-1.exp +++ b/crm/pengine/testcases/notify-1.exp @@ -1,283 +1,283 @@ - + - + diff --git a/crm/pengine/testcases/notify-2.dot b/crm/pengine/testcases/notify-2.dot index f2503d1a49..4be91bd2fc 100644 --- a/crm/pengine/testcases/notify-2.dot +++ b/crm/pengine/testcases/notify-2.dot @@ -1,93 +1,95 @@ digraph "g" { size = "30,30" "probe_complete" [ style=bold color="green" fontcolor="orange" ] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "child_rsc1:0_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "child_rsc1:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_stopped_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_pre_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_confirmed-pre_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_post_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc1_confirmed-post_notify_stop_0" [ style="dashed" color="blue" fontcolor="orange" ] "child_rsc2:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_running_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_pre_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_confirmed-pre_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_post_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_confirmed-post_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_confirmed-post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "child_rsc1:0_pre_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_pre_notify_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "child_rsc1:0_post_notify_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "child_rsc1:1_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node1" -> "probe_complete" [ style = bold] "child_rsc1:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "rsc1_stop_0" -> "child_rsc1:0_stop_0 node1" [ style = dashed] "child_rsc1:0_stop_0 node1" -> "child_rsc1:0_start_0 node1" [ style = dashed] "rsc1_start_0" -> "child_rsc1:0_start_0 node1" [ style = dashed] "rsc1_start_0" -> "child_rsc1:1_start_0 node1" [ style = bold] "probe_complete" -> "rsc1_start_0" [ style = bold] "rsc1_confirmed-pre_notify_start_0" -> "rsc1_start_0" [ style = bold] "rsc1_stop_0" -> "rsc1_start_0" [ style = dashed] "rsc1_stopped_0" -> "rsc1_start_0" [ style = dashed] "rsc1_confirmed-post_notify_stop_0" -> "rsc1_start_0" [ style = dashed] "child_rsc1:0_start_0 node1" -> "rsc1_running_0" [ style = dashed] "child_rsc1:1_start_0 node1" -> "rsc1_running_0" [ style = bold] "rsc1_start_0" -> "rsc1_running_0" [ style = bold] +"rsc1_confirmed-post_notify_stop_0" -> "rsc1_pre_notify_start_0" [ style = dashed] "rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold] "child_rsc1:0_pre_notify_start_0 node1" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold] "rsc1_running_0" -> "rsc1_post_notify_start_0" [ style = bold] "rsc1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "child_rsc1:0_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "child_rsc1:1_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "rsc1_confirmed-pre_notify_stop_0" -> "rsc1_stop_0" [ style = dashed] "rsc1_stop_0" -> "rsc1_stopped_0" [ style = dashed] "child_rsc1:0_stop_0 node1" -> "rsc1_stopped_0" [ style = dashed] "rsc1_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0" [ style = dashed] "child_rsc1:0_pre_notify_stop_0 node1" -> "rsc1_confirmed-pre_notify_stop_0" [ style = dashed] "rsc1_stopped_0" -> "rsc1_post_notify_stop_0" [ style = dashed] "rsc1_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0" [ style = dashed] "child_rsc1:0_post_notify_stop_0 node1" -> "rsc1_confirmed-post_notify_stop_0" [ style = dashed] "rsc2_stop_0" -> "child_rsc2:0_stop_0 node1" [ style = bold] "probe_complete" -> "rsc2_start_0" [ style = dashed] "rsc2_confirmed-pre_notify_start_0" -> "rsc2_start_0" [ style = dashed] "rsc2_confirmed-post_notify_stop_0" -> "rsc2_start_0" [ style = dashed] "rsc2_stop_0" -> "rsc2_start_0" [ style = dashed] "rsc2_stopped_0" -> "rsc2_start_0" [ style = dashed] "rsc2_start_0" -> "rsc2_running_0" [ style = dashed] +"rsc2_confirmed-post_notify_stop_0" -> "rsc2_pre_notify_start_0" [ style = dashed] "rsc2_pre_notify_start_0" -> "rsc2_confirmed-pre_notify_start_0" [ style = dashed] "rsc2_running_0" -> "rsc2_post_notify_start_0" [ style = dashed] "rsc2_post_notify_start_0" -> "rsc2_confirmed-post_notify_start_0" [ style = dashed] "rsc2_confirmed-pre_notify_stop_0" -> "rsc2_stop_0" [ style = bold] "child_rsc2:0_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "rsc2_stop_0" -> "rsc2_stopped_0" [ style = bold] "rsc2_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold] "child_rsc2:0_pre_notify_stop_0 node1" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold] "rsc2_stopped_0" -> "rsc2_post_notify_stop_0" [ style = bold] "rsc2_post_notify_stop_0" -> "rsc2_confirmed-post_notify_stop_0" [ style = bold] "rsc1_pre_notify_start_0" -> "child_rsc1:0_pre_notify_start_0 node1" [ style = bold] "rsc1_post_notify_start_0" -> "child_rsc1:0_post_notify_start_0 node1" [ style = bold] "rsc1_pre_notify_stop_0" -> "child_rsc1:0_pre_notify_stop_0 node1" [ style = dashed] "rsc1_post_notify_stop_0" -> "child_rsc1:0_post_notify_stop_0 node1" [ style = dashed] "rsc1_post_notify_start_0" -> "child_rsc1:1_post_notify_start_0 node1" [ style = bold] "rsc2_pre_notify_stop_0" -> "child_rsc2:0_pre_notify_stop_0 node1" [ style = bold] } diff --git a/crm/pengine/testcases/notify-2.exp b/crm/pengine/testcases/notify-2.exp index b76ad9d28b..cd4f9c3736 100644 --- a/crm/pengine/testcases/notify-2.exp +++ b/crm/pengine/testcases/notify-2.exp @@ -1,283 +1,283 @@ - + - + diff --git a/crm/pengine/testcases/notify-3.dot b/crm/pengine/testcases/notify-3.dot index 4edac8e89f..7358114214 100644 --- a/crm/pengine/testcases/notify-3.dot +++ b/crm/pengine/testcases/notify-3.dot @@ -1,108 +1,110 @@ digraph "g" { size = "30,30" "probe_complete" [ style=bold color="green" fontcolor="orange" ] "probe_complete node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_stop_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "child_rsc1:0_start_0 node1" [ style="dashed" color="blue" fontcolor="black" ] "child_rsc1:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-post_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "child_rsc2:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_running_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_pre_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_confirmed-pre_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_post_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_confirmed-post_notify_start_0" [ style="dashed" color="blue" fontcolor="orange" ] "rsc2_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_confirmed-post_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "child_rsc1:0_pre_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_post_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_pre_notify_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "probe_complete node1" -> "probe_complete" [ style = bold] "probe_complete node2" -> "probe_complete" [ style = bold] "child_rsc1:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc2:1_monitor_0 node1" -> "probe_complete node1" [ style = bold] "child_rsc1:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc2:0_monitor_0 node2" -> "probe_complete node2" [ style = bold] "child_rsc2:1_monitor_0 node2" -> "probe_complete node2" [ style = bold] "rsc1_stop_0" -> "child_rsc1:0_stop_0 node1" [ style = dashed] "child_rsc1:0_stop_0 node1" -> "child_rsc1:0_start_0 node1" [ style = dashed] "rsc1_start_0" -> "child_rsc1:0_start_0 node1" [ style = dashed] "rsc1_stop_0" -> "child_rsc1:1_stop_0 node2" [ style = bold] "child_rsc1:1_stop_0 node2" -> "child_rsc1:1_start_0 node1" [ style = bold] "rsc1_start_0" -> "child_rsc1:1_start_0 node1" [ style = bold] "probe_complete" -> "rsc1_start_0" [ style = bold] "rsc1_confirmed-pre_notify_start_0" -> "rsc1_start_0" [ style = bold] "rsc1_stop_0" -> "rsc1_start_0" [ style = bold] "rsc1_stopped_0" -> "rsc1_start_0" [ style = bold] "rsc1_confirmed-post_notify_stop_0" -> "rsc1_start_0" [ style = bold] "child_rsc1:0_start_0 node1" -> "rsc1_running_0" [ style = dashed] "child_rsc1:1_start_0 node1" -> "rsc1_running_0" [ style = bold] "rsc1_start_0" -> "rsc1_running_0" [ style = bold] +"rsc1_confirmed-post_notify_stop_0" -> "rsc1_pre_notify_start_0" [ style = bold] "rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold] "child_rsc1:0_pre_notify_start_0 node1" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold] "rsc1_running_0" -> "rsc1_post_notify_start_0" [ style = bold] "rsc1_post_notify_start_0" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "child_rsc1:0_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "child_rsc1:1_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_start_0" [ style = bold] "rsc1_confirmed-pre_notify_stop_0" -> "rsc1_stop_0" [ style = bold] "child_rsc1:0_stop_0 node1" -> "rsc1_stopped_0" [ style = dashed] "child_rsc1:1_stop_0 node2" -> "rsc1_stopped_0" [ style = bold] "rsc1_stop_0" -> "rsc1_stopped_0" [ style = bold] "rsc1_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0" [ style = bold] "child_rsc1:0_pre_notify_stop_0 node1" -> "rsc1_confirmed-pre_notify_stop_0" [ style = bold] "child_rsc1:1_pre_notify_stop_0 node2" -> "rsc1_confirmed-pre_notify_stop_0" [ style = bold] "rsc1_stopped_0" -> "rsc1_post_notify_stop_0" [ style = bold] "rsc1_post_notify_stop_0" -> "rsc1_confirmed-post_notify_stop_0" [ style = bold] "child_rsc1:0_post_notify_stop_0 node1" -> "rsc1_confirmed-post_notify_stop_0" [ style = bold] "rsc2_stop_0" -> "child_rsc2:0_stop_0 node1" [ style = bold] "probe_complete" -> "rsc2_start_0" [ style = dashed] "rsc2_confirmed-pre_notify_start_0" -> "rsc2_start_0" [ style = dashed] "rsc2_confirmed-post_notify_stop_0" -> "rsc2_start_0" [ style = dashed] "rsc2_stop_0" -> "rsc2_start_0" [ style = dashed] "rsc2_stopped_0" -> "rsc2_start_0" [ style = dashed] "rsc2_start_0" -> "rsc2_running_0" [ style = dashed] +"rsc2_confirmed-post_notify_stop_0" -> "rsc2_pre_notify_start_0" [ style = dashed] "rsc2_pre_notify_start_0" -> "rsc2_confirmed-pre_notify_start_0" [ style = dashed] "rsc2_running_0" -> "rsc2_post_notify_start_0" [ style = dashed] "rsc2_post_notify_start_0" -> "rsc2_confirmed-post_notify_start_0" [ style = dashed] "rsc2_confirmed-pre_notify_stop_0" -> "rsc2_stop_0" [ style = bold] "child_rsc2:0_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "rsc2_stop_0" -> "rsc2_stopped_0" [ style = bold] "rsc2_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold] "child_rsc2:0_pre_notify_stop_0 node1" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold] "rsc2_stopped_0" -> "rsc2_post_notify_stop_0" [ style = bold] "rsc2_post_notify_stop_0" -> "rsc2_confirmed-post_notify_stop_0" [ style = bold] "rsc1_pre_notify_start_0" -> "child_rsc1:0_pre_notify_start_0 node1" [ style = bold] "rsc1_post_notify_start_0" -> "child_rsc1:0_post_notify_start_0 node1" [ style = bold] "rsc1_pre_notify_stop_0" -> "child_rsc1:0_pre_notify_stop_0 node1" [ style = bold] "rsc1_post_notify_stop_0" -> "child_rsc1:0_post_notify_stop_0 node1" [ style = bold] "rsc1_post_notify_start_0" -> "child_rsc1:1_post_notify_start_0 node1" [ style = bold] "rsc1_pre_notify_stop_0" -> "child_rsc1:1_pre_notify_stop_0 node2" [ style = bold] "rsc2_pre_notify_stop_0" -> "child_rsc2:0_pre_notify_stop_0 node1" [ style = bold] } diff --git a/crm/pengine/testcases/notify-3.exp b/crm/pengine/testcases/notify-3.exp index 921611399d..4d00c687b5 100644 --- a/crm/pengine/testcases/notify-3.exp +++ b/crm/pengine/testcases/notify-3.exp @@ -1,475 +1,479 @@ - + + + + + - + - + - + - +