diff --git a/pengine/test10/rsc-sets-clone-1.dot b/pengine/test10/rsc-sets-clone-1.dot index 1b9903a992..42d76ed67b 100644 --- a/pengine/test10/rsc-sets-clone-1.dot +++ b/pengine/test10/rsc-sets-clone-1.dot @@ -1,167 +1,103 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "baseclone_running_0" [ style=bold color="green" fontcolor="orange" ] "baseclone_start_0" -> "baseclone_running_0" [ style = bold] "baseclone_start_0" -> "basegrp:1_start_0" [ style = bold] "baseclone_start_0" [ style=bold color="green" fontcolor="orange" ] -"baseclone_stop_0" -> "baseclone_start_0" [ style = bold] -"baseclone_stop_0" -> "baseclone_stopped_0" [ style = bold] -"baseclone_stop_0" -> "basegrp:1_stop_0" [ style = bold] -"baseclone_stop_0" [ style=bold color="green" fontcolor="orange" ] -"baseclone_stopped_0" -> "baseclone_start_0" [ style = bold] -"baseclone_stopped_0" [ style=bold color="green" fontcolor="orange" ] "basegrp:1_running_0" -> "baseclone_running_0" [ style = bold] "basegrp:1_running_0" [ style=bold color="green" fontcolor="orange" ] "basegrp:1_start_0" -> "basegrp:1_running_0" [ style = bold] "basegrp:1_start_0" -> "clvmd:1_start_0 sys3" [ style = bold] "basegrp:1_start_0" -> "controld:1_start_0 sys3" [ style = bold] "basegrp:1_start_0" -> "fs2:1_start_0 sys3" [ style = bold] "basegrp:1_start_0" -> "iscsi1:1_start_0 sys3" [ style = bold] "basegrp:1_start_0" -> "iscsi2:1_start_0 sys3" [ style = bold] "basegrp:1_start_0" -> "o2cb:1_start_0 sys3" [ style = bold] "basegrp:1_start_0" -> "vg1:1_start_0 sys3" [ style = bold] "basegrp:1_start_0" -> "vg2:1_start_0 sys3" [ style = bold] "basegrp:1_start_0" [ style=bold color="green" fontcolor="orange" ] -"basegrp:1_stop_0" -> "basegrp:1_start_0" [ style = bold] -"basegrp:1_stop_0" -> "basegrp:1_stopped_0" [ style = bold] -"basegrp:1_stop_0" -> "clvmd:1_stop_0" [ style = bold] -"basegrp:1_stop_0" -> "controld:1_stop_0" [ style = bold] -"basegrp:1_stop_0" -> "fs2:1_stop_0" [ style = bold] -"basegrp:1_stop_0" -> "iscsi1:1_stop_0" [ style = bold] -"basegrp:1_stop_0" -> "iscsi2:1_stop_0" [ style = bold] -"basegrp:1_stop_0" -> "o2cb:1_stop_0" [ style = bold] -"basegrp:1_stop_0" -> "vg1:1_stop_0" [ style = bold] -"basegrp:1_stop_0" -> "vg2:1_stop_0" [ style = bold] -"basegrp:1_stop_0" [ style=bold color="green" fontcolor="orange" ] -"basegrp:1_stopped_0" -> "baseclone_stopped_0" [ style = bold] -"basegrp:1_stopped_0" -> "basegrp:1_start_0" [ style = bold] -"basegrp:1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "clvmd:1_monitor_0 sys3" -> "probe_complete sys3" [ style = bold] "clvmd:1_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "clvmd:1_start_0 sys3" -> "basegrp:1_running_0" [ style = bold] "clvmd:1_start_0 sys3" -> "o2cb:1_start_0 sys3" [ style = bold] "clvmd:1_start_0 sys3" [ style=bold color="green" fontcolor="black" ] -"clvmd:1_stop_0" -> "all_stopped" [ style = bold] -"clvmd:1_stop_0" -> "basegrp:1_stopped_0" [ style = bold] -"clvmd:1_stop_0" -> "controld:1_stop_0" [ style = bold] -"clvmd:1_stop_0" [ style=bold color="green" fontcolor="orange" ] "controld:1_monitor_0 sys3" -> "probe_complete sys3" [ style = bold] "controld:1_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "controld:1_monitor_10000 sys3" [ style=bold color="green" fontcolor="black" ] "controld:1_start_0 sys3" -> "basegrp:1_running_0" [ style = bold] "controld:1_start_0 sys3" -> "clvmd:1_start_0 sys3" [ style = bold] "controld:1_start_0 sys3" -> "controld:1_monitor_10000 sys3" [ style = bold] "controld:1_start_0 sys3" [ style=bold color="green" fontcolor="black" ] -"controld:1_stop_0" -> "all_stopped" [ style = bold] -"controld:1_stop_0" -> "basegrp:1_stopped_0" [ style = bold] -"controld:1_stop_0" [ style=bold color="green" fontcolor="orange" ] "fs2:1_monitor_0 sys3" -> "probe_complete sys3" [ style = bold] "fs2:1_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "fs2:1_monitor_20000 sys3" [ style=bold color="green" fontcolor="black" ] "fs2:1_start_0 sys3" -> "basegrp:1_running_0" [ style = bold] "fs2:1_start_0 sys3" -> "fs2:1_monitor_20000 sys3" [ style = bold] "fs2:1_start_0 sys3" [ style=bold color="green" fontcolor="black" ] -"fs2:1_stop_0" -> "all_stopped" [ style = bold] -"fs2:1_stop_0" -> "basegrp:1_stopped_0" [ style = bold] -"fs2:1_stop_0" -> "vg2:1_stop_0" [ style = bold] -"fs2:1_stop_0" [ style=bold color="green" fontcolor="orange" ] "iscsi1:1_monitor_0 sys3" -> "probe_complete sys3" [ style = bold] "iscsi1:1_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "iscsi1:1_monitor_120000 sys3" [ style=bold color="green" fontcolor="black" ] "iscsi1:1_start_0 sys3" -> "basegrp:1_running_0" [ style = bold] "iscsi1:1_start_0 sys3" -> "iscsi1:1_monitor_120000 sys3" [ style = bold] "iscsi1:1_start_0 sys3" -> "iscsi2:1_start_0 sys3" [ style = bold] "iscsi1:1_start_0 sys3" [ style=bold color="green" fontcolor="black" ] -"iscsi1:1_stop_0" -> "all_stopped" [ style = bold] -"iscsi1:1_stop_0" -> "basegrp:1_stopped_0" [ style = bold] -"iscsi1:1_stop_0" -> "o2cb:1_stop_0" [ style = bold] -"iscsi1:1_stop_0" [ style=bold color="green" fontcolor="orange" ] "iscsi2:1_monitor_0 sys3" -> "probe_complete sys3" [ style = bold] "iscsi2:1_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "iscsi2:1_monitor_120000 sys3" [ style=bold color="green" fontcolor="black" ] "iscsi2:1_start_0 sys3" -> "basegrp:1_running_0" [ style = bold] "iscsi2:1_start_0 sys3" -> "iscsi2:1_monitor_120000 sys3" [ style = bold] "iscsi2:1_start_0 sys3" -> "vg1:1_start_0 sys3" [ style = bold] "iscsi2:1_start_0 sys3" [ style=bold color="green" fontcolor="black" ] -"iscsi2:1_stop_0" -> "all_stopped" [ style = bold] -"iscsi2:1_stop_0" -> "basegrp:1_stopped_0" [ style = bold] -"iscsi2:1_stop_0" -> "iscsi1:1_stop_0" [ style = bold] -"iscsi2:1_stop_0" [ style=bold color="green" fontcolor="orange" ] "load_stopped_sys2 sys2" [ style=bold color="green" fontcolor="orange" ] "load_stopped_sys3 sys3" [ style=bold color="green" fontcolor="orange" ] "nfs1:0_monitor_0 sys3" -> "probe_complete sys3" [ style = bold] "nfs1:0_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "o2cb:1_monitor_0 sys3" -> "probe_complete sys3" [ style = bold] "o2cb:1_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "o2cb:1_start_0 sys3" -> "basegrp:1_running_0" [ style = bold] "o2cb:1_start_0 sys3" -> "iscsi1:1_start_0 sys3" [ style = bold] "o2cb:1_start_0 sys3" [ style=bold color="green" fontcolor="black" ] -"o2cb:1_stop_0" -> "all_stopped" [ style = bold] -"o2cb:1_stop_0" -> "basegrp:1_stopped_0" [ style = bold] -"o2cb:1_stop_0" -> "clvmd:1_stop_0" [ style = bold] -"o2cb:1_stop_0" [ style=bold color="green" fontcolor="orange" ] "probe_complete sys3" -> "probe_complete" [ style = bold] "probe_complete sys3" [ style=bold color="green" fontcolor="black" ] -"probe_complete" -> "baseclone_start_0" [ style = bold] -"probe_complete" -> "baseclone_stop_0" [ style = bold] -"probe_complete" -> "basegrp:1_start_0" [ style = bold] -"probe_complete" -> "basegrp:1_stop_0" [ style = bold] "probe_complete" -> "clvmd:1_start_0 sys3" [ style = bold] -"probe_complete" -> "clvmd:1_stop_0" [ style = bold] "probe_complete" -> "controld:1_start_0 sys3" [ style = bold] -"probe_complete" -> "controld:1_stop_0" [ style = bold] "probe_complete" -> "fs2:1_start_0 sys3" [ style = bold] -"probe_complete" -> "fs2:1_stop_0" [ style = bold] "probe_complete" -> "iscsi1:1_start_0 sys3" [ style = bold] -"probe_complete" -> "iscsi1:1_stop_0" [ style = bold] "probe_complete" -> "iscsi2:1_start_0 sys3" [ style = bold] -"probe_complete" -> "iscsi2:1_stop_0" [ style = bold] "probe_complete" -> "o2cb:1_start_0 sys3" [ style = bold] -"probe_complete" -> "o2cb:1_stop_0" [ style = bold] "probe_complete" -> "stonithsys2_start_0 sys3" [ style = bold] "probe_complete" -> "stonithsys3_start_0 sys2" [ style = bold] "probe_complete" -> "stonithsys3_stop_0 sys2" [ style = bold] "probe_complete" -> "vg1:1_start_0 sys3" [ style = bold] -"probe_complete" -> "vg1:1_stop_0" [ style = bold] "probe_complete" -> "vg2:1_start_0 sys3" [ style = bold] -"probe_complete" -> "vg2:1_stop_0" [ style = bold] "probe_complete" [ style=bold color="green" fontcolor="orange" ] "stonithsys2_monitor_0 sys3" -> "probe_complete sys3" [ style = bold] "stonithsys2_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "stonithsys2_monitor_15000 sys3" [ style=bold color="green" fontcolor="black" ] "stonithsys2_start_0 sys3" -> "stonithsys2_monitor_15000 sys3" [ style = bold] "stonithsys2_start_0 sys3" [ style=bold color="green" fontcolor="black" ] "stonithsys3_monitor_0 sys3" -> "probe_complete sys3" [ style = bold] "stonithsys3_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "stonithsys3_monitor_15000 sys2" [ style=bold color="green" fontcolor="black" ] "stonithsys3_start_0 sys2" -> "stonithsys3_monitor_15000 sys2" [ style = bold] "stonithsys3_start_0 sys2" [ style=bold color="green" fontcolor="black" ] "stonithsys3_stop_0 sys2" -> "stonithsys3_start_0 sys2" [ style = bold] "stonithsys3_stop_0 sys2" [ style=bold color="green" fontcolor="black" ] "vg1:1_monitor_0 sys3" -> "probe_complete sys3" [ style = bold] "vg1:1_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "vg1:1_start_0 sys3" -> "basegrp:1_running_0" [ style = bold] "vg1:1_start_0 sys3" -> "vg2:1_start_0 sys3" [ style = bold] "vg1:1_start_0 sys3" [ style=bold color="green" fontcolor="black" ] -"vg1:1_stop_0" -> "all_stopped" [ style = bold] -"vg1:1_stop_0" -> "basegrp:1_stopped_0" [ style = bold] -"vg1:1_stop_0" -> "iscsi2:1_stop_0" [ style = bold] -"vg1:1_stop_0" [ style=bold color="green" fontcolor="orange" ] "vg2:1_monitor_0 sys3" -> "probe_complete sys3" [ style = bold] "vg2:1_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "vg2:1_start_0 sys3" -> "basegrp:1_running_0" [ style = bold] "vg2:1_start_0 sys3" -> "fs2:1_start_0 sys3" [ style = bold] "vg2:1_start_0 sys3" [ style=bold color="green" fontcolor="black" ] -"vg2:1_stop_0" -> "all_stopped" [ style = bold] -"vg2:1_stop_0" -> "basegrp:1_stopped_0" [ style = bold] -"vg2:1_stop_0" -> "vg1:1_stop_0" [ style = bold] -"vg2:1_stop_0" [ style=bold color="green" fontcolor="orange" ] "vm1_monitor_0 sys3" -> "probe_complete sys3" [ style = bold] "vm1_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "vm2_monitor_0 sys3" -> "probe_complete sys3" [ style = bold] "vm2_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "vm3_monitor_0 sys3" -> "probe_complete sys3" [ style = bold] "vm3_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] "vm4_monitor_0 sys3" -> "probe_complete sys3" [ style = bold] "vm4_monitor_0 sys3" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/rsc-sets-clone-1.exp b/pengine/test10/rsc-sets-clone-1.exp index c1c2dcab80..d1f8895e4d 100644 --- a/pengine/test10/rsc-sets-clone-1.exp +++ b/pengine/test10/rsc-sets-clone-1.exp @@ -1,831 +1,560 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - + - + - + - - - - - - - - - - - - - - - - - - - + - + - + - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - + - + - + - - - - - - - - - - - - - - - - + - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + - +