diff --git a/pengine/test10/594.dot b/pengine/test10/594.dot index 853f468846..648a8f6e8c 100644 --- a/pengine/test10/594.dot +++ b/pengine/test10/594.dot @@ -1,46 +1,45 @@ digraph "g" { "DcIPaddr_monitor_0 hadev1" -> "DcIPaddr_start_0 hadev1" [ style = bold] "DcIPaddr_monitor_0 hadev1" -> "DcIPaddr_stop_0 hadev2" [ style = bold] "DcIPaddr_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_5000 hadev1" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_start_0 hadev1" -> "DcIPaddr_monitor_5000 hadev1" [ style = bold] "DcIPaddr_start_0 hadev1" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_stop_0 hadev2" -> "DcIPaddr_start_0 hadev1" [ style = bold] "DcIPaddr_stop_0 hadev2" -> "all_stopped" [ style = bold] "DcIPaddr_stop_0 hadev2" -> "do_shutdown hadev2" [ style = bold] "DcIPaddr_stop_0 hadev2" [ style=bold color="green" fontcolor="black" ] "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:0_stop_0 hadev2" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:2_stop_0 hadev1" [ style = bold] "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] -"child_DoFencing:0_monitor_0 hadev1" -> "child_DoFencing:0_stop_0 hadev2" [ style = bold] "child_DoFencing:0_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_stop_0 hadev2" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:0_stop_0 hadev2" -> "all_stopped" [ style = bold] "child_DoFencing:0_stop_0 hadev2" -> "do_shutdown hadev2" [ style = bold] "child_DoFencing:0_stop_0 hadev2" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 hadev2" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_stop_0 hadev1" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:2_stop_0 hadev1" -> "all_stopped" [ style = bold] "child_DoFencing:2_stop_0 hadev1" [ style=bold color="green" fontcolor="black" ] "do_shutdown hadev2" [ style=bold color="green" fontcolor="black" ] "rsc_hadev2_monitor_0 hadev1" -> "rsc_hadev2_start_0 hadev1" [ style = bold] "rsc_hadev2_monitor_0 hadev1" -> "rsc_hadev2_stop_0 hadev2" [ style = bold] "rsc_hadev2_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ] "rsc_hadev2_monitor_5000 hadev1" [ style=bold color="green" fontcolor="black" ] "rsc_hadev2_start_0 hadev1" -> "rsc_hadev2_monitor_5000 hadev1" [ style = bold] "rsc_hadev2_start_0 hadev1" [ style=bold color="green" fontcolor="black" ] "rsc_hadev2_stop_0 hadev2" -> "all_stopped" [ style = bold] "rsc_hadev2_stop_0 hadev2" -> "do_shutdown hadev2" [ style = bold] "rsc_hadev2_stop_0 hadev2" -> "rsc_hadev2_start_0 hadev1" [ style = bold] "rsc_hadev2_stop_0 hadev2" [ style=bold color="green" fontcolor="black" ] "rsc_hadev3_monitor_0 hadev2" [ style=bold color="green" fontcolor="black" ] "stonith 'reboot' hadev3" -> "stonith_complete" [ style = bold] "stonith 'reboot' hadev3" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "DcIPaddr_start_0 hadev1" [ style = bold] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "rsc_hadev2_start_0 hadev1" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/594.exp b/pengine/test10/594.exp index 400a5e73e4..a0b9fe1f83 100644 --- a/pengine/test10/594.exp +++ b/pengine/test10/594.exp @@ -1,260 +1,257 @@ - - - diff --git a/pengine/test10/662.dot b/pengine/test10/662.dot index b0c45a63f2..3287044e04 100644 --- a/pengine/test10/662.dot +++ b/pengine/test10/662.dot @@ -1,50 +1,48 @@ digraph "g" { "DcIPaddr_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ] "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n02" [ style = bold] "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] -"child_DoFencing:0_monitor_0 c001n04" -> "child_DoFencing:0_stop_0 c001n02" [ style = bold] "child_DoFencing:0_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ] -"child_DoFencing:0_monitor_0 c001n09" -> "child_DoFencing:0_stop_0 c001n02" [ style = bold] "child_DoFencing:0_monitor_0 c001n09" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:0_stop_0 c001n02" -> "all_stopped" [ style = bold] "child_DoFencing:0_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "child_DoFencing:0_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 c001n09" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ] "do_shutdown c001n02" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n03" -> "rsc_c001n02_start_0 c001n03" [ style = bold] "rsc_c001n02_monitor_0 c001n03" -> "rsc_c001n02_stop_0 c001n02" [ style = bold] "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n04" -> "rsc_c001n02_start_0 c001n03" [ style = bold] "rsc_c001n02_monitor_0 c001n04" -> "rsc_c001n02_stop_0 c001n02" [ style = bold] "rsc_c001n02_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n09" -> "rsc_c001n02_start_0 c001n03" [ style = bold] "rsc_c001n02_monitor_0 c001n09" -> "rsc_c001n02_stop_0 c001n02" [ style = bold] "rsc_c001n02_monitor_0 c001n09" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_start_0 c001n03" -> "rsc_c001n02_monitor_5000 c001n03" [ style = bold] "rsc_c001n02_start_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_stop_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n02_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n03" [ style = bold] "rsc_c001n02_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_monitor_0 c001n09" [ style=bold color="green" fontcolor="black" ] "rsc_c001n04_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n04_monitor_0 c001n09" [ style=bold color="green" fontcolor="black" ] "rsc_c001n09_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "rsc_c001n09_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n09_monitor_0 c001n04" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/662.exp b/pengine/test10/662.exp index d05f4d3398..4d95ef60b6 100644 --- a/pengine/test10/662.exp +++ b/pengine/test10/662.exp @@ -1,339 +1,333 @@ - - - - - - diff --git a/pengine/test10/829.dot b/pengine/test10/829.dot index 8b95e2d39f..a0ea381eec 100644 --- a/pengine/test10/829.dot +++ b/pengine/test10/829.dot @@ -1,48 +1,47 @@ digraph "g" { "DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n02" [ style = bold] "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] -"child_DoFencing:0_monitor_0 c001n01" -> "child_DoFencing:0_stop_0 c001n02" [ style = bold] "child_DoFencing:0_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:0_stop_0 c001n02" -> "all_stopped" [ style = bold] "child_DoFencing:0_stop_0 c001n02" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:1_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n01" -> "rsc_c001n02_start_0 c001n01" [ style = bold] "rsc_c001n02_monitor_0 c001n01" -> "rsc_c001n02_stop_0 c001n02" [ style = bold] "rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n03" -> "rsc_c001n02_start_0 c001n01" [ style = bold] "rsc_c001n02_monitor_0 c001n03" -> "rsc_c001n02_stop_0 c001n02" [ style = bold] "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n08" -> "rsc_c001n02_start_0 c001n01" [ style = bold] "rsc_c001n02_monitor_0 c001n08" -> "rsc_c001n02_stop_0 c001n02" [ style = bold] "rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_start_0 c001n01" -> "rsc_c001n02_monitor_5000 c001n01" [ style = bold] "rsc_c001n02_start_0 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_stop_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n02_stop_0 c001n02" -> "rsc_c001n02_start_0 c001n01" [ style = bold] "rsc_c001n02_stop_0 c001n02" [ style=bold color="green" fontcolor="orange" ] "rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "stonith 'reboot' c001n02" -> "DoFencing_stop_0" [ style = bold] "stonith 'reboot' c001n02" -> "child_DoFencing:0_stop_0 c001n02" [ style = bold] "stonith 'reboot' c001n02" -> "rsc_c001n02_stop_0 c001n02" [ style = bold] "stonith 'reboot' c001n02" -> "stonith_complete" [ style = bold] "stonith 'reboot' c001n02" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "rsc_c001n02_start_0 c001n01" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/829.exp b/pengine/test10/829.exp index d1f85faa20..a1617b9dfb 100644 --- a/pengine/test10/829.exp +++ b/pengine/test10/829.exp @@ -1,300 +1,297 @@ - - - diff --git a/pengine/test10/bug-cl-5247.dot b/pengine/test10/bug-cl-5247.dot index decf5c3180..41895a100e 100644 --- a/pengine/test10/bug-cl-5247.dot +++ b/pengine/test10/bug-cl-5247.dot @@ -1,154 +1,151 @@ digraph "g" { "all_stopped" -> "prmStonith1-2_start_0 bl460g8n4" [ style = bold] "all_stopped" -> "prmStonith2-2_start_0 bl460g8n3" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange"] "grpStonith1_running_0" [ style=bold color="green" fontcolor="orange"] "grpStonith1_start_0" -> "grpStonith1_running_0" [ style = bold] "grpStonith1_start_0" -> "prmStonith1-2_start_0 bl460g8n4" [ style = bold] "grpStonith1_start_0" [ style=bold color="green" fontcolor="orange"] "grpStonith1_stop_0" -> "grpStonith1_stopped_0" [ style = bold] "grpStonith1_stop_0" -> "prmStonith1-2_stop_0 bl460g8n4" [ style = bold] "grpStonith1_stop_0" [ style=bold color="green" fontcolor="orange"] "grpStonith1_stopped_0" -> "grpStonith1_start_0" [ style = bold] "grpStonith1_stopped_0" [ style=bold color="green" fontcolor="orange"] "grpStonith2_running_0" [ style=bold color="green" fontcolor="orange"] "grpStonith2_start_0" -> "grpStonith2_running_0" [ style = bold] "grpStonith2_start_0" -> "prmStonith2-2_start_0 bl460g8n3" [ style = bold] "grpStonith2_start_0" [ style=bold color="green" fontcolor="orange"] "grpStonith2_stop_0" -> "grpStonith2_stopped_0" [ style = bold] "grpStonith2_stop_0" -> "prmStonith2-2_stop_0 bl460g8n3" [ style = bold] "grpStonith2_stop_0" [ style=bold color="green" fontcolor="orange"] "grpStonith2_stopped_0" -> "grpStonith2_start_0" [ style = bold] "grpStonith2_stopped_0" [ style=bold color="green" fontcolor="orange"] "master-group_running_0" [ style=bold color="green" fontcolor="orange"] "master-group_start_0" -> "master-group_running_0" [ style = bold] "master-group_start_0" -> "vip-master_start_0 pgsr01" [ style = bold] "master-group_start_0" -> "vip-rep_start_0 pgsr01" [ style = bold] "master-group_start_0" [ style=bold color="green" fontcolor="orange"] "master-group_stop_0" -> "master-group_stopped_0" [ style = bold] "master-group_stop_0" -> "vip-master_stop_0 pgsr02" [ style = bold] "master-group_stop_0" -> "vip-rep_stop_0 pgsr02" [ style = bold] "master-group_stop_0" [ style=bold color="green" fontcolor="orange"] "master-group_stopped_0" -> "master-group_start_0" [ style = bold] "master-group_stopped_0" [ style=bold color="green" fontcolor="orange"] "msPostgresql_confirmed-post_notify_demoted_0" -> "master-group_stop_0" [ style = bold] "msPostgresql_confirmed-post_notify_demoted_0" -> "msPostgresql_pre_notify_stop_0" [ style = bold] "msPostgresql_confirmed-post_notify_demoted_0" -> "pgsql_monitor_9000 pgsr01" [ style = bold] "msPostgresql_confirmed-post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"] "msPostgresql_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "msPostgresql_confirmed-post_notify_stopped_0" -> "pgsql_monitor_9000 pgsr01" [ style = bold] "msPostgresql_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"] "msPostgresql_confirmed-pre_notify_demote_0" -> "msPostgresql_demote_0" [ style = bold] "msPostgresql_confirmed-pre_notify_demote_0" -> "msPostgresql_post_notify_demoted_0" [ style = bold] "msPostgresql_confirmed-pre_notify_demote_0" [ style=bold color="green" fontcolor="orange"] "msPostgresql_confirmed-pre_notify_stop_0" -> "msPostgresql_post_notify_stopped_0" [ style = bold] "msPostgresql_confirmed-pre_notify_stop_0" -> "msPostgresql_stop_0" [ style = bold] "msPostgresql_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"] "msPostgresql_demote_0" -> "msPostgresql_demoted_0" [ style = bold] "msPostgresql_demote_0" -> "pgsql_demote_0 pgsr02" [ style = bold] "msPostgresql_demote_0" [ style=bold color="green" fontcolor="orange"] "msPostgresql_demoted_0" -> "msPostgresql_post_notify_demoted_0" [ style = bold] "msPostgresql_demoted_0" -> "msPostgresql_stop_0" [ style = bold] "msPostgresql_demoted_0" [ style=bold color="green" fontcolor="orange"] "msPostgresql_post_notify_demoted_0" -> "msPostgresql_confirmed-post_notify_demoted_0" [ style = bold] "msPostgresql_post_notify_demoted_0" -> "pgsql_post_notify_demoted_0 pgsr01" [ style = bold] "msPostgresql_post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"] "msPostgresql_post_notify_stopped_0" -> "msPostgresql_confirmed-post_notify_stopped_0" [ style = bold] "msPostgresql_post_notify_stopped_0" -> "pgsql_post_notify_stonith_0 pgsr01" [ style = bold] "msPostgresql_post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"] "msPostgresql_pre_notify_demote_0" -> "msPostgresql_confirmed-pre_notify_demote_0" [ style = bold] "msPostgresql_pre_notify_demote_0" -> "pgsql_pre_notify_demote_0 pgsr01" [ style = bold] "msPostgresql_pre_notify_demote_0" [ style=bold color="green" fontcolor="orange"] "msPostgresql_pre_notify_stop_0" -> "msPostgresql_confirmed-pre_notify_stop_0" [ style = bold] "msPostgresql_pre_notify_stop_0" -> "pgsql_pre_notify_stop_0 pgsr01" [ style = bold] "msPostgresql_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange"] "msPostgresql_stop_0" -> "msPostgresql_stopped_0" [ style = bold] "msPostgresql_stop_0" -> "pgsql_stop_0 pgsr02" [ style = bold] "msPostgresql_stop_0" [ style=bold color="green" fontcolor="orange"] "msPostgresql_stopped_0" -> "msPostgresql_post_notify_stopped_0" [ style = bold] "msPostgresql_stopped_0" [ style=bold color="green" fontcolor="orange"] "pgsql_confirmed-post_notify_stonith_0" -> "all_stopped" [ style = bold] "pgsql_confirmed-post_notify_stonith_0" -> "pgsql_monitor_9000 pgsr01" [ style = bold] "pgsql_confirmed-post_notify_stonith_0" [ style=bold color="green" fontcolor="orange"] "pgsql_demote_0 pgsr02" -> "msPostgresql_demoted_0" [ style = bold] "pgsql_demote_0 pgsr02" -> "pgsql_stop_0 pgsr02" [ style = bold] "pgsql_demote_0 pgsr02" [ style=bold color="green" fontcolor="orange"] "pgsql_monitor_9000 pgsr01" [ style=bold color="green" fontcolor="black"] "pgsql_post_notify_demoted_0 pgsr01" -> "msPostgresql_confirmed-post_notify_demoted_0" [ style = bold] "pgsql_post_notify_demoted_0 pgsr01" [ style=bold color="green" fontcolor="black"] "pgsql_post_notify_stonith_0 pgsr01" -> "msPostgresql_confirmed-post_notify_stopped_0" [ style = bold] "pgsql_post_notify_stonith_0 pgsr01" -> "pgsql_confirmed-post_notify_stonith_0" [ style = bold] "pgsql_post_notify_stonith_0 pgsr01" [ style=bold color="green" fontcolor="black"] "pgsql_post_notify_stonith_0" -> "pgsql_confirmed-post_notify_stonith_0" [ style = bold] "pgsql_post_notify_stonith_0" -> "pgsql_post_notify_stonith_0 pgsr01" [ style = bold] "pgsql_post_notify_stonith_0" [ style=bold color="green" fontcolor="orange"] "pgsql_pre_notify_demote_0 pgsr01" -> "msPostgresql_confirmed-pre_notify_demote_0" [ style = bold] "pgsql_pre_notify_demote_0 pgsr01" [ style=bold color="green" fontcolor="black"] "pgsql_pre_notify_stop_0 pgsr01" -> "msPostgresql_confirmed-pre_notify_stop_0" [ style = bold] "pgsql_pre_notify_stop_0 pgsr01" [ style=bold color="green" fontcolor="black"] "pgsql_stop_0 pgsr02" -> "all_stopped" [ style = bold] "pgsql_stop_0 pgsr02" -> "msPostgresql_stopped_0" [ style = bold] "pgsql_stop_0 pgsr02" [ style=bold color="green" fontcolor="orange"] "pgsr01_monitor_0 bl460g8n4" [ style=bold color="green" fontcolor="black"] -"pgsr02_monitor_0 bl460g8n3" -> "pgsr02_stop_0 bl460g8n4" [ style = bold] "pgsr02_monitor_0 bl460g8n3" [ style=bold color="green" fontcolor="black"] "pgsr02_stop_0 bl460g8n4" -> "all_stopped" [ style = bold] "pgsr02_stop_0 bl460g8n4" -> "prmDB2_stop_0 bl460g8n4" [ style = bold] "pgsr02_stop_0 bl460g8n4" [ style=bold color="green" fontcolor="black"] "prmDB2_stop_0 bl460g8n4" -> "all_stopped" [ style = bold] "prmDB2_stop_0 bl460g8n4" -> "stonith 'off' pgsr02" [ style = bold] "prmDB2_stop_0 bl460g8n4" [ style=bold color="green" fontcolor="black"] "prmStonith1-2_monitor_3600000 bl460g8n4" [ style=bold color="green" fontcolor="black"] "prmStonith1-2_start_0 bl460g8n4" -> "grpStonith1_running_0" [ style = bold] "prmStonith1-2_start_0 bl460g8n4" -> "prmStonith1-2_monitor_3600000 bl460g8n4" [ style = bold] "prmStonith1-2_start_0 bl460g8n4" [ style=bold color="green" fontcolor="black"] "prmStonith1-2_stop_0 bl460g8n4" -> "all_stopped" [ style = bold] "prmStonith1-2_stop_0 bl460g8n4" -> "grpStonith1_stopped_0" [ style = bold] "prmStonith1-2_stop_0 bl460g8n4" -> "prmStonith1-2_start_0 bl460g8n4" [ style = bold] "prmStonith1-2_stop_0 bl460g8n4" [ style=bold color="green" fontcolor="black"] "prmStonith2-2_monitor_3600000 bl460g8n3" [ style=bold color="green" fontcolor="black"] "prmStonith2-2_start_0 bl460g8n3" -> "grpStonith2_running_0" [ style = bold] "prmStonith2-2_start_0 bl460g8n3" -> "prmStonith2-2_monitor_3600000 bl460g8n3" [ style = bold] "prmStonith2-2_start_0 bl460g8n3" [ style=bold color="green" fontcolor="black"] "prmStonith2-2_stop_0 bl460g8n3" -> "all_stopped" [ style = bold] "prmStonith2-2_stop_0 bl460g8n3" -> "grpStonith2_stopped_0" [ style = bold] "prmStonith2-2_stop_0 bl460g8n3" -> "prmStonith2-2_start_0 bl460g8n3" [ style = bold] "prmStonith2-2_stop_0 bl460g8n3" [ style=bold color="green" fontcolor="black"] "stonith 'off' pgsr02" -> "master-group_stop_0" [ style = bold] "stonith 'off' pgsr02" -> "msPostgresql_stop_0" [ style = bold] "stonith 'off' pgsr02" -> "pgsql_demote_0 pgsr02" [ style = bold] "stonith 'off' pgsr02" -> "pgsql_post_notify_stonith_0" [ style = bold] "stonith 'off' pgsr02" -> "pgsql_stop_0 pgsr02" [ style = bold] "stonith 'off' pgsr02" -> "stonith_complete" [ style = bold] "stonith 'off' pgsr02" -> "vip-master_stop_0 pgsr02" [ style = bold] "stonith 'off' pgsr02" -> "vip-rep_stop_0 pgsr02" [ style = bold] "stonith 'off' pgsr02" [ style=bold color="green" fontcolor="orange"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "vip-master_start_0 pgsr01" [ style = bold] "stonith_complete" -> "vip-rep_start_0 pgsr01" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange"] "vip-master_monitor_0 pgsr01" -> "vip-master_start_0 pgsr01" [ style = bold] -"vip-master_monitor_0 pgsr01" -> "vip-master_stop_0 pgsr02" [ style = bold] "vip-master_monitor_0 pgsr01" [ style=bold color="green" fontcolor="black"] "vip-master_monitor_10000 pgsr01" [ style=bold color="green" fontcolor="black"] "vip-master_start_0 pgsr01" -> "master-group_running_0" [ style = bold] "vip-master_start_0 pgsr01" -> "vip-master_monitor_10000 pgsr01" [ style = bold] "vip-master_start_0 pgsr01" -> "vip-rep_start_0 pgsr01" [ style = bold] "vip-master_start_0 pgsr01" [ style=bold color="green" fontcolor="black"] "vip-master_stop_0 pgsr02" -> "all_stopped" [ style = bold] "vip-master_stop_0 pgsr02" -> "master-group_stopped_0" [ style = bold] "vip-master_stop_0 pgsr02" -> "vip-master_start_0 pgsr01" [ style = bold] "vip-master_stop_0 pgsr02" [ style=bold color="green" fontcolor="orange"] "vip-rep_monitor_0 pgsr01" -> "vip-rep_start_0 pgsr01" [ style = bold] -"vip-rep_monitor_0 pgsr01" -> "vip-rep_stop_0 pgsr02" [ style = bold] "vip-rep_monitor_0 pgsr01" [ style=bold color="green" fontcolor="black"] "vip-rep_monitor_10000 pgsr01" [ style=bold color="green" fontcolor="black"] "vip-rep_start_0 pgsr01" -> "master-group_running_0" [ style = bold] "vip-rep_start_0 pgsr01" -> "vip-rep_monitor_10000 pgsr01" [ style = bold] "vip-rep_start_0 pgsr01" [ style=bold color="green" fontcolor="black"] "vip-rep_stop_0 pgsr02" -> "all_stopped" [ style = bold] "vip-rep_stop_0 pgsr02" -> "master-group_stopped_0" [ style = bold] "vip-rep_stop_0 pgsr02" -> "vip-master_stop_0 pgsr02" [ style = bold] "vip-rep_stop_0 pgsr02" -> "vip-rep_start_0 pgsr01" [ style = bold] "vip-rep_stop_0 pgsr02" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/bug-cl-5247.exp b/pengine/test10/bug-cl-5247.exp index 47c369a93d..7f55c641ca 100644 --- a/pengine/test10/bug-cl-5247.exp +++ b/pengine/test10/bug-cl-5247.exp @@ -1,802 +1,792 @@ - - - - - - - - - - - + diff --git a/pengine/test10/bug-cl-5247.summary b/pengine/test10/bug-cl-5247.summary index f15ef2e70a..99c00e9aba 100644 --- a/pengine/test10/bug-cl-5247.summary +++ b/pengine/test10/bug-cl-5247.summary @@ -1,103 +1,103 @@ Using the original execution date of: 2015-08-12 02:53:40Z Current cluster status: Online: [ bl460g8n3 bl460g8n4 ] Containers: [ pgsr01:prmDB1 ] prmDB1 (ocf::heartbeat:VirtualDomain): Started bl460g8n3 prmDB2 (ocf::heartbeat:VirtualDomain): FAILED bl460g8n4 Resource Group: grpStonith1 prmStonith1-2 (stonith:external/ipmi): Started bl460g8n4 Resource Group: grpStonith2 prmStonith2-2 (stonith:external/ipmi): Started bl460g8n3 Resource Group: master-group vip-master (ocf::heartbeat:Dummy): FAILED pgsr02 vip-rep (ocf::heartbeat:Dummy): FAILED pgsr02 Master/Slave Set: msPostgresql [pgsql] Masters: [ pgsr01 ] Stopped: [ bl460g8n3 bl460g8n4 ] Transition Summary: * Fence (off) pgsr02 (resource: prmDB2) 'guest is unclean' * Stop prmDB2 (bl460g8n4) due to node availability * Restart prmStonith1-2 ( bl460g8n4 ) * Restart prmStonith2-2 ( bl460g8n3 ) * Recover vip-master ( pgsr02 -> pgsr01 ) * Recover vip-rep ( pgsr02 -> pgsr01 ) * Stop pgsql:0 ( Master pgsr02 ) due to node availability * Stop pgsr02 (bl460g8n4) Executing cluster transition: * Pseudo action: grpStonith1_stop_0 * Resource action: prmStonith1-2 stop on bl460g8n4 * Pseudo action: grpStonith2_stop_0 * Resource action: prmStonith2-2 stop on bl460g8n3 * Resource action: vip-master monitor on pgsr01 * Resource action: vip-rep monitor on pgsr01 * Pseudo action: msPostgresql_pre_notify_demote_0 * Resource action: pgsr01 monitor on bl460g8n4 + * Resource action: pgsr02 stop on bl460g8n4 * Resource action: pgsr02 monitor on bl460g8n3 + * Resource action: prmDB2 stop on bl460g8n4 * Pseudo action: grpStonith1_stopped_0 * Pseudo action: grpStonith1_start_0 * Pseudo action: grpStonith2_stopped_0 * Pseudo action: grpStonith2_start_0 * Resource action: pgsql notify on pgsr01 * Pseudo action: msPostgresql_confirmed-pre_notify_demote_0 * Pseudo action: msPostgresql_demote_0 - * Resource action: pgsr02 stop on bl460g8n4 - * Resource action: prmDB2 stop on bl460g8n4 * Pseudo action: stonith-pgsr02-off on pgsr02 * Pseudo action: stonith_complete * Pseudo action: pgsql_post_notify_stop_0 * Pseudo action: pgsql_demote_0 * Pseudo action: msPostgresql_demoted_0 * Pseudo action: msPostgresql_post_notify_demoted_0 * Resource action: pgsql notify on pgsr01 * Pseudo action: msPostgresql_confirmed-post_notify_demoted_0 * Pseudo action: msPostgresql_pre_notify_stop_0 * Pseudo action: master-group_stop_0 * Pseudo action: vip-rep_stop_0 * Resource action: pgsql notify on pgsr01 * Pseudo action: msPostgresql_confirmed-pre_notify_stop_0 * Pseudo action: msPostgresql_stop_0 * Pseudo action: vip-master_stop_0 * Pseudo action: pgsql_stop_0 * Pseudo action: msPostgresql_stopped_0 * Pseudo action: master-group_stopped_0 * Pseudo action: master-group_start_0 * Resource action: vip-master start on pgsr01 * Resource action: vip-rep start on pgsr01 * Pseudo action: msPostgresql_post_notify_stopped_0 * Pseudo action: master-group_running_0 * Resource action: vip-master monitor=10000 on pgsr01 * Resource action: vip-rep monitor=10000 on pgsr01 * Resource action: pgsql notify on pgsr01 * Pseudo action: msPostgresql_confirmed-post_notify_stopped_0 * Pseudo action: pgsql_notified_0 * Resource action: pgsql monitor=9000 on pgsr01 * Pseudo action: all_stopped * Resource action: prmStonith1-2 start on bl460g8n4 * Resource action: prmStonith1-2 monitor=3600000 on bl460g8n4 * Resource action: prmStonith2-2 start on bl460g8n3 * Resource action: prmStonith2-2 monitor=3600000 on bl460g8n3 * Pseudo action: grpStonith1_running_0 * Pseudo action: grpStonith2_running_0 Using the original execution date of: 2015-08-12 02:53:40Z Revised cluster status: Online: [ bl460g8n3 bl460g8n4 ] Containers: [ pgsr01:prmDB1 ] prmDB1 (ocf::heartbeat:VirtualDomain): Started bl460g8n3 prmDB2 (ocf::heartbeat:VirtualDomain): FAILED Resource Group: grpStonith1 prmStonith1-2 (stonith:external/ipmi): Started bl460g8n4 Resource Group: grpStonith2 prmStonith2-2 (stonith:external/ipmi): Started bl460g8n3 Resource Group: master-group vip-master (ocf::heartbeat:Dummy): FAILED[ pgsr01 pgsr02 ] vip-rep (ocf::heartbeat:Dummy): FAILED[ pgsr01 pgsr02 ] Master/Slave Set: msPostgresql [pgsql] Masters: [ pgsr01 ] Stopped: [ bl460g8n3 bl460g8n4 ] diff --git a/pengine/test10/bug-rh-1097457.dot b/pengine/test10/bug-rh-1097457.dot index 7791e0627a..512510eae3 100644 --- a/pengine/test10/bug-rh-1097457.dot +++ b/pengine/test10/bug-rh-1097457.dot @@ -1,132 +1,130 @@ digraph "g" { "FAKE1-IP_monitor_0 lamaVM3" [ style=bold color="green" fontcolor="black"] "FAKE1_monitor_0 lamaVM3" [ style=bold color="green" fontcolor="black"] "FAKE2-IP_monitor_0 lamaVM3" [ style=bold color="green" fontcolor="black"] "FAKE2_monitor_0 lamaVM3" [ style=bold color="green" fontcolor="black"] "FAKE3-IP_monitor_0 lamaVM3" [ style=bold color="green" fontcolor="black"] "FAKE3_monitor_0 lamaVM3" [ style=bold color="green" fontcolor="black"] "FAKE4-IP_monitor_0 lamaVM1" -> "FAKE4-IP_start_0 lamaVM2" [ style = bold] "FAKE4-IP_monitor_0 lamaVM1" -> "FAKE4-IP_stop_0 lamaVM2" [ style = bold] "FAKE4-IP_monitor_0 lamaVM1" [ style=bold color="green" fontcolor="black"] "FAKE4-IP_monitor_0 lamaVM3" -> "FAKE4-IP_start_0 lamaVM2" [ style = bold] "FAKE4-IP_monitor_0 lamaVM3" -> "FAKE4-IP_stop_0 lamaVM2" [ style = bold] "FAKE4-IP_monitor_0 lamaVM3" [ style=bold color="green" fontcolor="black"] "FAKE4-IP_monitor_30000 lamaVM2" [ style=bold color="green" fontcolor="black"] "FAKE4-IP_start_0 lamaVM2" -> "FAKE4-IP_monitor_30000 lamaVM2" [ style = bold] "FAKE4-IP_start_0 lamaVM2" -> "lamaVM2-G4_running_0" [ style = bold] "FAKE4-IP_start_0 lamaVM2" [ style=bold color="green" fontcolor="black"] "FAKE4-IP_stop_0 lamaVM2" -> "FAKE4-IP_start_0 lamaVM2" [ style = bold] "FAKE4-IP_stop_0 lamaVM2" -> "FAKE4_stop_0 lamaVM2" [ style = bold] "FAKE4-IP_stop_0 lamaVM2" -> "all_stopped" [ style = bold] "FAKE4-IP_stop_0 lamaVM2" -> "lamaVM2-G4_stopped_0" [ style = bold] "FAKE4-IP_stop_0 lamaVM2" [ style=bold color="green" fontcolor="orange"] "FAKE4_monitor_0 lamaVM1" -> "FAKE4_start_0 lamaVM2" [ style = bold] "FAKE4_monitor_0 lamaVM1" -> "FAKE4_stop_0 lamaVM2" [ style = bold] "FAKE4_monitor_0 lamaVM1" [ style=bold color="green" fontcolor="black"] "FAKE4_monitor_0 lamaVM3" -> "FAKE4_start_0 lamaVM2" [ style = bold] "FAKE4_monitor_0 lamaVM3" -> "FAKE4_stop_0 lamaVM2" [ style = bold] "FAKE4_monitor_0 lamaVM3" [ style=bold color="green" fontcolor="black"] "FAKE4_monitor_30000 lamaVM2" [ style=bold color="green" fontcolor="black"] "FAKE4_start_0 lamaVM2" -> "FAKE4-IP_start_0 lamaVM2" [ style = bold] "FAKE4_start_0 lamaVM2" -> "FAKE4_monitor_30000 lamaVM2" [ style = bold] "FAKE4_start_0 lamaVM2" -> "lamaVM2-G4_running_0" [ style = bold] "FAKE4_start_0 lamaVM2" [ style=bold color="green" fontcolor="black"] "FAKE4_stop_0 lamaVM2" -> "FAKE4_start_0 lamaVM2" [ style = bold] "FAKE4_stop_0 lamaVM2" -> "all_stopped" [ style = bold] "FAKE4_stop_0 lamaVM2" -> "lamaVM2-G4_stopped_0" [ style = bold] "FAKE4_stop_0 lamaVM2" [ style=bold color="green" fontcolor="orange"] "FAKE5-IP_monitor_0 lamaVM1" [ style=bold color="green" fontcolor="black"] "FAKE5-IP_monitor_0 lamaVM3" [ style=bold color="green" fontcolor="black"] "FAKE5_monitor_0 lamaVM1" [ style=bold color="green" fontcolor="black"] "FAKE6-IP_monitor_0 lamaVM1" [ style=bold color="green" fontcolor="black"] "FAKE6-IP_monitor_0 lamaVM3" [ style=bold color="green" fontcolor="black"] "FAKE6-clone_running_0" [ style=bold color="green" fontcolor="orange"] "FAKE6-clone_start_0" -> "FAKE6-clone_running_0" [ style = bold] "FAKE6-clone_start_0" -> "FAKE6_start_0 lamaVM2" [ style = bold] "FAKE6-clone_start_0" [ style=bold color="green" fontcolor="orange"] "FAKE6-clone_stop_0" -> "FAKE6-clone_stopped_0" [ style = bold] "FAKE6-clone_stop_0" -> "FAKE6_stop_0 lamaVM2" [ style = bold] "FAKE6-clone_stop_0" [ style=bold color="green" fontcolor="orange"] "FAKE6-clone_stopped_0" -> "FAKE6-clone_start_0" [ style = bold] "FAKE6-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] "FAKE6_monitor_30000 lamaVM2" [ style=bold color="green" fontcolor="black"] "FAKE6_start_0 lamaVM2" -> "FAKE6-clone_running_0" [ style = bold] "FAKE6_start_0 lamaVM2" -> "FAKE6_monitor_30000 lamaVM2" [ style = bold] "FAKE6_start_0 lamaVM2" [ style=bold color="green" fontcolor="black"] "FAKE6_stop_0 lamaVM2" -> "FAKE6-clone_stopped_0" [ style = bold] "FAKE6_stop_0 lamaVM2" -> "FAKE6_start_0 lamaVM2" [ style = bold] "FAKE6_stop_0 lamaVM2" -> "all_stopped" [ style = bold] "FAKE6_stop_0 lamaVM2" [ style=bold color="green" fontcolor="orange"] "FSlun1_monitor_0 lamaVM3" [ style=bold color="green" fontcolor="black"] "FSlun2_monitor_0 lamaVM3" [ style=bold color="green" fontcolor="black"] "FSlun3_monitor_0 lamaVM1" -> "FSlun3_start_0 lama2" [ style = bold] -"FSlun3_monitor_0 lamaVM1" -> "FSlun3_stop_0 lamaVM2" [ style = bold] "FSlun3_monitor_0 lamaVM1" [ style=bold color="green" fontcolor="black"] "FSlun3_monitor_0 lamaVM3" -> "FSlun3_start_0 lama2" [ style = bold] -"FSlun3_monitor_0 lamaVM3" -> "FSlun3_stop_0 lamaVM2" [ style = bold] "FSlun3_monitor_0 lamaVM3" [ style=bold color="green" fontcolor="black"] "FSlun3_monitor_10000 lama2" [ style=bold color="green" fontcolor="black"] "FSlun3_monitor_10000 lamaVM2" [ style=bold color="green" fontcolor="black"] "FSlun3_start_0 lama2" -> "FSlun3_monitor_10000 lama2" [ style = bold] "FSlun3_start_0 lama2" -> "lamaVM2-G4_start_0" [ style = bold] "FSlun3_start_0 lama2" [ style=bold color="green" fontcolor="black"] "FSlun3_stop_0 lamaVM2" -> "FSlun3_start_0 lama2" [ style = bold] "FSlun3_stop_0 lamaVM2" -> "all_stopped" [ style = bold] "FSlun3_stop_0 lamaVM2" [ style=bold color="green" fontcolor="orange"] "FSlun4_monitor_0 lamaVM1" [ style=bold color="green" fontcolor="black"] "VM2_monitor_10000 lama3" [ style=bold color="green" fontcolor="black"] "VM2_start_0 lama3" -> "FAKE4-IP_start_0 lamaVM2" [ style = bold] "VM2_start_0 lama3" -> "FAKE4_start_0 lamaVM2" [ style = bold] "VM2_start_0 lama3" -> "FAKE6_start_0 lamaVM2" [ style = bold] "VM2_start_0 lama3" -> "FSlun3_start_0 lama2" [ style = bold] "VM2_start_0 lama3" -> "VM2_monitor_10000 lama3" [ style = bold] "VM2_start_0 lama3" -> "lamaVM2_start_0 lama3" [ style = bold] "VM2_start_0 lama3" [ style=bold color="green" fontcolor="black"] "VM2_stop_0 lama3" -> "VM2_start_0 lama3" [ style = bold] "VM2_stop_0 lama3" -> "all_stopped" [ style = bold] "VM2_stop_0 lama3" -> "stonith 'reboot' lamaVM2" [ style = bold] "VM2_stop_0 lama3" [ style=bold color="green" fontcolor="black"] "all_stopped" [ style=bold color="green" fontcolor="orange"] "lamaVM2-G4_running_0" [ style=bold color="green" fontcolor="orange"] "lamaVM2-G4_start_0" -> "FAKE4-IP_start_0 lamaVM2" [ style = bold] "lamaVM2-G4_start_0" -> "FAKE4_start_0 lamaVM2" [ style = bold] "lamaVM2-G4_start_0" -> "lamaVM2-G4_running_0" [ style = bold] "lamaVM2-G4_start_0" [ style=bold color="green" fontcolor="orange"] "lamaVM2-G4_stop_0" -> "FAKE4-IP_stop_0 lamaVM2" [ style = bold] "lamaVM2-G4_stop_0" -> "FAKE4_stop_0 lamaVM2" [ style = bold] "lamaVM2-G4_stop_0" -> "lamaVM2-G4_stopped_0" [ style = bold] "lamaVM2-G4_stop_0" [ style=bold color="green" fontcolor="orange"] "lamaVM2-G4_stopped_0" -> "FSlun3_stop_0 lamaVM2" [ style = bold] "lamaVM2-G4_stopped_0" -> "lamaVM2-G4_start_0" [ style = bold] "lamaVM2-G4_stopped_0" [ style=bold color="green" fontcolor="orange"] "lamaVM2_monitor_30000 lama3" [ style=bold color="green" fontcolor="black"] "lamaVM2_start_0 lama3" -> "FAKE4-IP_monitor_30000 lamaVM2" [ style = bold] "lamaVM2_start_0 lama3" -> "FAKE4-IP_start_0 lamaVM2" [ style = bold] "lamaVM2_start_0 lama3" -> "FAKE4_monitor_30000 lamaVM2" [ style = bold] "lamaVM2_start_0 lama3" -> "FAKE4_start_0 lamaVM2" [ style = bold] "lamaVM2_start_0 lama3" -> "FAKE6_monitor_30000 lamaVM2" [ style = bold] "lamaVM2_start_0 lama3" -> "FAKE6_start_0 lamaVM2" [ style = bold] "lamaVM2_start_0 lama3" -> "FSlun3_monitor_10000 lamaVM2" [ style = bold] "lamaVM2_start_0 lama3" -> "lamaVM2_monitor_30000 lama3" [ style = bold] "lamaVM2_start_0 lama3" [ style=bold color="green" fontcolor="black"] "lamaVM2_stop_0 lama3" -> "VM2_stop_0 lama3" [ style = bold] "lamaVM2_stop_0 lama3" -> "all_stopped" [ style = bold] "lamaVM2_stop_0 lama3" -> "lamaVM2_start_0 lama3" [ style = bold] "lamaVM2_stop_0 lama3" [ style=bold color="green" fontcolor="black"] "stonith 'reboot' lamaVM2" -> "FAKE4-IP_stop_0 lamaVM2" [ style = bold] "stonith 'reboot' lamaVM2" -> "FAKE4_stop_0 lamaVM2" [ style = bold] "stonith 'reboot' lamaVM2" -> "FAKE6-clone_stop_0" [ style = bold] "stonith 'reboot' lamaVM2" -> "FAKE6_stop_0 lamaVM2" [ style = bold] "stonith 'reboot' lamaVM2" -> "FSlun3_stop_0 lamaVM2" [ style = bold] "stonith 'reboot' lamaVM2" -> "lamaVM2-G4_stop_0" [ style = bold] "stonith 'reboot' lamaVM2" -> "stonith_complete" [ style = bold] "stonith 'reboot' lamaVM2" [ style=bold color="green" fontcolor="orange"] "stonith_complete" -> "FAKE4-IP_start_0 lamaVM2" [ style = bold] "stonith_complete" -> "FAKE4_start_0 lamaVM2" [ style = bold] "stonith_complete" -> "FAKE6_start_0 lamaVM2" [ style = bold] "stonith_complete" -> "FSlun3_start_0 lama2" [ style = bold] "stonith_complete" -> "VM2_start_0 lama3" [ style = bold] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "lamaVM2_start_0 lama3" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/bug-rh-1097457.exp b/pengine/test10/bug-rh-1097457.exp index 33c13bdc36..e7e0e671de 100644 --- a/pengine/test10/bug-rh-1097457.exp +++ b/pengine/test10/bug-rh-1097457.exp @@ -1,712 +1,706 @@ - - - - - - diff --git a/pengine/test10/clone-no-shuffle.dot b/pengine/test10/clone-no-shuffle.dot index 7996ef4897..883e779277 100644 --- a/pengine/test10/clone-no-shuffle.dot +++ b/pengine/test10/clone-no-shuffle.dot @@ -1,84 +1,83 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "drbd1:0_demote_0 dktest2sles10" -> "drbd1:0_stop_0 dktest2sles10" [ style = bold] "drbd1:0_demote_0 dktest2sles10" -> "ms-drbd1_demoted_0" [ style = bold] "drbd1:0_demote_0 dktest2sles10" [ style=bold color="green" fontcolor="black" ] "drbd1:0_post_notify_demote_0 dktest2sles10" -> "ms-drbd1_confirmed-post_notify_demoted_0" [ style = bold] "drbd1:0_post_notify_demote_0 dktest2sles10" [ style=bold color="green" fontcolor="black" ] "drbd1:0_pre_notify_demote_0 dktest2sles10" -> "ms-drbd1_confirmed-pre_notify_demote_0" [ style = bold] "drbd1:0_pre_notify_demote_0 dktest2sles10" [ style=bold color="green" fontcolor="black" ] "drbd1:0_pre_notify_stop_0 dktest2sles10" -> "ms-drbd1_confirmed-pre_notify_stop_0" [ style = bold] "drbd1:0_pre_notify_stop_0 dktest2sles10" [ style=bold color="green" fontcolor="black" ] "drbd1:0_stop_0 dktest2sles10" -> "all_stopped" [ style = bold] "drbd1:0_stop_0 dktest2sles10" -> "ms-drbd1_stopped_0" [ style = bold] "drbd1:0_stop_0 dktest2sles10" [ style=bold color="green" fontcolor="black" ] "drbd1:1_monitor_0 dktest1sles10" -> "ms-drbd1_start_0" [ style = bold] "drbd1:1_monitor_0 dktest1sles10" [ style=bold color="green" fontcolor="black" ] "drbd1:1_monitor_11000 dktest1sles10" [ style=bold color="green" fontcolor="black" ] "drbd1:1_post_notify_start_0 dktest1sles10" -> "ms-drbd1_confirmed-post_notify_running_0" [ style = bold] "drbd1:1_post_notify_start_0 dktest1sles10" [ style=bold color="green" fontcolor="black" ] "drbd1:1_start_0 dktest1sles10" -> "drbd1:1_monitor_11000 dktest1sles10" [ style = bold] "drbd1:1_start_0 dktest1sles10" -> "ms-drbd1_running_0" [ style = bold] "drbd1:1_start_0 dktest1sles10" [ style=bold color="green" fontcolor="black" ] "ms-drbd1_confirmed-post_notify_demoted_0" -> "ms-drbd1_pre_notify_start_0" [ style = bold] "ms-drbd1_confirmed-post_notify_demoted_0" -> "ms-drbd1_pre_notify_stop_0" [ style = bold] "ms-drbd1_confirmed-post_notify_demoted_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd1_confirmed-post_notify_running_0" -> "drbd1:1_monitor_11000 dktest1sles10" [ style = bold] "ms-drbd1_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd1_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "ms-drbd1_confirmed-post_notify_stopped_0" -> "ms-drbd1_pre_notify_start_0" [ style = bold] "ms-drbd1_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd1_confirmed-pre_notify_demote_0" -> "ms-drbd1_demote_0" [ style = bold] "ms-drbd1_confirmed-pre_notify_demote_0" -> "ms-drbd1_post_notify_demoted_0" [ style = bold] "ms-drbd1_confirmed-pre_notify_demote_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd1_confirmed-pre_notify_start_0" -> "ms-drbd1_post_notify_running_0" [ style = bold] "ms-drbd1_confirmed-pre_notify_start_0" -> "ms-drbd1_start_0" [ style = bold] "ms-drbd1_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd1_confirmed-pre_notify_stop_0" -> "ms-drbd1_post_notify_stopped_0" [ style = bold] "ms-drbd1_confirmed-pre_notify_stop_0" -> "ms-drbd1_stop_0" [ style = bold] "ms-drbd1_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd1_demote_0" -> "drbd1:0_demote_0 dktest2sles10" [ style = bold] "ms-drbd1_demote_0" -> "ms-drbd1_demoted_0" [ style = bold] "ms-drbd1_demote_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd1_demoted_0" -> "ms-drbd1_post_notify_demoted_0" [ style = bold] "ms-drbd1_demoted_0" -> "ms-drbd1_start_0" [ style = bold] "ms-drbd1_demoted_0" -> "ms-drbd1_stop_0" [ style = bold] "ms-drbd1_demoted_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd1_post_notify_demoted_0" -> "drbd1:0_post_notify_demote_0 dktest2sles10" [ style = bold] "ms-drbd1_post_notify_demoted_0" -> "ms-drbd1_confirmed-post_notify_demoted_0" [ style = bold] "ms-drbd1_post_notify_demoted_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd1_post_notify_running_0" -> "drbd1:1_post_notify_start_0 dktest1sles10" [ style = bold] "ms-drbd1_post_notify_running_0" -> "ms-drbd1_confirmed-post_notify_running_0" [ style = bold] "ms-drbd1_post_notify_running_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd1_post_notify_stopped_0" -> "ms-drbd1_confirmed-post_notify_stopped_0" [ style = bold] "ms-drbd1_post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd1_pre_notify_demote_0" -> "drbd1:0_pre_notify_demote_0 dktest2sles10" [ style = bold] "ms-drbd1_pre_notify_demote_0" -> "ms-drbd1_confirmed-pre_notify_demote_0" [ style = bold] "ms-drbd1_pre_notify_demote_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd1_pre_notify_start_0" -> "ms-drbd1_confirmed-pre_notify_start_0" [ style = bold] "ms-drbd1_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd1_pre_notify_stop_0" -> "drbd1:0_pre_notify_stop_0 dktest2sles10" [ style = bold] "ms-drbd1_pre_notify_stop_0" -> "ms-drbd1_confirmed-pre_notify_stop_0" [ style = bold] "ms-drbd1_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd1_running_0" -> "ms-drbd1_post_notify_running_0" [ style = bold] "ms-drbd1_running_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd1_start_0" -> "drbd1:1_start_0 dktest1sles10" [ style = bold] "ms-drbd1_start_0" -> "ms-drbd1_running_0" [ style = bold] "ms-drbd1_start_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd1_stop_0" -> "drbd1:0_stop_0 dktest2sles10" [ style = bold] "ms-drbd1_stop_0" -> "ms-drbd1_stopped_0" [ style = bold] "ms-drbd1_stop_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd1_stopped_0" -> "ms-drbd1_post_notify_stopped_0" [ style = bold] "ms-drbd1_stopped_0" -> "ms-drbd1_start_0" [ style = bold] "ms-drbd1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "stonith-1_monitor_0 dktest1sles10" -> "stonith-1_start_0 dktest1sles10" [ style = bold] "stonith-1_monitor_0 dktest1sles10" [ style=bold color="green" fontcolor="black" ] "stonith-1_monitor_0 dktest2sles10" -> "stonith-1_start_0 dktest1sles10" [ style = bold] "stonith-1_monitor_0 dktest2sles10" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 dktest1sles10" [ style=bold color="green" fontcolor="black" ] -"testip_monitor_0 dktest1sles10" -> "testip_stop_0 dktest2sles10" [ style = bold] "testip_monitor_0 dktest1sles10" [ style=bold color="green" fontcolor="black" ] "testip_stop_0 dktest2sles10" -> "all_stopped" [ style = bold] "testip_stop_0 dktest2sles10" -> "ms-drbd1_demote_0" [ style = bold] "testip_stop_0 dktest2sles10" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/clone-no-shuffle.exp b/pengine/test10/clone-no-shuffle.exp index 126914bba3..1d5d70ac92 100644 --- a/pengine/test10/clone-no-shuffle.exp +++ b/pengine/test10/clone-no-shuffle.exp @@ -1,456 +1,452 @@ - - - - - + diff --git a/pengine/test10/clone-no-shuffle.summary b/pengine/test10/clone-no-shuffle.summary index c69d8f3189..c9cb373f8e 100644 --- a/pengine/test10/clone-no-shuffle.summary +++ b/pengine/test10/clone-no-shuffle.summary @@ -1,60 +1,60 @@ Current cluster status: Online: [ dktest1sles10 dktest2sles10 ] stonith-1 (stonith:dummy): Stopped Master/Slave Set: ms-drbd1 [drbd1] Masters: [ dktest2sles10 ] Stopped: [ dktest1sles10 ] testip (ocf::heartbeat:IPaddr2): Started dktest2sles10 Transition Summary: * Start stonith-1 (dktest1sles10) * Stop drbd1:0 ( Master dktest2sles10 ) due to node availability * Start drbd1:1 (dktest1sles10) * Stop testip (dktest2sles10) Executing cluster transition: * Resource action: stonith-1 monitor on dktest2sles10 * Resource action: stonith-1 monitor on dktest1sles10 * Resource action: drbd1:1 monitor on dktest1sles10 * Pseudo action: ms-drbd1_pre_notify_demote_0 + * Resource action: testip stop on dktest2sles10 * Resource action: testip monitor on dktest1sles10 * Resource action: stonith-1 start on dktest1sles10 * Resource action: drbd1:0 notify on dktest2sles10 * Pseudo action: ms-drbd1_confirmed-pre_notify_demote_0 - * Resource action: testip stop on dktest2sles10 * Pseudo action: ms-drbd1_demote_0 * Resource action: drbd1:0 demote on dktest2sles10 * Pseudo action: ms-drbd1_demoted_0 * Pseudo action: ms-drbd1_post_notify_demoted_0 * Resource action: drbd1:0 notify on dktest2sles10 * Pseudo action: ms-drbd1_confirmed-post_notify_demoted_0 * Pseudo action: ms-drbd1_pre_notify_stop_0 * Resource action: drbd1:0 notify on dktest2sles10 * Pseudo action: ms-drbd1_confirmed-pre_notify_stop_0 * Pseudo action: ms-drbd1_stop_0 * Resource action: drbd1:0 stop on dktest2sles10 * Pseudo action: ms-drbd1_stopped_0 * Pseudo action: ms-drbd1_post_notify_stopped_0 * Pseudo action: ms-drbd1_confirmed-post_notify_stopped_0 * Pseudo action: ms-drbd1_pre_notify_start_0 * Pseudo action: all_stopped * Pseudo action: ms-drbd1_confirmed-pre_notify_start_0 * Pseudo action: ms-drbd1_start_0 * Resource action: drbd1:1 start on dktest1sles10 * Pseudo action: ms-drbd1_running_0 * Pseudo action: ms-drbd1_post_notify_running_0 * Resource action: drbd1:1 notify on dktest1sles10 * Pseudo action: ms-drbd1_confirmed-post_notify_running_0 * Resource action: drbd1:1 monitor=11000 on dktest1sles10 Revised cluster status: Online: [ dktest1sles10 dktest2sles10 ] stonith-1 (stonith:dummy): Started dktest1sles10 Master/Slave Set: ms-drbd1 [drbd1] Slaves: [ dktest1sles10 ] Stopped: [ dktest2sles10 ] testip (ocf::heartbeat:IPaddr2): Stopped diff --git a/pengine/test10/group9.dot b/pengine/test10/group9.dot index a83b9ad5de..bc58f152e6 100644 --- a/pengine/test10/group9.dot +++ b/pengine/test10/group9.dot @@ -1,81 +1,79 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "bar_running_0" [ style=bold color="green" fontcolor="orange" ] "bar_start_0" -> "bar_running_0" [ style = bold] "bar_start_0" -> "rsc6_start_0 node2" [ style = bold] "bar_start_0" -> "rsc7_start_0 node2" [ style = bold] "bar_start_0" -> "rsc8_start_0 node2" [ style = bold] "bar_start_0" [ style=bold color="green" fontcolor="orange" ] "bar_stop_0" -> "bar_stopped_0" [ style = bold] "bar_stop_0" -> "rsc6_stop_0 node1" [ style = bold] "bar_stop_0" -> "rsc7_stop_0 node1" [ style = bold] "bar_stop_0" -> "rsc8_stop_0 node1" [ style = bold] "bar_stop_0" [ style=bold color="green" fontcolor="orange" ] "bar_stopped_0" -> "bar_start_0" [ style = bold] "bar_stopped_0" [ style=bold color="green" fontcolor="orange" ] "foo_running_0" [ style=bold color="green" fontcolor="orange" ] "foo_start_0" -> "foo_running_0" [ style = bold] "foo_start_0" -> "rsc4_start_0 node1" [ style = bold] "foo_start_0" -> "rsc5_start_0 node1" [ style = bold] "foo_start_0" [ style=bold color="green" fontcolor="orange" ] "foo_stop_0" -> "foo_stopped_0" [ style = bold] "foo_stop_0" -> "rsc4_stop_0 node1" [ style = bold] "foo_stop_0" -> "rsc5_stop_0 node1" [ style = bold] "foo_stop_0" [ style=bold color="green" fontcolor="orange" ] "foo_stopped_0" -> "foo_start_0" [ style = bold] "foo_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_monitor_0 node2" -> "rsc4_start_0 node1" [ style = bold] -"rsc4_monitor_0 node2" -> "rsc4_stop_0 node1" [ style = bold] "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_start_0 node1" -> "foo_running_0" [ style = bold] "rsc4_start_0 node1" -> "rsc5_start_0 node1" [ style = bold] "rsc4_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc4_stop_0 node1" -> "all_stopped" [ style = bold] "rsc4_stop_0 node1" -> "foo_stopped_0" [ style = bold] "rsc4_stop_0 node1" -> "rsc4_start_0 node1" [ style = bold] "rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc5_monitor_0 node2" -> "rsc5_start_0 node1" [ style = bold] "rsc5_monitor_0 node2" -> "rsc5_stop_0 node1" [ style = bold] "rsc5_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc5_start_0 node1" -> "foo_running_0" [ style = bold] "rsc5_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc5_stop_0 node1" -> "all_stopped" [ style = bold] "rsc5_stop_0 node1" -> "foo_stopped_0" [ style = bold] "rsc5_stop_0 node1" -> "rsc4_stop_0 node1" [ style = bold] "rsc5_stop_0 node1" -> "rsc5_start_0 node1" [ style = bold] "rsc5_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc6_monitor_0 node2" -> "rsc6_start_0 node2" [ style = bold] "rsc6_monitor_0 node2" -> "rsc6_stop_0 node1" [ style = bold] "rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc6_start_0 node2" -> "bar_running_0" [ style = bold] "rsc6_start_0 node2" -> "rsc7_start_0 node2" [ style = bold] "rsc6_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc6_stop_0 node1" -> "all_stopped" [ style = bold] "rsc6_stop_0 node1" -> "bar_stopped_0" [ style = bold] "rsc6_stop_0 node1" -> "rsc6_start_0 node2" [ style = bold] "rsc6_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc7_monitor_0 node2" -> "rsc7_start_0 node2" [ style = bold] -"rsc7_monitor_0 node2" -> "rsc7_stop_0 node1" [ style = bold] "rsc7_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc7_start_0 node2" -> "bar_running_0" [ style = bold] "rsc7_start_0 node2" -> "rsc8_start_0 node2" [ style = bold] "rsc7_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc7_stop_0 node1" -> "all_stopped" [ style = bold] "rsc7_stop_0 node1" -> "bar_stopped_0" [ style = bold] "rsc7_stop_0 node1" -> "rsc6_stop_0 node1" [ style = bold] "rsc7_stop_0 node1" -> "rsc7_start_0 node2" [ style = bold] "rsc7_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc8_monitor_0 node2" -> "rsc8_start_0 node2" [ style = bold] "rsc8_monitor_0 node2" -> "rsc8_stop_0 node1" [ style = bold] "rsc8_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc8_start_0 node2" -> "bar_running_0" [ style = bold] "rsc8_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc8_stop_0 node1" -> "all_stopped" [ style = bold] "rsc8_stop_0 node1" -> "bar_stopped_0" [ style = bold] "rsc8_stop_0 node1" -> "rsc7_stop_0 node1" [ style = bold] "rsc8_stop_0 node1" -> "rsc8_start_0 node2" [ style = bold] "rsc8_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/group9.exp b/pengine/test10/group9.exp index 66e85a47bd..f57f2b43e5 100644 --- a/pengine/test10/group9.exp +++ b/pengine/test10/group9.exp @@ -1,410 +1,404 @@ - - - - - - diff --git a/pengine/test10/inc2.dot b/pengine/test10/inc2.dot index 88d210e1a4..cd250e5d81 100644 --- a/pengine/test10/inc2.dot +++ b/pengine/test10/inc2.dot @@ -1,43 +1,42 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc1:0_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_monitor_0 node2" -> "child_rsc1:2_stop_0 node1" [ style = bold] "child_rsc1:2_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_start_0 node2" -> "rsc1_running_0" [ style = bold] "child_rsc1:2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:2_stop_0 node1" -> "child_rsc1:2_start_0 node2" [ style = bold] "child_rsc1:2_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_monitor_0 node2" -> "child_rsc1:3_stop_0 node1" [ style = bold] "child_rsc1:3_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_start_0 node2" -> "rsc1_running_0" [ style = bold] "child_rsc1:3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:3_stop_0 node1" -> "child_rsc1:3_start_0 node2" [ style = bold] "child_rsc1:3_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"child_rsc1:4_monitor_0 node2" -> "child_rsc1:4_stop_0 node1" [ style = bold] "child_rsc1:4_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:4_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:4_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_start_0" -> "child_rsc1:2_start_0 node2" [ style = bold] "rsc1_start_0" -> "child_rsc1:3_start_0 node2" [ style = bold] "rsc1_start_0" -> "rsc1_running_0" [ style = bold] "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stop_0" -> "child_rsc1:2_stop_0 node1" [ style = bold] "rsc1_stop_0" -> "child_rsc1:3_stop_0 node1" [ style = bold] "rsc1_stop_0" -> "child_rsc1:4_stop_0 node1" [ style = bold] "rsc1_stop_0" -> "rsc1_stopped_0" [ style = bold] "rsc1_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stopped_0" -> "rsc1_start_0" [ style = bold] "rsc1_stopped_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/inc2.exp b/pengine/test10/inc2.exp index 3fb51346ba..92b4cf120b 100644 --- a/pengine/test10/inc2.exp +++ b/pengine/test10/inc2.exp @@ -1,220 +1,217 @@ - - - diff --git a/pengine/test10/inc3.dot b/pengine/test10/inc3.dot index eb3e7e9e5c..113541af34 100644 --- a/pengine/test10/inc3.dot +++ b/pengine/test10/inc3.dot @@ -1,80 +1,79 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc1:0_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_monitor_0 node2" -> "child_rsc1:2_stop_0 node1" [ style = bold] "child_rsc1:2_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_start_0 node2" -> "rsc1_running_0" [ style = bold] "child_rsc1:2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:2_stop_0 node1" -> "child_rsc1:2_start_0 node2" [ style = bold] "child_rsc1:2_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_monitor_0 node2" -> "child_rsc1:3_stop_0 node1" [ style = bold] "child_rsc1:3_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_start_0 node2" -> "rsc1_running_0" [ style = bold] "child_rsc1:3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:3_stop_0 node1" -> "child_rsc1:3_start_0 node2" [ style = bold] "child_rsc1:3_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"child_rsc1:4_monitor_0 node2" -> "child_rsc1:4_stop_0 node1" [ style = bold] "child_rsc1:4_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:4_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:4_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_monitor_0 node1" -> "rsc2_start_0" [ style = bold] "child_rsc2:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:1_monitor_0 node1" -> "rsc2_start_0" [ style = bold] "child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:2_monitor_0 node1" -> "rsc2_start_0" [ style = bold] "child_rsc2:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:3_monitor_0 node1" -> "child_rsc2:3_stop_0 node2" [ style = bold] "child_rsc2:3_monitor_0 node1" -> "rsc2_start_0" [ style = bold] "child_rsc2:3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:3_start_0 node1" -> "rsc2_running_0" [ style = bold] "child_rsc2:3_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:3_stop_0 node2" -> "all_stopped" [ style = bold] "child_rsc2:3_stop_0 node2" -> "child_rsc2:3_start_0 node1" [ style = bold] "child_rsc2:3_stop_0 node2" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:3_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2:4_monitor_0 node1" -> "child_rsc2:4_stop_0 node2" [ style = bold] "child_rsc2:4_monitor_0 node1" -> "rsc2_start_0" [ style = bold] "child_rsc2:4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:4_start_0 node1" -> "rsc2_running_0" [ style = bold] "child_rsc2:4_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:4_stop_0 node2" -> "all_stopped" [ style = bold] "child_rsc2:4_stop_0 node2" -> "child_rsc2:4_start_0 node1" [ style = bold] "child_rsc2:4_stop_0 node2" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:4_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_running_0" -> "rsc2_start_0" [ style = bold] "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_start_0" -> "child_rsc1:2_start_0 node2" [ style = bold] "rsc1_start_0" -> "child_rsc1:3_start_0 node2" [ style = bold] "rsc1_start_0" -> "rsc1_running_0" [ style = bold] "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stop_0" -> "child_rsc1:2_stop_0 node1" [ style = bold] "rsc1_stop_0" -> "child_rsc1:3_stop_0 node1" [ style = bold] "rsc1_stop_0" -> "child_rsc1:4_stop_0 node1" [ style = bold] "rsc1_stop_0" -> "rsc1_stopped_0" [ style = bold] "rsc1_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stopped_0" -> "rsc1_start_0" [ style = bold] "rsc1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_start_0" -> "child_rsc2:3_start_0 node1" [ style = bold] "rsc2_start_0" -> "child_rsc2:4_start_0 node1" [ style = bold] "rsc2_start_0" -> "rsc2_running_0" [ style = bold] "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stop_0" -> "child_rsc2:3_stop_0 node2" [ style = bold] "rsc2_stop_0" -> "child_rsc2:4_stop_0 node2" [ style = bold] "rsc2_stop_0" -> "rsc2_stopped_0" [ style = bold] "rsc2_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stopped_0" -> "rsc1_stop_0" [ style = bold] "rsc2_stopped_0" -> "rsc2_start_0" [ style = bold] "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/inc3.exp b/pengine/test10/inc3.exp index e6b09821c2..4c1e46dd66 100644 --- a/pengine/test10/inc3.exp +++ b/pengine/test10/inc3.exp @@ -1,413 +1,410 @@ - - - diff --git a/pengine/test10/inc4.dot b/pengine/test10/inc4.dot index 16f5f03a59..c5a1a00936 100644 --- a/pengine/test10/inc4.dot +++ b/pengine/test10/inc4.dot @@ -1,85 +1,84 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc1:0_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_monitor_0 node2" -> "child_rsc1:2_stop_0 node1" [ style = bold] "child_rsc1:2_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_start_0 node2" -> "child_rsc1:3_start_0 node2" [ style = bold] "child_rsc1:2_start_0 node2" -> "rsc1_running_0" [ style = bold] "child_rsc1:2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:2_stop_0 node1" -> "child_rsc1:2_start_0 node2" [ style = bold] "child_rsc1:2_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_monitor_0 node2" -> "child_rsc1:3_stop_0 node1" [ style = bold] "child_rsc1:3_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_start_0 node2" -> "rsc1_running_0" [ style = bold] "child_rsc1:3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:3_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:3_stop_0 node1" -> "child_rsc1:2_stop_0 node1" [ style = bold] "child_rsc1:3_stop_0 node1" -> "child_rsc1:3_start_0 node2" [ style = bold] "child_rsc1:3_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"child_rsc1:4_monitor_0 node2" -> "child_rsc1:4_stop_0 node1" [ style = bold] "child_rsc1:4_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:4_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:4_stop_0 node1" -> "child_rsc1:3_stop_0 node1" [ style = bold] "child_rsc1:4_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_monitor_0 node1" -> "rsc2_start_0" [ style = bold] "child_rsc2:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:1_monitor_0 node1" -> "rsc2_start_0" [ style = bold] "child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:2_monitor_0 node1" -> "rsc2_start_0" [ style = bold] "child_rsc2:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:3_monitor_0 node1" -> "child_rsc2:3_stop_0 node2" [ style = bold] "child_rsc2:3_monitor_0 node1" -> "rsc2_start_0" [ style = bold] "child_rsc2:3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:3_start_0 node1" -> "child_rsc2:4_start_0 node1" [ style = bold] "child_rsc2:3_start_0 node1" -> "rsc2_running_0" [ style = bold] "child_rsc2:3_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:3_stop_0 node2" -> "all_stopped" [ style = bold] "child_rsc2:3_stop_0 node2" -> "child_rsc2:3_start_0 node1" [ style = bold] "child_rsc2:3_stop_0 node2" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:3_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2:4_monitor_0 node1" -> "child_rsc2:4_stop_0 node2" [ style = bold] "child_rsc2:4_monitor_0 node1" -> "rsc2_start_0" [ style = bold] "child_rsc2:4_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:4_start_0 node1" -> "rsc2_running_0" [ style = bold] "child_rsc2:4_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:4_stop_0 node2" -> "all_stopped" [ style = bold] "child_rsc2:4_stop_0 node2" -> "child_rsc2:3_stop_0 node2" [ style = bold] "child_rsc2:4_stop_0 node2" -> "child_rsc2:4_start_0 node1" [ style = bold] "child_rsc2:4_stop_0 node2" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:4_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_running_0" -> "rsc2_start_0" [ style = bold] "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_start_0" -> "child_rsc1:2_start_0 node2" [ style = bold] "rsc1_start_0" -> "child_rsc1:3_start_0 node2" [ style = bold] "rsc1_start_0" -> "rsc1_running_0" [ style = bold] "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stop_0" -> "child_rsc1:2_stop_0 node1" [ style = bold] "rsc1_stop_0" -> "child_rsc1:3_stop_0 node1" [ style = bold] "rsc1_stop_0" -> "child_rsc1:4_stop_0 node1" [ style = bold] "rsc1_stop_0" -> "rsc1_stopped_0" [ style = bold] "rsc1_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stopped_0" -> "rsc1_start_0" [ style = bold] "rsc1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_start_0" -> "child_rsc2:3_start_0 node1" [ style = bold] "rsc2_start_0" -> "child_rsc2:4_start_0 node1" [ style = bold] "rsc2_start_0" -> "rsc2_running_0" [ style = bold] "rsc2_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stop_0" -> "child_rsc2:3_stop_0 node2" [ style = bold] "rsc2_stop_0" -> "child_rsc2:4_stop_0 node2" [ style = bold] "rsc2_stop_0" -> "rsc2_stopped_0" [ style = bold] "rsc2_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stopped_0" -> "rsc1_stop_0" [ style = bold] "rsc2_stopped_0" -> "rsc2_start_0" [ style = bold] "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/inc4.exp b/pengine/test10/inc4.exp index 1f4e71cf32..0d767d6786 100644 --- a/pengine/test10/inc4.exp +++ b/pengine/test10/inc4.exp @@ -1,428 +1,425 @@ - - - diff --git a/pengine/test10/master-7.dot b/pengine/test10/master-7.dot index c6bdd3c4a4..51fcfd81a3 100644 --- a/pengine/test10/master-7.dot +++ b/pengine/test10/master-7.dot @@ -1,122 +1,119 @@ digraph "g" { "DcIPaddr_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_start_0 c001n03" -> "DcIPaddr_monitor_5000 c001n03" [ style = bold] "DcIPaddr_start_0 c001n03" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_stop_0 c001n01" -> "DcIPaddr_start_0 c001n03" [ style = bold] "DcIPaddr_stop_0 c001n01" -> "all_stopped" [ style = bold] "DcIPaddr_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold] "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:0_stop_0 c001n01" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:0_stop_0 c001n01" -> "all_stopped" [ style = bold] "child_DoFencing:0_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:2_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "group-1_running_0" [ style=bold color="green" fontcolor="orange" ] "group-1_start_0" -> "group-1_running_0" [ style = bold] "group-1_start_0" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold] "group-1_start_0" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold] "group-1_start_0" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold] "group-1_start_0" [ style=bold color="green" fontcolor="orange" ] "group-1_stop_0" -> "group-1_stopped_0" [ style = bold] "group-1_stop_0" -> "heartbeat_192.168.100.182_stop_0 c001n03" [ style = bold] "group-1_stop_0" -> "ocf_192.168.100.181_stop_0 c001n03" [ style = bold] "group-1_stop_0" -> "ocf_192.168.100.183_stop_0 c001n03" [ style = bold] "group-1_stop_0" [ style=bold color="green" fontcolor="orange" ] "group-1_stopped_0" -> "group-1_start_0" [ style = bold] "group-1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "heartbeat_192.168.100.182_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ] "heartbeat_192.168.100.182_start_0 c001n02" -> "group-1_running_0" [ style = bold] "heartbeat_192.168.100.182_start_0 c001n02" -> "heartbeat_192.168.100.182_monitor_5000 c001n02" [ style = bold] "heartbeat_192.168.100.182_start_0 c001n02" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold] "heartbeat_192.168.100.182_start_0 c001n02" [ style=bold color="green" fontcolor="black" ] "heartbeat_192.168.100.182_stop_0 c001n03" -> "all_stopped" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n03" -> "group-1_stopped_0" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n03" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n03" -> "ocf_192.168.100.181_stop_0 c001n03" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ] "lsb_dummy_monitor_5000 c001n08" [ style=bold color="green" fontcolor="black" ] "lsb_dummy_start_0 c001n08" -> "lsb_dummy_monitor_5000 c001n08" [ style = bold] "lsb_dummy_start_0 c001n08" [ style=bold color="green" fontcolor="black" ] "lsb_dummy_stop_0 c001n02" -> "all_stopped" [ style = bold] "lsb_dummy_stop_0 c001n02" -> "lsb_dummy_start_0 c001n08" [ style = bold] "lsb_dummy_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] "master_rsc_1_demote_0" -> "master_rsc_1_demoted_0" [ style = bold] "master_rsc_1_demote_0" -> "ocf_msdummy:0_demote_0 c001n01" [ style = bold] "master_rsc_1_demote_0" [ style=bold color="green" fontcolor="orange" ] "master_rsc_1_demoted_0" -> "master_rsc_1_stop_0" [ style = bold] "master_rsc_1_demoted_0" [ style=bold color="green" fontcolor="orange" ] "master_rsc_1_stop_0" -> "master_rsc_1_stopped_0" [ style = bold] "master_rsc_1_stop_0" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold] "master_rsc_1_stop_0" -> "ocf_msdummy:4_stop_0 c001n01" [ style = bold] "master_rsc_1_stop_0" [ style=bold color="green" fontcolor="orange" ] "master_rsc_1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "ocf_192.168.100.181_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_192.168.100.181_start_0 c001n02" -> "group-1_running_0" [ style = bold] "ocf_192.168.100.181_start_0 c001n02" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold] "ocf_192.168.100.181_start_0 c001n02" -> "ocf_192.168.100.181_monitor_5000 c001n02" [ style = bold] "ocf_192.168.100.181_start_0 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_192.168.100.181_stop_0 c001n03" -> "all_stopped" [ style = bold] "ocf_192.168.100.181_stop_0 c001n03" -> "group-1_stopped_0" [ style = bold] "ocf_192.168.100.181_stop_0 c001n03" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold] "ocf_192.168.100.181_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ] "ocf_192.168.100.183_monitor_5000 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_192.168.100.183_start_0 c001n02" -> "group-1_running_0" [ style = bold] "ocf_192.168.100.183_start_0 c001n02" -> "ocf_192.168.100.183_monitor_5000 c001n02" [ style = bold] "ocf_192.168.100.183_start_0 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_192.168.100.183_stop_0 c001n03" -> "all_stopped" [ style = bold] "ocf_192.168.100.183_stop_0 c001n03" -> "group-1_stopped_0" [ style = bold] "ocf_192.168.100.183_stop_0 c001n03" -> "heartbeat_192.168.100.182_stop_0 c001n03" [ style = bold] "ocf_192.168.100.183_stop_0 c001n03" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold] "ocf_192.168.100.183_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:0_demote_0 c001n01" -> "master_rsc_1_demoted_0" [ style = bold] "ocf_msdummy:0_demote_0 c001n01" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold] "ocf_msdummy:0_demote_0 c001n01" [ style=bold color="green" fontcolor="orange" ] "ocf_msdummy:0_stop_0 c001n01" -> "all_stopped" [ style = bold] "ocf_msdummy:0_stop_0 c001n01" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:0_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] -"ocf_msdummy:4_monitor_0 c001n02" -> "ocf_msdummy:4_stop_0 c001n01" [ style = bold] "ocf_msdummy:4_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] -"ocf_msdummy:4_monitor_0 c001n03" -> "ocf_msdummy:4_stop_0 c001n01" [ style = bold] "ocf_msdummy:4_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] -"ocf_msdummy:4_monitor_0 c001n08" -> "ocf_msdummy:4_stop_0 c001n01" [ style = bold] "ocf_msdummy:4_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:4_stop_0 c001n01" -> "all_stopped" [ style = bold] "ocf_msdummy:4_stop_0 c001n01" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:4_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] "ocf_msdummy:5_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:5_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:6_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:6_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:7_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:7_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_start_0 c001n03" -> "rsc_c001n01_monitor_5000 c001n03" [ style = bold] "rsc_c001n01_start_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_stop_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n03" [ style = bold] "rsc_c001n01_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] "stonith 'reboot' c001n01" -> "DcIPaddr_stop_0 c001n01" [ style = bold] "stonith 'reboot' c001n01" -> "DoFencing_stop_0" [ style = bold] "stonith 'reboot' c001n01" -> "child_DoFencing:0_stop_0 c001n01" [ style = bold] "stonith 'reboot' c001n01" -> "master_rsc_1_stop_0" [ style = bold] "stonith 'reboot' c001n01" -> "ocf_msdummy:0_demote_0 c001n01" [ style = bold] "stonith 'reboot' c001n01" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold] "stonith 'reboot' c001n01" -> "ocf_msdummy:4_stop_0 c001n01" [ style = bold] "stonith 'reboot' c001n01" -> "rsc_c001n01_stop_0 c001n01" [ style = bold] "stonith 'reboot' c001n01" -> "stonith_complete" [ style = bold] "stonith 'reboot' c001n01" [ style=bold color="green" fontcolor="black"] "stonith_complete" -> "DcIPaddr_start_0 c001n03" [ style = bold] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold] "stonith_complete" -> "lsb_dummy_start_0 c001n08" [ style = bold] "stonith_complete" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold] "stonith_complete" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold] "stonith_complete" -> "rsc_c001n01_start_0 c001n03" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/master-7.exp b/pengine/test10/master-7.exp index 971949d134..33b5d494f5 100644 --- a/pengine/test10/master-7.exp +++ b/pengine/test10/master-7.exp @@ -1,671 +1,662 @@ - - - - - - - - - diff --git a/pengine/test10/master-9.dot b/pengine/test10/master-9.dot index b6cc5e0583..343bb2dcf2 100644 --- a/pengine/test10/master-9.dot +++ b/pengine/test10/master-9.dot @@ -1,41 +1,40 @@ digraph "g" { "DcIPaddr_monitor_5000 va1" [ style=dashed color="red" fontcolor="black" ] "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:1_stop_0 ibm1" [ style = bold] "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" [ style=bold color="green" fontcolor="orange"] -"child_DoFencing:1_monitor_0 va1" -> "child_DoFencing:1_stop_0 ibm1" [ style = bold] "child_DoFencing:1_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_stop_0 ibm1" -> "DoFencing_stopped_0" [ style = bold] "child_DoFencing:1_stop_0 ibm1" -> "all_stopped" [ style = bold] "child_DoFencing:1_stop_0 ibm1" -> "do_shutdown ibm1" [ style = bold] "child_DoFencing:1_stop_0 ibm1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] "do_shutdown ibm1" [ style=bold color="green" fontcolor="black" ] "heartbeat_127.0.0.12_monitor_5000 va1" [ style=dashed color="red" fontcolor="black" ] "lsb_dummy_monitor_5000 va1" [ style=dashed color="red" fontcolor="black" ] "ocf_127.0.0.11_monitor_5000 va1" [ style=dashed color="red" fontcolor="black" ] "ocf_127.0.0.13_monitor_5000 va1" [ style=dashed color="red" fontcolor="black" ] "ocf_msdummy:0_monitor_6000 va1" [ style=dashed color="red" fontcolor="black"] "ocf_msdummy:1_monitor_5000 va1" [ style=dashed color="red" fontcolor="black" ] "ocf_msdummy:2_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:2_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:3_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:3_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:4_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:4_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:5_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:5_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:6_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:6_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:7_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:7_monitor_0 va1" [ style=bold color="green" fontcolor="black" ] "rsc_ibm1_monitor_5000 va1" [ style=dashed color="red" fontcolor="black" ] "rsc_sgi2_monitor_5000 va1" [ style=dashed color="red" fontcolor="black" ] "rsc_test02_monitor_5000 va1" [ style=dashed color="red" fontcolor="black" ] "rsc_va1_monitor_5000 va1" [ style=dashed color="red" fontcolor="black" ] } diff --git a/pengine/test10/master-9.exp b/pengine/test10/master-9.exp index 51ab23e434..e845751d35 100644 --- a/pengine/test10/master-9.exp +++ b/pengine/test10/master-9.exp @@ -1,222 +1,219 @@ - - - diff --git a/pengine/test10/migrate-3.dot b/pengine/test10/migrate-3.dot index 7b6650310b..a049b5b278 100644 --- a/pengine/test10/migrate-3.dot +++ b/pengine/test10/migrate-3.dot @@ -1,10 +1,9 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc3_monitor_0 node2" -> "rsc3_start_0 node2" [ style = bold] -"rsc3_monitor_0 node2" -> "rsc3_stop_0 node1" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_stop_0 node1" -> "all_stopped" [ style = bold] "rsc3_stop_0 node1" -> "rsc3_start_0 node2" [ style = bold] "rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/migrate-3.exp b/pengine/test10/migrate-3.exp index 1aeb422ca6..6e8b041611 100644 --- a/pengine/test10/migrate-3.exp +++ b/pengine/test10/migrate-3.exp @@ -1,53 +1,49 @@ - - - - - + diff --git a/pengine/test10/notify-3.dot b/pengine/test10/notify-3.dot index bf0d8af627..26b489932d 100644 --- a/pengine/test10/notify-3.dot +++ b/pengine/test10/notify-3.dot @@ -1,85 +1,84 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc1:0_monitor_0 node2" -> "rsc1_start_0" [ style = bold] "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_running_0" [ style = bold] "child_rsc1:0_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_post_notify_stop_0 node1" -> "rsc1_confirmed-post_notify_stopped_0" [ style = bold] "child_rsc1:0_post_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_pre_notify_start_0 node1" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold] "child_rsc1:0_pre_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:0_pre_notify_stop_0 node1" -> "rsc1_confirmed-pre_notify_stop_0" [ style = bold] "child_rsc1:0_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node1" -> "child_rsc1:1_stop_0 node2" [ style = bold] "child_rsc1:1_monitor_0 node1" -> "rsc1_start_0" [ style = bold] "child_rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_post_notify_start_0 node1" -> "rsc1_confirmed-post_notify_running_0" [ style = bold] "child_rsc1:1_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_pre_notify_stop_0 node2" -> "rsc1_confirmed-pre_notify_stop_0" [ style = bold] "child_rsc1:1_pre_notify_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_start_0 node1" -> "rsc1_running_0" [ style = bold] "child_rsc1:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_stop_0 node2" -> "all_stopped" [ style = bold] "child_rsc1:1_stop_0 node2" -> "child_rsc1:1_start_0 node1" [ style = bold] "child_rsc1:1_stop_0 node2" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"child_rsc2:0_monitor_0 node2" -> "child_rsc2:0_stop_0 node1" [ style = bold] "child_rsc2:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_pre_notify_stop_0 node1" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold] "child_rsc2:0_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:0_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc2:0_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc2:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "rsc1_confirmed-post_notify_stopped_0" -> "rsc1_pre_notify_start_0" [ style = bold] "rsc1_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-pre_notify_start_0" -> "rsc1_post_notify_running_0" [ style = bold] "rsc1_confirmed-pre_notify_start_0" -> "rsc1_start_0" [ style = bold] "rsc1_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_confirmed-pre_notify_stop_0" -> "rsc1_post_notify_stopped_0" [ style = bold] "rsc1_confirmed-pre_notify_stop_0" -> "rsc1_stop_0" [ style = bold] "rsc1_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_post_notify_running_0" -> "child_rsc1:0_post_notify_start_0 node1" [ style = bold] "rsc1_post_notify_running_0" -> "child_rsc1:1_post_notify_start_0 node1" [ style = bold] "rsc1_post_notify_running_0" -> "rsc1_confirmed-post_notify_running_0" [ style = bold] "rsc1_post_notify_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_post_notify_stopped_0" -> "child_rsc1:0_post_notify_stop_0 node1" [ style = bold] "rsc1_post_notify_stopped_0" -> "rsc1_confirmed-post_notify_stopped_0" [ style = bold] "rsc1_post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_pre_notify_start_0" -> "child_rsc1:0_pre_notify_start_0 node1" [ style = bold] "rsc1_pre_notify_start_0" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold] "rsc1_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_pre_notify_stop_0" -> "child_rsc1:0_pre_notify_stop_0 node1" [ style = bold] "rsc1_pre_notify_stop_0" -> "child_rsc1:1_pre_notify_stop_0 node2" [ style = bold] "rsc1_pre_notify_stop_0" -> "rsc1_confirmed-pre_notify_stop_0" [ style = bold] "rsc1_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_running_0" -> "rsc1_post_notify_running_0" [ style = bold] "rsc1_running_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_start_0" -> "child_rsc1:1_start_0 node1" [ style = bold] "rsc1_start_0" -> "rsc1_running_0" [ style = bold] "rsc1_start_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stop_0" -> "child_rsc1:1_stop_0 node2" [ style = bold] "rsc1_stop_0" -> "rsc1_stopped_0" [ style = bold] "rsc1_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_stopped_0" -> "rsc1_post_notify_stopped_0" [ style = bold] "rsc1_stopped_0" -> "rsc1_start_0" [ style = bold] "rsc1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "rsc2_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_confirmed-pre_notify_stop_0" -> "rsc2_post_notify_stopped_0" [ style = bold] "rsc2_confirmed-pre_notify_stop_0" -> "rsc2_stop_0" [ style = bold] "rsc2_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_post_notify_stopped_0" -> "rsc2_confirmed-post_notify_stopped_0" [ style = bold] "rsc2_post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_pre_notify_stop_0" -> "child_rsc2:0_pre_notify_stop_0 node1" [ style = bold] "rsc2_pre_notify_stop_0" -> "rsc2_confirmed-pre_notify_stop_0" [ style = bold] "rsc2_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stop_0" -> "child_rsc2:0_stop_0 node1" [ style = bold] "rsc2_stop_0" -> "rsc2_stopped_0" [ style = bold] "rsc2_stop_0" [ style=bold color="green" fontcolor="orange" ] "rsc2_stopped_0" -> "rsc2_post_notify_stopped_0" [ style = bold] "rsc2_stopped_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/notify-3.exp b/pengine/test10/notify-3.exp index 20028dd862..fb96109949 100644 --- a/pengine/test10/notify-3.exp +++ b/pengine/test10/notify-3.exp @@ -1,464 +1,461 @@ - - - diff --git a/pengine/test10/novell-252693-3.dot b/pengine/test10/novell-252693-3.dot index 925ff92833..e26b1649b6 100644 --- a/pengine/test10/novell-252693-3.dot +++ b/pengine/test10/novell-252693-3.dot @@ -1,157 +1,156 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "configstoreclone:0_post_notify_start_0 node2" -> "configstorecloneset_confirmed-post_notify_running_0" [ style = bold] "configstoreclone:0_post_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] "configstoreclone:0_pre_notify_start_0 node2" -> "configstorecloneset_confirmed-pre_notify_start_0" [ style = bold] "configstoreclone:0_pre_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] "configstoreclone:1_monitor_0 node1" -> "configstorecloneset_start_0" [ style = bold] "configstoreclone:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "configstoreclone:1_monitor_20000 node1" [ style=bold color="green" fontcolor="black" ] "configstoreclone:1_post_notify_start_0 node1" -> "configstorecloneset_confirmed-post_notify_running_0" [ style = bold] "configstoreclone:1_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "configstoreclone:1_start_0 node1" -> "configstoreclone:1_monitor_20000 node1" [ style = bold] "configstoreclone:1_start_0 node1" -> "configstorecloneset_running_0" [ style = bold] "configstoreclone:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "configstorecloneset_confirmed-post_notify_running_0" -> "configstoreclone:1_monitor_20000 node1" [ style = bold] "configstorecloneset_confirmed-post_notify_running_0" -> "sles10_migrate_to_0 node2" [ style = bold] "configstorecloneset_confirmed-post_notify_running_0" -> "sles10_start_0 node1" [ style = bold] "configstorecloneset_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange" ] "configstorecloneset_confirmed-pre_notify_start_0" -> "configstorecloneset_post_notify_running_0" [ style = bold] "configstorecloneset_confirmed-pre_notify_start_0" -> "configstorecloneset_start_0" [ style = bold] "configstorecloneset_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "configstorecloneset_post_notify_running_0" -> "configstoreclone:0_post_notify_start_0 node2" [ style = bold] "configstorecloneset_post_notify_running_0" -> "configstoreclone:1_post_notify_start_0 node1" [ style = bold] "configstorecloneset_post_notify_running_0" -> "configstorecloneset_confirmed-post_notify_running_0" [ style = bold] "configstorecloneset_post_notify_running_0" [ style=bold color="green" fontcolor="orange" ] "configstorecloneset_pre_notify_start_0" -> "configstoreclone:0_pre_notify_start_0 node2" [ style = bold] "configstorecloneset_pre_notify_start_0" -> "configstorecloneset_confirmed-pre_notify_start_0" [ style = bold] "configstorecloneset_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "configstorecloneset_running_0" -> "configstorecloneset_post_notify_running_0" [ style = bold] "configstorecloneset_running_0" [ style=bold color="green" fontcolor="orange" ] "configstorecloneset_start_0" -> "configstoreclone:1_start_0 node1" [ style = bold] "configstorecloneset_start_0" -> "configstorecloneset_running_0" [ style = bold] "configstorecloneset_start_0" [ style=bold color="green" fontcolor="orange" ] "evmsclone:0_post_notify_start_0 node2" -> "evmscloneset_confirmed-post_notify_running_0" [ style = bold] "evmsclone:0_post_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] "evmsclone:0_pre_notify_start_0 node2" -> "evmscloneset_confirmed-pre_notify_start_0" [ style = bold] "evmsclone:0_pre_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] "evmsclone:1_monitor_0 node1" -> "evmscloneset_start_0" [ style = bold] "evmsclone:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "evmsclone:1_post_notify_start_0 node1" -> "evmscloneset_confirmed-post_notify_running_0" [ style = bold] "evmsclone:1_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "evmsclone:1_start_0 node1" -> "evmscloneset_running_0" [ style = bold] "evmsclone:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "evmscloneset_confirmed-post_notify_running_0" -> "configstorecloneset_start_0" [ style = bold] "evmscloneset_confirmed-post_notify_running_0" -> "imagestorecloneset_start_0" [ style = bold] "evmscloneset_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange" ] "evmscloneset_confirmed-pre_notify_start_0" -> "evmscloneset_post_notify_running_0" [ style = bold] "evmscloneset_confirmed-pre_notify_start_0" -> "evmscloneset_start_0" [ style = bold] "evmscloneset_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "evmscloneset_post_notify_running_0" -> "evmsclone:0_post_notify_start_0 node2" [ style = bold] "evmscloneset_post_notify_running_0" -> "evmsclone:1_post_notify_start_0 node1" [ style = bold] "evmscloneset_post_notify_running_0" -> "evmscloneset_confirmed-post_notify_running_0" [ style = bold] "evmscloneset_post_notify_running_0" [ style=bold color="green" fontcolor="orange" ] "evmscloneset_pre_notify_start_0" -> "evmsclone:0_pre_notify_start_0 node2" [ style = bold] "evmscloneset_pre_notify_start_0" -> "evmscloneset_confirmed-pre_notify_start_0" [ style = bold] "evmscloneset_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "evmscloneset_running_0" -> "evmscloneset_post_notify_running_0" [ style = bold] "evmscloneset_running_0" [ style=bold color="green" fontcolor="orange" ] "evmscloneset_start_0" -> "evmsclone:1_start_0 node1" [ style = bold] "evmscloneset_start_0" -> "evmscloneset_running_0" [ style = bold] "evmscloneset_start_0" [ style=bold color="green" fontcolor="orange" ] "evmsdclone:1_monitor_0 node1" -> "evmsdcloneset_start_0" [ style = bold] "evmsdclone:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "evmsdclone:1_monitor_5000 node1" [ style=bold color="green" fontcolor="black" ] "evmsdclone:1_start_0 node1" -> "evmsdclone:1_monitor_5000 node1" [ style = bold] "evmsdclone:1_start_0 node1" -> "evmsdcloneset_running_0" [ style = bold] "evmsdclone:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "evmsdcloneset_running_0" -> "evmscloneset_start_0" [ style = bold] "evmsdcloneset_running_0" [ style=bold color="green" fontcolor="orange" ] "evmsdcloneset_start_0" -> "evmsdclone:1_start_0 node1" [ style = bold] "evmsdcloneset_start_0" -> "evmsdcloneset_running_0" [ style = bold] "evmsdcloneset_start_0" [ style=bold color="green" fontcolor="orange" ] -"imagestoreclone:0_monitor_0 node1" -> "imagestoreclone:0_stop_0 node2" [ style = bold] "imagestoreclone:0_monitor_0 node1" -> "imagestorecloneset_start_0" [ style = bold] "imagestoreclone:0_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:0_monitor_20000 node1" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:0_post_notify_start_0 node1" -> "imagestorecloneset_confirmed-post_notify_running_0" [ style = bold] "imagestoreclone:0_post_notify_start_0 node1" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:0_pre_notify_stop_0 node2" -> "imagestorecloneset_confirmed-pre_notify_stop_0" [ style = bold] "imagestoreclone:0_pre_notify_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:0_start_0 node1" -> "imagestoreclone:0_monitor_20000 node1" [ style = bold] "imagestoreclone:0_start_0 node1" -> "imagestorecloneset_running_0" [ style = bold] "imagestoreclone:0_start_0 node1" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:0_stop_0 node2" -> "all_stopped" [ style = bold] "imagestoreclone:0_stop_0 node2" -> "imagestoreclone:0_start_0 node1" [ style = bold] "imagestoreclone:0_stop_0 node2" -> "imagestorecloneset_stopped_0" [ style = bold] "imagestoreclone:0_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:1_monitor_20000 node2" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:1_post_notify_start_0 node2" -> "imagestorecloneset_confirmed-post_notify_running_0" [ style = bold] "imagestoreclone:1_post_notify_start_0 node2" [ style=bold color="green" fontcolor="black" ] "imagestoreclone:1_start_0 node2" -> "imagestoreclone:1_monitor_20000 node2" [ style = bold] "imagestoreclone:1_start_0 node2" -> "imagestorecloneset_running_0" [ style = bold] "imagestoreclone:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "imagestorecloneset_confirmed-post_notify_running_0" -> "imagestoreclone:0_monitor_20000 node1" [ style = bold] "imagestorecloneset_confirmed-post_notify_running_0" -> "imagestoreclone:1_monitor_20000 node2" [ style = bold] "imagestorecloneset_confirmed-post_notify_running_0" -> "sles10_migrate_to_0 node2" [ style = bold] "imagestorecloneset_confirmed-post_notify_running_0" -> "sles10_start_0 node1" [ style = bold] "imagestorecloneset_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "imagestorecloneset_confirmed-post_notify_stopped_0" -> "imagestorecloneset_pre_notify_start_0" [ style = bold] "imagestorecloneset_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_confirmed-pre_notify_start_0" -> "imagestorecloneset_post_notify_running_0" [ style = bold] "imagestorecloneset_confirmed-pre_notify_start_0" -> "imagestorecloneset_start_0" [ style = bold] "imagestorecloneset_confirmed-pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_confirmed-pre_notify_stop_0" -> "imagestorecloneset_post_notify_stopped_0" [ style = bold] "imagestorecloneset_confirmed-pre_notify_stop_0" -> "imagestorecloneset_stop_0" [ style = bold] "imagestorecloneset_confirmed-pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_post_notify_running_0" -> "imagestoreclone:0_post_notify_start_0 node1" [ style = bold] "imagestorecloneset_post_notify_running_0" -> "imagestoreclone:1_post_notify_start_0 node2" [ style = bold] "imagestorecloneset_post_notify_running_0" -> "imagestorecloneset_confirmed-post_notify_running_0" [ style = bold] "imagestorecloneset_post_notify_running_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_post_notify_stopped_0" -> "imagestorecloneset_confirmed-post_notify_stopped_0" [ style = bold] "imagestorecloneset_post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_pre_notify_start_0" -> "imagestorecloneset_confirmed-pre_notify_start_0" [ style = bold] "imagestorecloneset_pre_notify_start_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_pre_notify_stop_0" -> "imagestoreclone:0_pre_notify_stop_0 node2" [ style = bold] "imagestorecloneset_pre_notify_stop_0" -> "imagestorecloneset_confirmed-pre_notify_stop_0" [ style = bold] "imagestorecloneset_pre_notify_stop_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_running_0" -> "imagestorecloneset_post_notify_running_0" [ style = bold] "imagestorecloneset_running_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_start_0" -> "imagestoreclone:0_start_0 node1" [ style = bold] "imagestorecloneset_start_0" -> "imagestoreclone:1_start_0 node2" [ style = bold] "imagestorecloneset_start_0" -> "imagestorecloneset_running_0" [ style = bold] "imagestorecloneset_start_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_stop_0" -> "imagestoreclone:0_stop_0 node2" [ style = bold] "imagestorecloneset_stop_0" -> "imagestorecloneset_stopped_0" [ style = bold] "imagestorecloneset_stop_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_stopped_0" -> "imagestorecloneset_post_notify_stopped_0" [ style = bold] "imagestorecloneset_stopped_0" -> "imagestorecloneset_start_0" [ style = bold] "imagestorecloneset_stopped_0" [ style=bold color="green" fontcolor="orange" ] "sles10_migrate_from_0 node1" -> "sles10_start_0 node1" [ style = bold] "sles10_migrate_from_0 node1" -> "sles10_stop_0 node2" [ style = bold] "sles10_migrate_from_0 node1" [ style=bold color="green" fontcolor="black"] "sles10_migrate_to_0 node2" -> "sles10_migrate_from_0 node1" [ style = bold] "sles10_migrate_to_0 node2" [ style=bold color="green" fontcolor="black"] "sles10_monitor_0 node1" -> "sles10_migrate_to_0 node2" [ style = bold] "sles10_monitor_0 node1" -> "sles10_start_0 node1" [ style = bold] "sles10_monitor_0 node1" -> "sles10_stop_0 node2" [ style = bold] "sles10_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "sles10_monitor_10000 node1" [ style=bold color="green" fontcolor="black" ] "sles10_start_0 node1" -> "sles10_monitor_10000 node1" [ style = bold] "sles10_start_0 node1" [ style=bold color="green" fontcolor="orange"] "sles10_stop_0 node2" -> "all_stopped" [ style = bold] "sles10_stop_0 node2" -> "imagestorecloneset_stop_0" [ style = dashed] "sles10_stop_0 node2" -> "sles10_start_0 node1" [ style = bold] "sles10_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "stonithclone:1_monitor_0 node1" -> "stonithcloneset_start_0" [ style = bold] "stonithclone:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "stonithclone:1_monitor_5000 node1" [ style=bold color="green" fontcolor="black" ] "stonithclone:1_start_0 node1" -> "stonithclone:1_monitor_5000 node1" [ style = bold] "stonithclone:1_start_0 node1" -> "stonithcloneset_running_0" [ style = bold] "stonithclone:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "stonithcloneset_running_0" [ style=bold color="green" fontcolor="orange" ] "stonithcloneset_start_0" -> "stonithclone:1_start_0 node1" [ style = bold] "stonithcloneset_start_0" -> "stonithcloneset_running_0" [ style = bold] "stonithcloneset_start_0" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/novell-252693-3.exp b/pengine/test10/novell-252693-3.exp index be4df360ec..9c97271367 100644 --- a/pengine/test10/novell-252693-3.exp +++ b/pengine/test10/novell-252693-3.exp @@ -1,853 +1,850 @@ - - - diff --git a/pengine/test10/params-2.dot b/pengine/test10/params-2.dot index 6a23fd79f7..67f2873631 100644 --- a/pengine/test10/params-2.dot +++ b/pengine/test10/params-2.dot @@ -1,30 +1,28 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "do_shutdown node1" [ style=bold color="green" fontcolor="black" ] -"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc1_monitor_0 node3" -> "rsc1_stop_0 node1" [ style = bold] "rsc1_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "do_shutdown node1" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_delete_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc2_delete_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node3" -> "rsc2_start_0 node2" [ style = bold] "rsc2_monitor_0 node3" -> "rsc2_stop_0 node2" [ style = bold] "rsc2_monitor_0 node3" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_stop_0 node2" -> "all_stopped" [ style = bold] "rsc2_stop_0 node2" -> "rsc2_delete_0 node2" [ style = bold] "rsc2_stop_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_delete_0 node3" -> "rsc3_start_0 node3" [ style = bold] "rsc3_delete_0 node3" [ style=bold color="green" fontcolor="black"] "rsc3_monitor_0 node1" -> "rsc3_start_0 node3" [ style = bold] "rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3_monitor_0 node2" -> "rsc3_start_0 node3" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_start_0 node3" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/params-2.exp b/pengine/test10/params-2.exp index 94f3773a69..3cbfe331ec 100644 --- a/pengine/test10/params-2.exp +++ b/pengine/test10/params-2.exp @@ -1,179 +1,172 @@ - - - - - - - - + diff --git a/pengine/test10/params-2.summary b/pengine/test10/params-2.summary index 1e73e77f79..97510f68b6 100644 --- a/pengine/test10/params-2.summary +++ b/pengine/test10/params-2.summary @@ -1,37 +1,37 @@ Current cluster status: Online: [ node1 node2 node3 ] rsc1 (lsb:apache): Started node1 rsc2 (lsb:apache): Started node2 rsc3 (lsb:apache): Stopped Transition Summary: * Shutdown node1 * Stop rsc1 (node1) * Restart rsc2 ( node2 ) * Start rsc3 (node3) Executing cluster transition: + * Resource action: rsc1 stop on node1 * Resource action: rsc1 monitor on node3 * Resource action: rsc1 monitor on node2 * Resource action: rsc2 monitor on node3 * Resource action: rsc2 monitor on node1 * Resource action: rsc2 stop on node2 * Resource action: rsc3 monitor on node2 * Resource action: rsc3 monitor on node1 * Resource action: rsc3 delete on node3 - * Resource action: rsc1 stop on node1 - * Resource action: rsc2 delete on node2 - * Resource action: rsc3 start on node3 * Cluster action: do_shutdown on node1 * Pseudo action: all_stopped + * Resource action: rsc2 delete on node2 + * Resource action: rsc3 start on node3 * Resource action: rsc2 start on node2 Revised cluster status: Online: [ node1 node2 node3 ] rsc1 (lsb:apache): Stopped rsc2 (lsb:apache): Started node2 rsc3 (lsb:apache): Started node3 diff --git a/pengine/test10/rec-rsc-1.dot b/pengine/test10/rec-rsc-1.dot index 9c4464847c..f3755dcdd8 100644 --- a/pengine/test10/rec-rsc-1.dot +++ b/pengine/test10/rec-rsc-1.dot @@ -1,10 +1,9 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold] -"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/rec-rsc-1.exp b/pengine/test10/rec-rsc-1.exp index f3db70c5f5..32a3da6c63 100644 --- a/pengine/test10/rec-rsc-1.exp +++ b/pengine/test10/rec-rsc-1.exp @@ -1,53 +1,49 @@ - - - - - + diff --git a/pengine/test10/rec-rsc-2.dot b/pengine/test10/rec-rsc-2.dot index d26a4cbe48..88b09dfb00 100644 --- a/pengine/test10/rec-rsc-2.dot +++ b/pengine/test10/rec-rsc-2.dot @@ -1,12 +1,11 @@ digraph "g" { "Cancel rsc1_monitor_1 node1" [ style=bold color="green" fontcolor="black" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "rsc1_start_0 node1" [ style = bold] -"rsc1_monitor_0 node2" -> "rsc1_stop_0 node1" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_stop_0 node1" -> "Cancel rsc1_monitor_1 node1" [ style = bold] "rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_start_0 node1" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/rec-rsc-2.exp b/pengine/test10/rec-rsc-2.exp index 192b1ecc7a..1d5bad7487 100644 --- a/pengine/test10/rec-rsc-2.exp +++ b/pengine/test10/rec-rsc-2.exp @@ -1,66 +1,62 @@ - - - - - + diff --git a/pengine/test10/rec-rsc-5.dot b/pengine/test10/rec-rsc-5.dot index adc8b9f757..7a20e74967 100644 --- a/pengine/test10/rec-rsc-5.dot +++ b/pengine/test10/rec-rsc-5.dot @@ -1,29 +1,28 @@ digraph "g" { "all_stopped" -> "stonith-1_start_0 node1" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node1" -> "rsc1_start_0 node1" [ style = bold] -"rsc1_monitor_0 node1" -> "rsc1_stop_0 node2" [ style = bold] "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" -> "rsc1_start_0 node1" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="orange" ] "rsc2_monitor_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc2_monitor_0 node1" -> "rsc2_stop_0 node2" [ style = bold] "rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_stop_0 node2" -> "all_stopped" [ style = bold] "rsc2_stop_0 node2" -> "rsc2_start_0 node1" [ style = bold] "rsc2_stop_0 node2" [ style=bold color="green" fontcolor="orange" ] "stonith 'reboot' node2" -> "rsc1_stop_0 node2" [ style = bold] "stonith 'reboot' node2" -> "rsc2_stop_0 node2" [ style = bold] "stonith 'reboot' node2" -> "stonith_complete" [ style = bold] "stonith 'reboot' node2" [ style=bold color="green" fontcolor="black"] "stonith-1_monitor_0 node1" -> "stonith-1_start_0 node1" [ style = bold] "stonith-1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "rsc1_start_0 node1" [ style = bold] "stonith_complete" -> "rsc2_start_0 node1" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/rec-rsc-5.exp b/pengine/test10/rec-rsc-5.exp index b1f151b0ce..3092adfc9b 100644 --- a/pengine/test10/rec-rsc-5.exp +++ b/pengine/test10/rec-rsc-5.exp @@ -1,154 +1,151 @@ - - - diff --git a/pengine/test10/target-1.dot b/pengine/test10/target-1.dot index 9d8e5bc6d4..db6f64fd12 100644 --- a/pengine/test10/target-1.dot +++ b/pengine/test10/target-1.dot @@ -1,20 +1,17 @@ digraph "g" { "DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc_c001n01_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] -"rsc_c001n08_monitor_0 c001n01" -> "rsc_c001n08_stop_0 c001n08" [ style = bold] "rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] -"rsc_c001n08_monitor_0 c001n02" -> "rsc_c001n08_stop_0 c001n08" [ style = bold] "rsc_c001n08_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] -"rsc_c001n08_monitor_0 c001n03" -> "rsc_c001n08_stop_0 c001n08" [ style = bold] "rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_stop_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n08_stop_0 c001n08" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/target-1.exp b/pengine/test10/target-1.exp index 70d7f75a4c..f4e79e72a0 100644 --- a/pengine/test10/target-1.exp +++ b/pengine/test10/target-1.exp @@ -1,142 +1,132 @@ - - - - - - - - - - - + diff --git a/pengine/test10/target-1.summary b/pengine/test10/target-1.summary index a94241eec6..12bbe4e049 100644 --- a/pengine/test10/target-1.summary +++ b/pengine/test10/target-1.summary @@ -1,41 +1,41 @@ 1 of 5 resources DISABLED and 0 BLOCKED from being started due to failures Current cluster status: Online: [ c001n01 c001n02 c001n03 c001n08 ] DcIPaddr (ocf::heartbeat:IPaddr): Started c001n02 rsc_c001n08 (ocf::heartbeat:IPaddr): Started c001n08 ( disabled ) rsc_c001n02 (ocf::heartbeat:IPaddr): Started c001n02 Master/Slave Set: promoteme [rsc_c001n03] Slaves: [ c001n03 ] rsc_c001n01 (ocf::heartbeat:IPaddr): Started c001n01 Transition Summary: * Stop rsc_c001n08 (c001n08) Executing cluster transition: * Resource action: DcIPaddr monitor on c001n08 * Resource action: DcIPaddr monitor on c001n03 * Resource action: DcIPaddr monitor on c001n01 + * Resource action: rsc_c001n08 stop on c001n08 * Resource action: rsc_c001n08 monitor on c001n03 * Resource action: rsc_c001n08 monitor on c001n02 * Resource action: rsc_c001n08 monitor on c001n01 * Resource action: rsc_c001n02 monitor on c001n08 * Resource action: rsc_c001n02 monitor on c001n03 * Resource action: rsc_c001n02 monitor on c001n01 * Resource action: rsc_c001n01 monitor on c001n08 * Resource action: rsc_c001n01 monitor on c001n03 * Resource action: rsc_c001n01 monitor on c001n02 - * Resource action: rsc_c001n08 stop on c001n08 * Pseudo action: all_stopped Revised cluster status: Online: [ c001n01 c001n02 c001n03 c001n08 ] DcIPaddr (ocf::heartbeat:IPaddr): Started c001n02 rsc_c001n08 (ocf::heartbeat:IPaddr): Stopped ( disabled ) rsc_c001n02 (ocf::heartbeat:IPaddr): Started c001n02 Master/Slave Set: promoteme [rsc_c001n03] Slaves: [ c001n03 ] rsc_c001n01 (ocf::heartbeat:IPaddr): Started c001n01 diff --git a/pengine/test10/target-2.dot b/pengine/test10/target-2.dot index f151c43c39..55b9d85bc3 100644 --- a/pengine/test10/target-2.dot +++ b/pengine/test10/target-2.dot @@ -1,23 +1,20 @@ digraph "g" { "DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc_c001n01_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] -"rsc_c001n08_monitor_0 c001n01" -> "rsc_c001n08_stop_0 c001n08" [ style = bold] "rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] -"rsc_c001n08_monitor_0 c001n02" -> "rsc_c001n08_stop_0 c001n08" [ style = bold] "rsc_c001n08_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] -"rsc_c001n08_monitor_0 c001n03" -> "rsc_c001n08_stop_0 c001n08" [ style = bold] "rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_stop_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n08_stop_0 c001n08" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/target-2.exp b/pengine/test10/target-2.exp index 63a8eec088..6ced2e2273 100644 --- a/pengine/test10/target-2.exp +++ b/pengine/test10/target-2.exp @@ -1,169 +1,159 @@ - - - - - - - - - - - + diff --git a/pengine/test10/target-2.summary b/pengine/test10/target-2.summary index bcefbef37e..a440494274 100644 --- a/pengine/test10/target-2.summary +++ b/pengine/test10/target-2.summary @@ -1,42 +1,42 @@ 1 of 5 resources DISABLED and 0 BLOCKED from being started due to failures Current cluster status: Online: [ c001n01 c001n02 c001n03 c001n08 ] DcIPaddr (ocf::heartbeat:IPaddr): Started c001n02 rsc_c001n08 (ocf::heartbeat:IPaddr): Started c001n08 ( disabled ) rsc_c001n02 (ocf::heartbeat:IPaddr): Started c001n02 rsc_c001n03 (ocf::heartbeat:IPaddr): Started c001n03 rsc_c001n01 (ocf::heartbeat:IPaddr): Started c001n01 Transition Summary: * Stop rsc_c001n08 (c001n08) Executing cluster transition: * Resource action: DcIPaddr monitor on c001n08 * Resource action: DcIPaddr monitor on c001n03 * Resource action: DcIPaddr monitor on c001n01 + * Resource action: rsc_c001n08 stop on c001n08 * Resource action: rsc_c001n08 monitor on c001n03 * Resource action: rsc_c001n08 monitor on c001n02 * Resource action: rsc_c001n08 monitor on c001n01 * Resource action: rsc_c001n02 monitor on c001n08 * Resource action: rsc_c001n02 monitor on c001n03 * Resource action: rsc_c001n02 monitor on c001n01 * Resource action: rsc_c001n03 monitor on c001n08 * Resource action: rsc_c001n03 monitor on c001n02 * Resource action: rsc_c001n03 monitor on c001n01 * Resource action: rsc_c001n01 monitor on c001n08 * Resource action: rsc_c001n01 monitor on c001n03 * Resource action: rsc_c001n01 monitor on c001n02 - * Resource action: rsc_c001n08 stop on c001n08 * Pseudo action: all_stopped Revised cluster status: Online: [ c001n01 c001n02 c001n03 c001n08 ] DcIPaddr (ocf::heartbeat:IPaddr): Started c001n02 rsc_c001n08 (ocf::heartbeat:IPaddr): Stopped ( disabled ) rsc_c001n02 (ocf::heartbeat:IPaddr): Started c001n02 rsc_c001n03 (ocf::heartbeat:IPaddr): Started c001n03 rsc_c001n01 (ocf::heartbeat:IPaddr): Started c001n01 diff --git a/pengine/test10/unrunnable-1.dot b/pengine/test10/unrunnable-1.dot index 536864d122..3e78165a10 100644 --- a/pengine/test10/unrunnable-1.dot +++ b/pengine/test10/unrunnable-1.dot @@ -1,30 +1,29 @@ digraph "g" { "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] "DoFencing_stop_0" -> "DoFencing_stopped_0" [ style = bold] "DoFencing_stop_0" -> "child_DoFencing:1_stop_0 c001n02" [ style = dashed] "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] "all_stopped" [ style=dashed color="red" fontcolor="orange"] "child_192.168.100.181_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_192.168.100.181_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] "child_192.168.100.182_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_192.168.100.182_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] "child_192.168.100.183_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_192.168.100.183_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] -"child_DoFencing:1_monitor_0 c001n03" -> "child_DoFencing:1_stop_0 c001n02" [ style = dashed] "child_DoFencing:1_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = dashed] "child_DoFencing:1_stop_0 c001n02" -> "all_stopped" [ style = dashed] "child_DoFencing:1_stop_0 c001n02" [ style=dashed color="red" fontcolor="black" ] "child_DoFencing:2_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n01_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] "rsc_c001n03_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] "rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] } diff --git a/pengine/test10/whitebox-fail1.dot b/pengine/test10/whitebox-fail1.dot index 3cf4f7689d..bfff4bfb99 100644 --- a/pengine/test10/whitebox-fail1.dot +++ b/pengine/test10/whitebox-fail1.dot @@ -1,61 +1,60 @@ digraph "g" { "A_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"] "B_monitor_0 lxc2" -> "B_start_0 lxc1" [ style = bold] -"B_monitor_0 lxc2" -> "B_stop_0 lxc1" [ style = bold] "B_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"] "B_monitor_10000 lxc1" [ style=bold color="green" fontcolor="black"] "B_start_0 lxc1" -> "B_monitor_10000 lxc1" [ style = bold] "B_start_0 lxc1" [ style=bold color="green" fontcolor="black"] "B_stop_0 lxc1" -> "B_start_0 lxc1" [ style = bold] "B_stop_0 lxc1" -> "all_stopped" [ style = bold] "B_stop_0 lxc1" [ style=bold color="green" fontcolor="orange"] "D_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"] "M-clone_running_0" [ style=bold color="green" fontcolor="orange"] "M-clone_start_0" -> "M-clone_running_0" [ style = bold] "M-clone_start_0" -> "M_start_0 lxc1" [ style = bold] "M-clone_start_0" [ style=bold color="green" fontcolor="orange"] "M-clone_stop_0" -> "M-clone_stopped_0" [ style = bold] "M-clone_stop_0" -> "M_stop_0 lxc1" [ style = bold] "M-clone_stop_0" [ style=bold color="green" fontcolor="orange"] "M-clone_stopped_0" -> "M-clone_start_0" [ style = bold] "M-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] "M_monitor_10000 lxc1" [ style=bold color="green" fontcolor="black"] "M_start_0 lxc1" -> "M-clone_running_0" [ style = bold] "M_start_0 lxc1" -> "M_monitor_10000 lxc1" [ style = bold] "M_start_0 lxc1" [ style=bold color="green" fontcolor="black"] "M_stop_0 lxc1" -> "M-clone_stopped_0" [ style = bold] "M_stop_0 lxc1" -> "M_start_0 lxc1" [ style = bold] "M_stop_0 lxc1" -> "all_stopped" [ style = bold] "M_stop_0 lxc1" [ style=bold color="green" fontcolor="orange"] "all_stopped" [ style=bold color="green" fontcolor="orange"] "container1_start_0 18node2" -> "B_start_0 lxc1" [ style = bold] "container1_start_0 18node2" -> "M_start_0 lxc1" [ style = bold] "container1_start_0 18node2" -> "lxc1_start_0 18node2" [ style = bold] "container1_start_0 18node2" [ style=bold color="green" fontcolor="black"] "container1_stop_0 18node2" -> "all_stopped" [ style = bold] "container1_stop_0 18node2" -> "container1_start_0 18node2" [ style = bold] "container1_stop_0 18node2" -> "stonith 'reboot' lxc1" [ style = bold] "container1_stop_0 18node2" [ style=bold color="green" fontcolor="black"] "lxc1_monitor_30000 18node2" [ style=bold color="green" fontcolor="black"] "lxc1_start_0 18node2" -> "B_monitor_10000 lxc1" [ style = bold] "lxc1_start_0 18node2" -> "B_start_0 lxc1" [ style = bold] "lxc1_start_0 18node2" -> "M_monitor_10000 lxc1" [ style = bold] "lxc1_start_0 18node2" -> "M_start_0 lxc1" [ style = bold] "lxc1_start_0 18node2" -> "lxc1_monitor_30000 18node2" [ style = bold] "lxc1_start_0 18node2" [ style=bold color="green" fontcolor="black"] "lxc1_stop_0 18node2" -> "all_stopped" [ style = bold] "lxc1_stop_0 18node2" -> "container1_stop_0 18node2" [ style = bold] "lxc1_stop_0 18node2" -> "lxc1_start_0 18node2" [ style = bold] "lxc1_stop_0 18node2" [ style=bold color="green" fontcolor="black"] "stonith 'reboot' lxc1" -> "B_stop_0 lxc1" [ style = bold] "stonith 'reboot' lxc1" -> "M-clone_stop_0" [ style = bold] "stonith 'reboot' lxc1" -> "M_stop_0 lxc1" [ style = bold] "stonith 'reboot' lxc1" -> "stonith_complete" [ style = bold] "stonith 'reboot' lxc1" [ style=bold color="green" fontcolor="orange"] "stonith_complete" -> "B_start_0 lxc1" [ style = bold] "stonith_complete" -> "M_start_0 lxc1" [ style = bold] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "container1_start_0 18node2" [ style = bold] "stonith_complete" -> "lxc1_start_0 18node2" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/whitebox-fail1.exp b/pengine/test10/whitebox-fail1.exp index ab739b5fd9..901a1e3023 100644 --- a/pengine/test10/whitebox-fail1.exp +++ b/pengine/test10/whitebox-fail1.exp @@ -1,320 +1,317 @@ - - - diff --git a/pengine/test10/whitebox-fail2.dot b/pengine/test10/whitebox-fail2.dot index 3cf4f7689d..bfff4bfb99 100644 --- a/pengine/test10/whitebox-fail2.dot +++ b/pengine/test10/whitebox-fail2.dot @@ -1,61 +1,60 @@ digraph "g" { "A_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"] "B_monitor_0 lxc2" -> "B_start_0 lxc1" [ style = bold] -"B_monitor_0 lxc2" -> "B_stop_0 lxc1" [ style = bold] "B_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"] "B_monitor_10000 lxc1" [ style=bold color="green" fontcolor="black"] "B_start_0 lxc1" -> "B_monitor_10000 lxc1" [ style = bold] "B_start_0 lxc1" [ style=bold color="green" fontcolor="black"] "B_stop_0 lxc1" -> "B_start_0 lxc1" [ style = bold] "B_stop_0 lxc1" -> "all_stopped" [ style = bold] "B_stop_0 lxc1" [ style=bold color="green" fontcolor="orange"] "D_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"] "M-clone_running_0" [ style=bold color="green" fontcolor="orange"] "M-clone_start_0" -> "M-clone_running_0" [ style = bold] "M-clone_start_0" -> "M_start_0 lxc1" [ style = bold] "M-clone_start_0" [ style=bold color="green" fontcolor="orange"] "M-clone_stop_0" -> "M-clone_stopped_0" [ style = bold] "M-clone_stop_0" -> "M_stop_0 lxc1" [ style = bold] "M-clone_stop_0" [ style=bold color="green" fontcolor="orange"] "M-clone_stopped_0" -> "M-clone_start_0" [ style = bold] "M-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] "M_monitor_10000 lxc1" [ style=bold color="green" fontcolor="black"] "M_start_0 lxc1" -> "M-clone_running_0" [ style = bold] "M_start_0 lxc1" -> "M_monitor_10000 lxc1" [ style = bold] "M_start_0 lxc1" [ style=bold color="green" fontcolor="black"] "M_stop_0 lxc1" -> "M-clone_stopped_0" [ style = bold] "M_stop_0 lxc1" -> "M_start_0 lxc1" [ style = bold] "M_stop_0 lxc1" -> "all_stopped" [ style = bold] "M_stop_0 lxc1" [ style=bold color="green" fontcolor="orange"] "all_stopped" [ style=bold color="green" fontcolor="orange"] "container1_start_0 18node2" -> "B_start_0 lxc1" [ style = bold] "container1_start_0 18node2" -> "M_start_0 lxc1" [ style = bold] "container1_start_0 18node2" -> "lxc1_start_0 18node2" [ style = bold] "container1_start_0 18node2" [ style=bold color="green" fontcolor="black"] "container1_stop_0 18node2" -> "all_stopped" [ style = bold] "container1_stop_0 18node2" -> "container1_start_0 18node2" [ style = bold] "container1_stop_0 18node2" -> "stonith 'reboot' lxc1" [ style = bold] "container1_stop_0 18node2" [ style=bold color="green" fontcolor="black"] "lxc1_monitor_30000 18node2" [ style=bold color="green" fontcolor="black"] "lxc1_start_0 18node2" -> "B_monitor_10000 lxc1" [ style = bold] "lxc1_start_0 18node2" -> "B_start_0 lxc1" [ style = bold] "lxc1_start_0 18node2" -> "M_monitor_10000 lxc1" [ style = bold] "lxc1_start_0 18node2" -> "M_start_0 lxc1" [ style = bold] "lxc1_start_0 18node2" -> "lxc1_monitor_30000 18node2" [ style = bold] "lxc1_start_0 18node2" [ style=bold color="green" fontcolor="black"] "lxc1_stop_0 18node2" -> "all_stopped" [ style = bold] "lxc1_stop_0 18node2" -> "container1_stop_0 18node2" [ style = bold] "lxc1_stop_0 18node2" -> "lxc1_start_0 18node2" [ style = bold] "lxc1_stop_0 18node2" [ style=bold color="green" fontcolor="black"] "stonith 'reboot' lxc1" -> "B_stop_0 lxc1" [ style = bold] "stonith 'reboot' lxc1" -> "M-clone_stop_0" [ style = bold] "stonith 'reboot' lxc1" -> "M_stop_0 lxc1" [ style = bold] "stonith 'reboot' lxc1" -> "stonith_complete" [ style = bold] "stonith 'reboot' lxc1" [ style=bold color="green" fontcolor="orange"] "stonith_complete" -> "B_start_0 lxc1" [ style = bold] "stonith_complete" -> "M_start_0 lxc1" [ style = bold] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "container1_start_0 18node2" [ style = bold] "stonith_complete" -> "lxc1_start_0 18node2" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/whitebox-fail2.exp b/pengine/test10/whitebox-fail2.exp index ab739b5fd9..901a1e3023 100644 --- a/pengine/test10/whitebox-fail2.exp +++ b/pengine/test10/whitebox-fail2.exp @@ -1,320 +1,317 @@ - - - diff --git a/pengine/test10/whitebox-imply-stop-on-fence.dot b/pengine/test10/whitebox-imply-stop-on-fence.dot index 1c41ad25f2..7b536ea55a 100644 --- a/pengine/test10/whitebox-imply-stop-on-fence.dot +++ b/pengine/test10/whitebox-imply-stop-on-fence.dot @@ -1,119 +1,111 @@ digraph "g" { "R-lxc-01_kiff-01_monitor_10000 kiff-02" [ style=bold color="green" fontcolor="black"] "R-lxc-01_kiff-01_start_0 kiff-02" -> "R-lxc-01_kiff-01_monitor_10000 kiff-02" [ style = bold] "R-lxc-01_kiff-01_start_0 kiff-02" -> "lxc-01_kiff-01_start_0 kiff-02" [ style = bold] "R-lxc-01_kiff-01_start_0 kiff-02" -> "vm-fs_start_0 lxc-01_kiff-01" [ style = bold] "R-lxc-01_kiff-01_start_0 kiff-02" [ style=bold color="green" fontcolor="black"] "R-lxc-01_kiff-01_stop_0 kiff-01" -> "R-lxc-01_kiff-01_start_0 kiff-02" [ style = bold] "R-lxc-01_kiff-01_stop_0 kiff-01" -> "all_stopped" [ style = bold] "R-lxc-01_kiff-01_stop_0 kiff-01" -> "shared0-clone_stop_0" [ style = bold] "R-lxc-01_kiff-01_stop_0 kiff-01" [ style=bold color="green" fontcolor="orange"] "R-lxc-02_kiff-01_monitor_10000 kiff-02" [ style=bold color="green" fontcolor="black"] "R-lxc-02_kiff-01_start_0 kiff-02" -> "R-lxc-02_kiff-01_monitor_10000 kiff-02" [ style = bold] "R-lxc-02_kiff-01_start_0 kiff-02" -> "lxc-02_kiff-01_start_0 kiff-02" [ style = bold] "R-lxc-02_kiff-01_start_0 kiff-02" [ style=bold color="green" fontcolor="black"] "R-lxc-02_kiff-01_stop_0 kiff-01" -> "R-lxc-02_kiff-01_start_0 kiff-02" [ style = bold] "R-lxc-02_kiff-01_stop_0 kiff-01" -> "all_stopped" [ style = bold] "R-lxc-02_kiff-01_stop_0 kiff-01" -> "shared0-clone_stop_0" [ style = bold] "R-lxc-02_kiff-01_stop_0 kiff-01" -> "vm-fs_start_0 lxc-01_kiff-01" [ style = bold] "R-lxc-02_kiff-01_stop_0 kiff-01" [ style=bold color="green" fontcolor="orange"] "all_stopped" -> "fence-kiff-02_start_0 kiff-02" [ style = bold] "all_stopped" [ style=bold color="green" fontcolor="orange"] "clvmd-clone_stop_0" -> "clvmd-clone_stopped_0" [ style = bold] "clvmd-clone_stop_0" -> "clvmd_stop_0 kiff-01" [ style = bold] "clvmd-clone_stop_0" [ style=bold color="green" fontcolor="orange"] "clvmd-clone_stopped_0" -> "dlm-clone_stop_0" [ style = bold] "clvmd-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] -"clvmd_monitor_0 lxc-01_kiff-02" -> "clvmd_stop_0 kiff-01" [ style = bold] "clvmd_monitor_0 lxc-01_kiff-02" [ style=bold color="green" fontcolor="black"] -"clvmd_monitor_0 lxc-02_kiff-02" -> "clvmd_stop_0 kiff-01" [ style = bold] "clvmd_monitor_0 lxc-02_kiff-02" [ style=bold color="green" fontcolor="black"] "clvmd_stop_0 kiff-01" -> "all_stopped" [ style = bold] "clvmd_stop_0 kiff-01" -> "clvmd-clone_stopped_0" [ style = bold] "clvmd_stop_0 kiff-01" -> "dlm_stop_0 kiff-01" [ style = bold] "clvmd_stop_0 kiff-01" [ style=bold color="green" fontcolor="orange"] "dlm-clone_stop_0" -> "dlm-clone_stopped_0" [ style = bold] "dlm-clone_stop_0" -> "dlm_stop_0 kiff-01" [ style = bold] "dlm-clone_stop_0" [ style=bold color="green" fontcolor="orange"] "dlm-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] -"dlm_monitor_0 lxc-01_kiff-02" -> "dlm_stop_0 kiff-01" [ style = bold] "dlm_monitor_0 lxc-01_kiff-02" [ style=bold color="green" fontcolor="black"] -"dlm_monitor_0 lxc-02_kiff-02" -> "dlm_stop_0 kiff-01" [ style = bold] "dlm_monitor_0 lxc-02_kiff-02" [ style=bold color="green" fontcolor="black"] "dlm_stop_0 kiff-01" -> "all_stopped" [ style = bold] "dlm_stop_0 kiff-01" -> "dlm-clone_stopped_0" [ style = bold] "dlm_stop_0 kiff-01" [ style=bold color="green" fontcolor="orange"] "fence-kiff-02_monitor_60000 kiff-02" [ style=bold color="green" fontcolor="black"] "fence-kiff-02_start_0 kiff-02" -> "fence-kiff-02_monitor_60000 kiff-02" [ style = bold] "fence-kiff-02_start_0 kiff-02" [ style=bold color="green" fontcolor="black"] "fence-kiff-02_stop_0 kiff-01" -> "all_stopped" [ style = bold] "fence-kiff-02_stop_0 kiff-01" -> "fence-kiff-02_start_0 kiff-02" [ style = bold] "fence-kiff-02_stop_0 kiff-01" [ style=bold color="green" fontcolor="orange"] "lxc-01_kiff-01_monitor_30000 kiff-02" [ style=bold color="green" fontcolor="black"] "lxc-01_kiff-01_start_0 kiff-02" -> "lxc-01_kiff-01_monitor_30000 kiff-02" [ style = bold] "lxc-01_kiff-01_start_0 kiff-02" -> "vm-fs_monitor_20000 lxc-01_kiff-01" [ style = bold] "lxc-01_kiff-01_start_0 kiff-02" -> "vm-fs_start_0 lxc-01_kiff-01" [ style = bold] "lxc-01_kiff-01_start_0 kiff-02" [ style=bold color="green" fontcolor="black"] "lxc-01_kiff-01_stop_0 kiff-01" -> "R-lxc-01_kiff-01_stop_0 kiff-01" [ style = bold] "lxc-01_kiff-01_stop_0 kiff-01" -> "all_stopped" [ style = bold] "lxc-01_kiff-01_stop_0 kiff-01" -> "lxc-01_kiff-01_start_0 kiff-02" [ style = bold] "lxc-01_kiff-01_stop_0 kiff-01" [ style=bold color="green" fontcolor="orange"] "lxc-02_kiff-01_monitor_30000 kiff-02" [ style=bold color="green" fontcolor="black"] "lxc-02_kiff-01_start_0 kiff-02" -> "lxc-02_kiff-01_monitor_30000 kiff-02" [ style = bold] "lxc-02_kiff-01_start_0 kiff-02" [ style=bold color="green" fontcolor="black"] "lxc-02_kiff-01_stop_0 kiff-01" -> "R-lxc-02_kiff-01_stop_0 kiff-01" [ style = bold] "lxc-02_kiff-01_stop_0 kiff-01" -> "all_stopped" [ style = bold] "lxc-02_kiff-01_stop_0 kiff-01" -> "lxc-02_kiff-01_start_0 kiff-02" [ style = bold] "lxc-02_kiff-01_stop_0 kiff-01" [ style=bold color="green" fontcolor="orange"] "shared0-clone_stop_0" -> "shared0-clone_stopped_0" [ style = bold] "shared0-clone_stop_0" -> "shared0_stop_0 kiff-01" [ style = bold] "shared0-clone_stop_0" [ style=bold color="green" fontcolor="orange"] "shared0-clone_stopped_0" -> "clvmd-clone_stop_0" [ style = bold] "shared0-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] -"shared0_monitor_0 lxc-01_kiff-02" -> "shared0_stop_0 kiff-01" [ style = bold] "shared0_monitor_0 lxc-01_kiff-02" [ style=bold color="green" fontcolor="black"] -"shared0_monitor_0 lxc-02_kiff-02" -> "shared0_stop_0 kiff-01" [ style = bold] "shared0_monitor_0 lxc-02_kiff-02" [ style=bold color="green" fontcolor="black"] "shared0_stop_0 kiff-01" -> "all_stopped" [ style = bold] "shared0_stop_0 kiff-01" -> "clvmd_stop_0 kiff-01" [ style = bold] "shared0_stop_0 kiff-01" -> "shared0-clone_stopped_0" [ style = bold] "shared0_stop_0 kiff-01" [ style=bold color="green" fontcolor="orange"] "stonith 'reboot' kiff-01" -> "R-lxc-01_kiff-01_stop_0 kiff-01" [ style = bold] "stonith 'reboot' kiff-01" -> "R-lxc-02_kiff-01_stop_0 kiff-01" [ style = bold] "stonith 'reboot' kiff-01" -> "clvmd-clone_stop_0" [ style = bold] "stonith 'reboot' kiff-01" -> "clvmd_stop_0 kiff-01" [ style = bold] "stonith 'reboot' kiff-01" -> "dlm-clone_stop_0" [ style = bold] "stonith 'reboot' kiff-01" -> "dlm_stop_0 kiff-01" [ style = bold] "stonith 'reboot' kiff-01" -> "lxc-01_kiff-01_stop_0 kiff-01" [ style = bold] "stonith 'reboot' kiff-01" -> "lxc-02_kiff-01_stop_0 kiff-01" [ style = bold] "stonith 'reboot' kiff-01" -> "shared0-clone_stop_0" [ style = bold] "stonith 'reboot' kiff-01" -> "shared0_stop_0 kiff-01" [ style = bold] "stonith 'reboot' kiff-01" -> "stonith 'reboot' lxc-01_kiff-01" [ style = bold] "stonith 'reboot' kiff-01" -> "stonith 'reboot' lxc-02_kiff-01" [ style = bold] "stonith 'reboot' kiff-01" -> "stonith_complete" [ style = bold] "stonith 'reboot' kiff-01" [ style=bold color="green" fontcolor="black"] "stonith 'reboot' lxc-01_kiff-01" -> "stonith_complete" [ style = bold] "stonith 'reboot' lxc-01_kiff-01" -> "vm-fs_stop_0 lxc-01_kiff-01" [ style = bold] "stonith 'reboot' lxc-01_kiff-01" [ style=bold color="green" fontcolor="orange"] "stonith 'reboot' lxc-02_kiff-01" -> "stonith_complete" [ style = bold] "stonith 'reboot' lxc-02_kiff-01" [ style=bold color="green" fontcolor="orange"] "stonith_complete" -> "R-lxc-01_kiff-01_start_0 kiff-02" [ style = bold] "stonith_complete" -> "R-lxc-02_kiff-01_start_0 kiff-02" [ style = bold] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "lxc-01_kiff-01_start_0 kiff-02" [ style = bold] "stonith_complete" -> "lxc-02_kiff-01_start_0 kiff-02" [ style = bold] "stonith_complete" -> "vm-fs_start_0 lxc-01_kiff-01" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange"] "vm-fs_monitor_0 lxc-01_kiff-02" -> "vm-fs_start_0 lxc-01_kiff-01" [ style = bold] -"vm-fs_monitor_0 lxc-01_kiff-02" -> "vm-fs_stop_0 lxc-01_kiff-01" [ style = bold] "vm-fs_monitor_0 lxc-01_kiff-02" [ style=bold color="green" fontcolor="black"] "vm-fs_monitor_0 lxc-02_kiff-02" -> "vm-fs_start_0 lxc-01_kiff-01" [ style = bold] -"vm-fs_monitor_0 lxc-02_kiff-02" -> "vm-fs_stop_0 lxc-01_kiff-01" [ style = bold] "vm-fs_monitor_0 lxc-02_kiff-02" [ style=bold color="green" fontcolor="black"] "vm-fs_monitor_20000 lxc-01_kiff-01" [ style=bold color="green" fontcolor="black"] "vm-fs_start_0 lxc-01_kiff-01" -> "vm-fs_monitor_20000 lxc-01_kiff-01" [ style = bold] "vm-fs_start_0 lxc-01_kiff-01" [ style=bold color="green" fontcolor="black"] "vm-fs_stop_0 lxc-01_kiff-01" -> "all_stopped" [ style = bold] "vm-fs_stop_0 lxc-01_kiff-01" -> "vm-fs_start_0 lxc-01_kiff-01" [ style = bold] "vm-fs_stop_0 lxc-01_kiff-01" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/whitebox-imply-stop-on-fence.exp b/pengine/test10/whitebox-imply-stop-on-fence.exp index 9a469f29c9..f80dde1ba4 100644 --- a/pengine/test10/whitebox-imply-stop-on-fence.exp +++ b/pengine/test10/whitebox-imply-stop-on-fence.exp @@ -1,614 +1,590 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/whitebox-ms-ordering.dot b/pengine/test10/whitebox-ms-ordering.dot index 84a0984b78..1f4d95b1ad 100644 --- a/pengine/test10/whitebox-ms-ordering.dot +++ b/pengine/test10/whitebox-ms-ordering.dot @@ -1,115 +1,112 @@ digraph "g" { "all_stopped" [ style=bold color="green" fontcolor="orange"] "container1_monitor_0 18node1" -> "container1_start_0 18node1" [ style = bold] "container1_monitor_0 18node1" [ style=bold color="green" fontcolor="black"] "container1_monitor_0 18node2" -> "container1_start_0 18node1" [ style = bold] "container1_monitor_0 18node2" [ style=bold color="green" fontcolor="black"] "container1_monitor_0 18node3" -> "container1_start_0 18node1" [ style = bold] "container1_monitor_0 18node3" [ style=bold color="green" fontcolor="black"] "container1_start_0 18node1" -> "lxc-ms_promote_0 lxc1" [ style = bold] "container1_start_0 18node1" -> "lxc-ms_start_0 lxc1" [ style = bold] "container1_start_0 18node1" -> "lxc1_start_0 18node1" [ style = bold] "container1_start_0 18node1" [ style=bold color="green" fontcolor="black"] "container2_monitor_0 18node1" -> "container2_start_0 18node1" [ style = bold] "container2_monitor_0 18node1" [ style=bold color="green" fontcolor="black"] "container2_monitor_0 18node2" -> "container2_start_0 18node1" [ style = bold] "container2_monitor_0 18node2" [ style=bold color="green" fontcolor="black"] "container2_monitor_0 18node3" -> "container2_start_0 18node1" [ style = bold] "container2_monitor_0 18node3" [ style=bold color="green" fontcolor="black"] "container2_start_0 18node1" -> "lxc-ms_start_0 lxc2" [ style = bold] "container2_start_0 18node1" -> "lxc2_start_0 18node1" [ style = bold] "container2_start_0 18node1" [ style=bold color="green" fontcolor="black"] "lxc-ms-master_demote_0" -> "lxc-ms-master_demoted_0" [ style = bold] "lxc-ms-master_demote_0" -> "lxc-ms_demote_0 lxc1" [ style = bold] "lxc-ms-master_demote_0" [ style=bold color="green" fontcolor="orange"] "lxc-ms-master_demoted_0" -> "lxc-ms-master_promote_0" [ style = bold] "lxc-ms-master_demoted_0" -> "lxc-ms-master_start_0" [ style = bold] "lxc-ms-master_demoted_0" -> "lxc-ms-master_stop_0" [ style = bold] "lxc-ms-master_demoted_0" [ style=bold color="green" fontcolor="orange"] "lxc-ms-master_promote_0" -> "lxc-ms_promote_0 lxc1" [ style = bold] "lxc-ms-master_promote_0" [ style=bold color="green" fontcolor="orange"] "lxc-ms-master_promoted_0" [ style=bold color="green" fontcolor="orange"] "lxc-ms-master_running_0" -> "lxc-ms-master_promote_0" [ style = bold] "lxc-ms-master_running_0" [ style=bold color="green" fontcolor="orange"] "lxc-ms-master_start_0" -> "lxc-ms-master_running_0" [ style = bold] "lxc-ms-master_start_0" -> "lxc-ms_start_0 lxc1" [ style = bold] "lxc-ms-master_start_0" -> "lxc-ms_start_0 lxc2" [ style = bold] "lxc-ms-master_start_0" [ style=bold color="green" fontcolor="orange"] "lxc-ms-master_stop_0" -> "lxc-ms-master_stopped_0" [ style = bold] "lxc-ms-master_stop_0" -> "lxc-ms_stop_0 lxc1" [ style = bold] "lxc-ms-master_stop_0" -> "lxc-ms_stop_0 lxc2" [ style = bold] "lxc-ms-master_stop_0" [ style=bold color="green" fontcolor="orange"] "lxc-ms-master_stopped_0" -> "lxc-ms-master_promote_0" [ style = bold] "lxc-ms-master_stopped_0" -> "lxc-ms-master_start_0" [ style = bold] "lxc-ms-master_stopped_0" [ style=bold color="green" fontcolor="orange"] "lxc-ms_demote_0 lxc1" -> "lxc-ms-master_demoted_0" [ style = bold] "lxc-ms_demote_0 lxc1" -> "lxc-ms_promote_0 lxc1" [ style = bold] "lxc-ms_demote_0 lxc1" -> "lxc-ms_stop_0 lxc1" [ style = bold] "lxc-ms_demote_0 lxc1" [ style=bold color="green" fontcolor="orange"] "lxc-ms_monitor_0 18node1" -> "lxc-ms-master_start_0" [ style = bold] -"lxc-ms_monitor_0 18node1" -> "lxc-ms_stop_0 lxc1" [ style = bold] "lxc-ms_monitor_0 18node1" [ style=bold color="green" fontcolor="black"] "lxc-ms_monitor_0 18node2" -> "lxc-ms-master_start_0" [ style = bold] -"lxc-ms_monitor_0 18node2" -> "lxc-ms_stop_0 lxc1" [ style = bold] "lxc-ms_monitor_0 18node2" [ style=bold color="green" fontcolor="black"] "lxc-ms_monitor_0 18node3" -> "lxc-ms-master_start_0" [ style = bold] -"lxc-ms_monitor_0 18node3" -> "lxc-ms_stop_0 lxc1" [ style = bold] "lxc-ms_monitor_0 18node3" [ style=bold color="green" fontcolor="black"] "lxc-ms_monitor_10000 lxc2" [ style=bold color="green" fontcolor="black"] "lxc-ms_promote_0 lxc1" -> "lxc-ms-master_promoted_0" [ style = bold] "lxc-ms_promote_0 lxc1" [ style=bold color="green" fontcolor="black"] "lxc-ms_start_0 lxc1" -> "lxc-ms-master_running_0" [ style = bold] "lxc-ms_start_0 lxc1" -> "lxc-ms_promote_0 lxc1" [ style = bold] "lxc-ms_start_0 lxc1" [ style=bold color="green" fontcolor="black"] "lxc-ms_start_0 lxc2" -> "lxc-ms-master_running_0" [ style = bold] "lxc-ms_start_0 lxc2" -> "lxc-ms_monitor_10000 lxc2" [ style = bold] "lxc-ms_start_0 lxc2" [ style=bold color="green" fontcolor="black"] "lxc-ms_stop_0 lxc1" -> "all_stopped" [ style = bold] "lxc-ms_stop_0 lxc1" -> "lxc-ms-master_stopped_0" [ style = bold] "lxc-ms_stop_0 lxc1" -> "lxc-ms_start_0 lxc1" [ style = bold] "lxc-ms_stop_0 lxc1" [ style=bold color="green" fontcolor="orange"] "lxc-ms_stop_0 lxc2" -> "all_stopped" [ style = bold] "lxc-ms_stop_0 lxc2" -> "lxc-ms-master_stopped_0" [ style = bold] "lxc-ms_stop_0 lxc2" -> "lxc-ms_start_0 lxc2" [ style = bold] "lxc-ms_stop_0 lxc2" [ style=bold color="green" fontcolor="orange"] "lxc1_monitor_0 18node1" -> "lxc1_start_0 18node1" [ style = bold] "lxc1_monitor_0 18node1" [ style=bold color="green" fontcolor="black"] "lxc1_monitor_0 18node2" -> "lxc1_start_0 18node1" [ style = bold] "lxc1_monitor_0 18node2" [ style=bold color="green" fontcolor="black"] "lxc1_monitor_0 18node3" -> "lxc1_start_0 18node1" [ style = bold] "lxc1_monitor_0 18node3" [ style=bold color="green" fontcolor="black"] "lxc1_monitor_30000 18node1" [ style=bold color="green" fontcolor="black"] "lxc1_start_0 18node1" -> "lxc-ms_promote_0 lxc1" [ style = bold] "lxc1_start_0 18node1" -> "lxc-ms_start_0 lxc1" [ style = bold] "lxc1_start_0 18node1" -> "lxc1_monitor_30000 18node1" [ style = bold] "lxc1_start_0 18node1" [ style=bold color="green" fontcolor="black"] "lxc2_monitor_0 18node1" -> "lxc2_start_0 18node1" [ style = bold] "lxc2_monitor_0 18node1" [ style=bold color="green" fontcolor="black"] "lxc2_monitor_0 18node2" -> "lxc2_start_0 18node1" [ style = bold] "lxc2_monitor_0 18node2" [ style=bold color="green" fontcolor="black"] "lxc2_monitor_0 18node3" -> "lxc2_start_0 18node1" [ style = bold] "lxc2_monitor_0 18node3" [ style=bold color="green" fontcolor="black"] "lxc2_monitor_30000 18node1" [ style=bold color="green" fontcolor="black"] "lxc2_start_0 18node1" -> "lxc-ms_monitor_10000 lxc2" [ style = bold] "lxc2_start_0 18node1" -> "lxc-ms_start_0 lxc2" [ style = bold] "lxc2_start_0 18node1" -> "lxc2_monitor_30000 18node1" [ style = bold] "lxc2_start_0 18node1" [ style=bold color="green" fontcolor="black"] "stonith 'reboot' lxc1" -> "lxc-ms-master_stop_0" [ style = bold] "stonith 'reboot' lxc1" -> "lxc-ms_demote_0 lxc1" [ style = bold] "stonith 'reboot' lxc1" -> "lxc-ms_stop_0 lxc1" [ style = bold] "stonith 'reboot' lxc1" -> "stonith_complete" [ style = bold] "stonith 'reboot' lxc1" [ style=bold color="green" fontcolor="orange"] "stonith 'reboot' lxc2" -> "lxc-ms-master_stop_0" [ style = bold] "stonith 'reboot' lxc2" -> "lxc-ms_stop_0 lxc2" [ style = bold] "stonith 'reboot' lxc2" -> "stonith_complete" [ style = bold] "stonith 'reboot' lxc2" [ style=bold color="green" fontcolor="orange"] "stonith_complete" -> "all_stopped" [ style = bold] "stonith_complete" -> "container1_start_0 18node1" [ style = bold] "stonith_complete" -> "container2_start_0 18node1" [ style = bold] "stonith_complete" -> "lxc-ms_promote_0 lxc1" [ style = bold] "stonith_complete" -> "lxc-ms_start_0 lxc1" [ style = bold] "stonith_complete" -> "lxc-ms_start_0 lxc2" [ style = bold] "stonith_complete" -> "lxc1_start_0 18node1" [ style = bold] "stonith_complete" -> "lxc2_start_0 18node1" [ style = bold] "stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/whitebox-ms-ordering.exp b/pengine/test10/whitebox-ms-ordering.exp index e5eb99cab8..c8fee5e6c0 100644 --- a/pengine/test10/whitebox-ms-ordering.exp +++ b/pengine/test10/whitebox-ms-ordering.exp @@ -1,594 +1,585 @@ - - - - - - - - - diff --git a/pengine/test10/whitebox-orphan-ms.dot b/pengine/test10/whitebox-orphan-ms.dot index 4e2e211a22..46b6cdaf6e 100644 --- a/pengine/test10/whitebox-orphan-ms.dot +++ b/pengine/test10/whitebox-orphan-ms.dot @@ -1,90 +1,72 @@ digraph "g" { "FencingFail_start_0 18node1" [ style=bold color="green" fontcolor="black"] "FencingFail_stop_0 18node3" -> "FencingFail_start_0 18node1" [ style = bold] "FencingFail_stop_0 18node3" -> "all_stopped" [ style = bold] "FencingFail_stop_0 18node3" [ style=bold color="green" fontcolor="black"] "all_stopped" [ style=bold color="green" fontcolor="orange"] "container1_delete_0 18node1" -> "container1_start_0 " [ style = dashed] "container1_delete_0 18node1" [ style=bold color="green" fontcolor="black"] "container1_delete_0 18node2" -> "container1_start_0 " [ style = dashed] "container1_delete_0 18node2" [ style=bold color="green" fontcolor="black"] "container1_delete_0 18node3" -> "container1_start_0 " [ style = dashed] "container1_delete_0 18node3" [ style=bold color="green" fontcolor="black"] "container1_start_0 " [ style=dashed color="red" fontcolor="black"] "container1_stop_0 18node1" -> "all_stopped" [ style = bold] "container1_stop_0 18node1" -> "container1_delete_0 18node1" [ style = bold] "container1_stop_0 18node1" -> "container1_delete_0 18node2" [ style = bold] "container1_stop_0 18node1" -> "container1_delete_0 18node3" [ style = bold] "container1_stop_0 18node1" -> "container1_start_0 " [ style = dashed] "container1_stop_0 18node1" [ style=bold color="green" fontcolor="black"] "container2_delete_0 18node1" [ style=bold color="green" fontcolor="black"] "container2_delete_0 18node2" [ style=bold color="green" fontcolor="black"] "container2_delete_0 18node3" [ style=bold color="green" fontcolor="black"] "container2_stop_0 18node1" -> "all_stopped" [ style = bold] "container2_stop_0 18node1" -> "container2_delete_0 18node1" [ style = bold] "container2_stop_0 18node1" -> "container2_delete_0 18node2" [ style = bold] "container2_stop_0 18node1" -> "container2_delete_0 18node3" [ style = bold] "container2_stop_0 18node1" [ style=bold color="green" fontcolor="black"] -"lsb-dummy_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"] -"lsb-dummy_monitor_0 lxc2" [ style=dashed color="red" fontcolor="black"] "lxc-ms_clear_failcount_0 lxc1" -> "lxc-ms_stop_0 lxc1" [ style = dashed] "lxc-ms_clear_failcount_0 lxc1" -> "lxc-ms_stop_0 lxc2" [ style = dashed] "lxc-ms_clear_failcount_0 lxc1" [ style=dashed color="red" fontcolor="black"] "lxc-ms_delete_0 18node1" [ style=bold color="green" fontcolor="black"] "lxc-ms_delete_0 18node2" [ style=bold color="green" fontcolor="black"] "lxc-ms_delete_0 18node3" [ style=bold color="green" fontcolor="black"] "lxc-ms_demote_0 lxc1" -> "lxc-ms_stop_0 lxc1" [ style = bold] "lxc-ms_demote_0 lxc1" -> "lxc-ms_stop_0 lxc2" [ style = bold] "lxc-ms_demote_0 lxc1" -> "lxc1_stop_0 18node1" [ style = bold] "lxc-ms_demote_0 lxc1" [ style=bold color="green" fontcolor="black"] "lxc-ms_demote_0 lxc2" -> "lxc-ms_stop_0 lxc1" [ style = bold] "lxc-ms_demote_0 lxc2" -> "lxc-ms_stop_0 lxc2" [ style = bold] "lxc-ms_demote_0 lxc2" -> "lxc2_stop_0 18node1" [ style = bold] "lxc-ms_demote_0 lxc2" [ style=bold color="green" fontcolor="black"] "lxc-ms_stop_0 lxc1" -> "all_stopped" [ style = bold] "lxc-ms_stop_0 lxc1" -> "lxc-ms_delete_0 18node1" [ style = bold] "lxc-ms_stop_0 lxc1" -> "lxc-ms_delete_0 18node2" [ style = bold] "lxc-ms_stop_0 lxc1" -> "lxc-ms_delete_0 18node3" [ style = bold] "lxc-ms_stop_0 lxc1" -> "lxc1_stop_0 18node1" [ style = bold] "lxc-ms_stop_0 lxc1" [ style=bold color="green" fontcolor="black"] "lxc-ms_stop_0 lxc2" -> "all_stopped" [ style = bold] "lxc-ms_stop_0 lxc2" -> "lxc-ms_delete_0 18node1" [ style = bold] "lxc-ms_stop_0 lxc2" -> "lxc-ms_delete_0 18node2" [ style = bold] "lxc-ms_stop_0 lxc2" -> "lxc-ms_delete_0 18node3" [ style = bold] "lxc-ms_stop_0 lxc2" -> "lxc2_stop_0 18node1" [ style = bold] "lxc-ms_stop_0 lxc2" [ style=bold color="green" fontcolor="black"] "lxc1_delete_0 18node1" [ style=bold color="green" fontcolor="black"] "lxc1_delete_0 18node2" [ style=bold color="green" fontcolor="black"] "lxc1_delete_0 18node3" [ style=bold color="green" fontcolor="black"] "lxc1_stop_0 18node1" -> "all_stopped" [ style = bold] "lxc1_stop_0 18node1" -> "container1_stop_0 18node1" [ style = bold] "lxc1_stop_0 18node1" -> "lxc1_delete_0 18node1" [ style = bold] "lxc1_stop_0 18node1" -> "lxc1_delete_0 18node2" [ style = bold] "lxc1_stop_0 18node1" -> "lxc1_delete_0 18node3" [ style = bold] "lxc1_stop_0 18node1" [ style=bold color="green" fontcolor="black"] "lxc2_delete_0 18node1" [ style=bold color="green" fontcolor="black"] "lxc2_delete_0 18node2" [ style=bold color="green" fontcolor="black"] "lxc2_delete_0 18node3" [ style=bold color="green" fontcolor="black"] "lxc2_stop_0 18node1" -> "all_stopped" [ style = bold] "lxc2_stop_0 18node1" -> "container2_stop_0 18node1" [ style = bold] "lxc2_stop_0 18node1" -> "lxc2_delete_0 18node1" [ style = bold] "lxc2_stop_0 18node1" -> "lxc2_delete_0 18node2" [ style = bold] "lxc2_stop_0 18node1" -> "lxc2_delete_0 18node3" [ style = bold] "lxc2_stop_0 18node1" [ style=bold color="green" fontcolor="black"] -"migrator_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"] -"migrator_monitor_0 lxc2" [ style=dashed color="red" fontcolor="black"] -"ping-1_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"] -"ping-1_monitor_0 lxc2" [ style=dashed color="red" fontcolor="black"] -"r192.168.122.87_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"] -"r192.168.122.87_monitor_0 lxc2" [ style=dashed color="red" fontcolor="black"] -"r192.168.122.88_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"] -"r192.168.122.88_monitor_0 lxc2" [ style=dashed color="red" fontcolor="black"] -"r192.168.122.89_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"] -"r192.168.122.89_monitor_0 lxc2" [ style=dashed color="red" fontcolor="black"] -"rsc_18node1_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"] -"rsc_18node1_monitor_0 lxc2" [ style=dashed color="red" fontcolor="black"] -"rsc_18node2_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"] -"rsc_18node2_monitor_0 lxc2" [ style=dashed color="red" fontcolor="black"] -"rsc_18node3_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"] -"rsc_18node3_monitor_0 lxc2" [ style=dashed color="red" fontcolor="black"] } diff --git a/pengine/test10/whitebox-orphan-ms.exp b/pengine/test10/whitebox-orphan-ms.exp index 564e92dfcf..ef81317ba7 100644 --- a/pengine/test10/whitebox-orphan-ms.exp +++ b/pengine/test10/whitebox-orphan-ms.exp @@ -1,372 +1,372 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/whitebox-orphaned.dot b/pengine/test10/whitebox-orphaned.dot index 4ef1f7e199..48e167f281 100644 --- a/pengine/test10/whitebox-orphaned.dot +++ b/pengine/test10/whitebox-orphaned.dot @@ -1,47 +1,44 @@ digraph "g" { -"A_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"] "A_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"] "B_monitor_0 lxc2" -> "B_start_0 lxc2" [ style = bold] "B_monitor_0 lxc2" -> "B_stop_0 lxc1" [ style = bold] "B_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"] "B_monitor_10000 lxc2" [ style=bold color="green" fontcolor="black"] "B_start_0 lxc2" -> "B_monitor_10000 lxc2" [ style = bold] "B_start_0 lxc2" [ style=bold color="green" fontcolor="black"] "B_stop_0 lxc1" -> "B_start_0 lxc2" [ style = bold] "B_stop_0 lxc1" -> "all_stopped" [ style = bold] "B_stop_0 lxc1" -> "lxc1_stop_0 18node2" [ style = bold] "B_stop_0 lxc1" [ style=bold color="green" fontcolor="black"] -"C_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"] -"D_monitor_0 lxc1" [ style=dashed color="red" fontcolor="black"] "D_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"] "M-clone_stop_0" -> "M-clone_stopped_0" [ style = bold] "M-clone_stop_0" -> "M_stop_0 lxc1" [ style = bold] "M-clone_stop_0" [ style=bold color="green" fontcolor="orange"] "M-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] "M_stop_0 lxc1" -> "M-clone_stopped_0" [ style = bold] "M_stop_0 lxc1" -> "all_stopped" [ style = bold] "M_stop_0 lxc1" -> "lxc1_stop_0 18node2" [ style = bold] "M_stop_0 lxc1" [ style=bold color="green" fontcolor="black"] "all_stopped" [ style=bold color="green" fontcolor="orange"] "container1_clear_failcount_0 18node2" -> "container1_stop_0 18node2" [ style = bold] "container1_clear_failcount_0 18node2" [ style=bold color="green" fontcolor="black"] "container1_delete_0 18node1" [ style=bold color="green" fontcolor="black"] "container1_delete_0 18node2" [ style=bold color="green" fontcolor="black"] "container1_delete_0 18node3" [ style=bold color="green" fontcolor="black"] "container1_stop_0 18node2" -> "all_stopped" [ style = bold] "container1_stop_0 18node2" -> "container1_delete_0 18node1" [ style = bold] "container1_stop_0 18node2" -> "container1_delete_0 18node2" [ style = bold] "container1_stop_0 18node2" -> "container1_delete_0 18node3" [ style = bold] "container1_stop_0 18node2" [ style=bold color="green" fontcolor="black"] "lxc1_clear_failcount_0 18node2" -> "lxc1_stop_0 18node2" [ style = bold] "lxc1_clear_failcount_0 18node2" [ style=bold color="green" fontcolor="black"] "lxc1_delete_0 18node1" [ style=bold color="green" fontcolor="black"] "lxc1_delete_0 18node2" [ style=bold color="green" fontcolor="black"] "lxc1_delete_0 18node3" [ style=bold color="green" fontcolor="black"] "lxc1_stop_0 18node2" -> "all_stopped" [ style = bold] "lxc1_stop_0 18node2" -> "container1_stop_0 18node2" [ style = bold] "lxc1_stop_0 18node2" -> "lxc1_delete_0 18node1" [ style = bold] "lxc1_stop_0 18node2" -> "lxc1_delete_0 18node2" [ style = bold] "lxc1_stop_0 18node2" -> "lxc1_delete_0 18node3" [ style = bold] "lxc1_stop_0 18node2" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/whitebox-orphaned.exp b/pengine/test10/whitebox-orphaned.exp index 843f1863a7..b2670108f8 100644 --- a/pengine/test10/whitebox-orphaned.exp +++ b/pengine/test10/whitebox-orphaned.exp @@ -1,262 +1,262 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +