From b8509d18f66366999735315762b7dc7819135f58 Mon Sep 17 00:00:00 2001 From: rpm-build Date: Tue, 4 Dec 2018 11:55:19 -0600 Subject: [PATCH] Test: pengine: update regression tests for backported changes --- pengine/test10/1-a-then-bm-move-b.dot | 2 - pengine/test10/1-a-then-bm-move-b.exp | 32 +- pengine/test10/1-a-then-bm-move-b.summary | 1 - pengine/test10/10-a-then-bm-b-move-a-clone.dot | 3 - pengine/test10/10-a-then-bm-b-move-a-clone.exp | 45 +- pengine/test10/10-a-then-bm-b-move-a-clone.summary | 1 - .../11-a-then-bm-b-move-a-clone-starting.dot | 3 - .../11-a-then-bm-b-move-a-clone-starting.exp | 57 +- .../11-a-then-bm-b-move-a-clone-starting.summary | 1 - pengine/test10/1360.dot | 2 - pengine/test10/1360.exp | 40 +- pengine/test10/1360.summary | 1 - pengine/test10/1484.dot | 2 - pengine/test10/1484.exp | 15 +- pengine/test10/1484.summary | 1 - pengine/test10/1494.dot | 2 - pengine/test10/1494.exp | 25 +- pengine/test10/1494.summary | 1 - pengine/test10/2-am-then-b-move-a.dot | 2 - pengine/test10/2-am-then-b-move-a.exp | 32 +- pengine/test10/2-am-then-b-move-a.summary | 1 - pengine/test10/3-am-then-bm-both-migrate.dot | 3 - pengine/test10/3-am-then-bm-both-migrate.exp | 61 +- pengine/test10/3-am-then-bm-both-migrate.summary | 1 - pengine/test10/4-am-then-bm-b-not-migratable.dot | 3 - pengine/test10/4-am-then-bm-b-not-migratable.exp | 51 +- .../test10/4-am-then-bm-b-not-migratable.summary | 1 - pengine/test10/5-am-then-bm-a-not-migratable.dot | 3 - pengine/test10/5-am-then-bm-a-not-migratable.exp | 39 +- .../test10/5-am-then-bm-a-not-migratable.summary | 1 - pengine/test10/594.dot | 12 +- pengine/test10/594.exp | 100 +- pengine/test10/594.summary | 6 +- pengine/test10/6-migrate-group.dot | 4 - pengine/test10/6-migrate-group.exp | 128 +- pengine/test10/6-migrate-group.summary | 1 - pengine/test10/662.dot | 3 - pengine/test10/662.exp | 95 +- pengine/test10/662.summary | 1 - pengine/test10/696.dot | 2 - pengine/test10/696.exp | 112 +- pengine/test10/696.summary | 1 - .../test10/7-migrate-group-one-unmigratable.dot | 4 - .../test10/7-migrate-group-one-unmigratable.exp | 106 +- .../7-migrate-group-one-unmigratable.summary | 1 - pengine/test10/726.dot | 2 - pengine/test10/726.exp | 192 ++- pengine/test10/726.summary | 1 - pengine/test10/735.dot | 2 - pengine/test10/735.exp | 66 +- pengine/test10/735.summary | 1 - pengine/test10/764.dot | 6 - pengine/test10/764.exp | 55 +- pengine/test10/764.summary | 1 - pengine/test10/797.dot | 9 - pengine/test10/797.exp | 133 +- pengine/test10/797.summary | 1 - .../test10/8-am-then-bm-a-migrating-b-stopping.dot | 3 - .../test10/8-am-then-bm-a-migrating-b-stopping.exp | 41 +- .../8-am-then-bm-a-migrating-b-stopping.summary | 1 - pengine/test10/829.dot | 8 +- pengine/test10/829.exp | 94 +- pengine/test10/829.summary | 2 - .../test10/9-am-then-bm-b-migrating-a-stopping.dot | 3 - .../test10/9-am-then-bm-b-migrating-a-stopping.exp | 21 +- .../9-am-then-bm-b-migrating-a-stopping.summary | 1 - pengine/test10/994-2.dot | 3 - pengine/test10/994-2.exp | 50 +- pengine/test10/994-2.summary | 1 - pengine/test10/994.dot | 2 - pengine/test10/994.exp | 36 +- pengine/test10/994.summary | 1 - pengine/test10/a-demote-then-b-migrate.dot | 2 - pengine/test10/a-demote-then-b-migrate.exp | 164 +- pengine/test10/a-demote-then-b-migrate.summary | 1 - pengine/test10/a-promote-then-b-migrate.dot | 2 - pengine/test10/a-promote-then-b-migrate.exp | 94 +- pengine/test10/a-promote-then-b-migrate.summary | 1 - pengine/test10/anti-colocation-master.dot | 2 - pengine/test10/anti-colocation-master.exp | 46 +- pengine/test10/anti-colocation-master.summary | 1 - pengine/test10/anti-colocation-order.dot | 5 - pengine/test10/anti-colocation-order.exp | 89 +- pengine/test10/anti-colocation-order.summary | 1 - pengine/test10/anti-colocation-slave.dot | 2 - pengine/test10/anti-colocation-slave.exp | 46 +- pengine/test10/anti-colocation-slave.summary | 1 - pengine/test10/asymmetric.exp | 8 +- pengine/test10/asymmetrical-order-move.dot | 2 - pengine/test10/asymmetrical-order-move.exp | 14 +- pengine/test10/asymmetrical-order-move.summary | 1 - pengine/test10/attrs1.exp | 10 +- pengine/test10/attrs2.exp | 10 +- pengine/test10/attrs3.exp | 10 +- pengine/test10/attrs4.exp | 10 +- pengine/test10/attrs5.exp | 4 +- pengine/test10/attrs6.exp | 10 +- pengine/test10/attrs7.exp | 10 +- pengine/test10/attrs8.exp | 10 +- pengine/test10/balanced.exp | 28 +- pengine/test10/base-score.exp | 18 +- pengine/test10/bnc-515172.exp | 16 +- pengine/test10/bug-1572-1.dot | 7 - pengine/test10/bug-1572-1.exp | 313 ++-- pengine/test10/bug-1572-1.summary | 1 - pengine/test10/bug-1572-2.dot | 6 - pengine/test10/bug-1572-2.exp | 164 +- pengine/test10/bug-1572-2.summary | 1 - pengine/test10/bug-1573.dot | 2 - pengine/test10/bug-1573.exp | 28 +- pengine/test10/bug-1573.summary | 1 - pengine/test10/bug-1685.exp | 64 +- pengine/test10/bug-1718.dot | 3 - pengine/test10/bug-1718.exp | 46 +- pengine/test10/bug-1718.summary | 1 - pengine/test10/bug-1765.exp | 48 +- pengine/test10/bug-1820-1.dot | 3 - pengine/test10/bug-1820-1.exp | 107 +- pengine/test10/bug-1820-1.summary | 1 - pengine/test10/bug-1820.dot | 3 - pengine/test10/bug-1820.exp | 97 +- pengine/test10/bug-1820.summary | 1 - pengine/test10/bug-1822.dot | 3 - pengine/test10/bug-1822.exp | 81 +- pengine/test10/bug-1822.summary | 1 - pengine/test10/bug-5007-masterslave_colocation.dot | 3 - pengine/test10/bug-5007-masterslave_colocation.exp | 28 +- .../test10/bug-5007-masterslave_colocation.summary | 1 - pengine/test10/bug-5014-A-start-B-start.exp | 22 +- pengine/test10/bug-5014-A-stop-B-started.dot | 2 - pengine/test10/bug-5014-A-stop-B-started.exp | 15 +- pengine/test10/bug-5014-A-stop-B-started.summary | 1 - pengine/test10/bug-5014-A-stopped-B-stopped.exp | 4 +- pengine/test10/bug-5014-CLONE-A-start-B-start.exp | 42 +- pengine/test10/bug-5014-CLONE-A-stop-B-started.dot | 2 - pengine/test10/bug-5014-CLONE-A-stop-B-started.exp | 25 +- .../test10/bug-5014-CLONE-A-stop-B-started.summary | 1 - pengine/test10/bug-5014-CthenAthenB-C-stopped.exp | 6 +- pengine/test10/bug-5014-GROUP-A-start-B-start.exp | 34 +- .../test10/bug-5014-GROUP-A-stopped-B-started.dot | 2 - .../test10/bug-5014-GROUP-A-stopped-B-started.exp | 24 +- .../bug-5014-GROUP-A-stopped-B-started.summary | 1 - .../bug-5014-ordered-set-symmetrical-false.dot | 2 - .../bug-5014-ordered-set-symmetrical-false.exp | 15 +- .../bug-5014-ordered-set-symmetrical-false.summary | 1 - .../bug-5014-ordered-set-symmetrical-true.dot | 3 - .../bug-5014-ordered-set-symmetrical-true.exp | 21 +- .../bug-5014-ordered-set-symmetrical-true.summary | 1 - pengine/test10/bug-5025-1.exp | 6 +- pengine/test10/bug-5025-3.dot | 2 - pengine/test10/bug-5025-3.exp | 22 +- pengine/test10/bug-5025-3.summary | 1 - pengine/test10/bug-5025-4.exp | 10 +- pengine/test10/bug-5028-bottom.dot | 2 - pengine/test10/bug-5028-bottom.exp | 18 +- pengine/test10/bug-5028-bottom.summary | 1 - pengine/test10/bug-5028-detach.exp | 2 +- pengine/test10/bug-5028.dot | 2 - pengine/test10/bug-5028.exp | 4 +- pengine/test10/bug-5059.exp | 208 +-- pengine/test10/bug-5069-op-disabled.exp | 2 +- pengine/test10/bug-5140-require-all-false.dot | 4 - pengine/test10/bug-5140-require-all-false.exp | 57 +- pengine/test10/bug-5140-require-all-false.summary | 1 - pengine/test10/bug-5143-ms-shuffle.exp | 62 +- pengine/test10/bug-5186-partial-migrate.dot | 16 +- pengine/test10/bug-5186-partial-migrate.exp | 160 +- pengine/test10/bug-5186-partial-migrate.summary | 2 - pengine/test10/bug-cl-5168.exp | 62 +- pengine/test10/bug-cl-5170.dot | 3 - pengine/test10/bug-cl-5170.exp | 35 +- pengine/test10/bug-cl-5170.summary | 1 - pengine/test10/bug-cl-5212.dot | 9 - pengine/test10/bug-cl-5212.exp | 52 +- pengine/test10/bug-cl-5213.exp | 2 +- pengine/test10/bug-cl-5219.dot | 2 - pengine/test10/bug-cl-5219.exp | 14 +- pengine/test10/bug-cl-5219.summary | 1 - pengine/test10/bug-cl-5247.dot | 21 +- pengine/test10/bug-cl-5247.exp | 315 ++-- pengine/test10/bug-cl-5247.summary | 14 +- pengine/test10/bug-lf-1852.exp | 48 +- pengine/test10/bug-lf-1920.exp | 2 +- pengine/test10/bug-lf-2106.dot | 3 - pengine/test10/bug-lf-2106.exp | 61 +- pengine/test10/bug-lf-2106.summary | 1 - pengine/test10/bug-lf-2153.dot | 4 - pengine/test10/bug-lf-2153.exp | 79 +- pengine/test10/bug-lf-2153.summary | 1 - pengine/test10/bug-lf-2160.exp | 4 +- pengine/test10/bug-lf-2171.dot | 5 - pengine/test10/bug-lf-2171.exp | 59 +- pengine/test10/bug-lf-2171.summary | 1 - pengine/test10/bug-lf-2213.exp | 38 +- pengine/test10/bug-lf-2317.exp | 58 +- pengine/test10/bug-lf-2358.exp | 48 +- pengine/test10/bug-lf-2361.exp | 58 +- pengine/test10/bug-lf-2422.dot | 13 - pengine/test10/bug-lf-2422.exp | 194 +-- pengine/test10/bug-lf-2422.summary | 1 - pengine/test10/bug-lf-2435.dot | 3 - pengine/test10/bug-lf-2435.exp | 32 +- pengine/test10/bug-lf-2435.summary | 1 - pengine/test10/bug-lf-2445.dot | 2 - pengine/test10/bug-lf-2445.exp | 40 +- pengine/test10/bug-lf-2445.summary | 1 - pengine/test10/bug-lf-2453.dot | 6 - pengine/test10/bug-lf-2453.exp | 66 +- pengine/test10/bug-lf-2453.summary | 1 - pengine/test10/bug-lf-2474.exp | 4 +- pengine/test10/bug-lf-2493.exp | 72 +- pengine/test10/bug-lf-2508.dot | 17 +- pengine/test10/bug-lf-2508.exp | 219 +-- pengine/test10/bug-lf-2508.summary | 8 +- pengine/test10/bug-lf-2544.exp | 10 +- pengine/test10/bug-lf-2551.dot | 30 +- pengine/test10/bug-lf-2551.exp | 292 ++-- pengine/test10/bug-lf-2551.summary | 2 - pengine/test10/bug-lf-2574.dot | 3 - pengine/test10/bug-lf-2574.exp | 38 +- pengine/test10/bug-lf-2574.summary | 1 - pengine/test10/bug-lf-2581.exp | 74 +- pengine/test10/bug-lf-2606.dot | 9 +- pengine/test10/bug-lf-2606.exp | 75 +- pengine/test10/bug-lf-2606.summary | 2 - pengine/test10/bug-lf-2613.dot | 7 - pengine/test10/bug-lf-2613.exp | 175 +-- pengine/test10/bug-lf-2613.summary | 1 - pengine/test10/bug-lf-2619.dot | 8 - pengine/test10/bug-lf-2619.exp | 196 +-- pengine/test10/bug-lf-2619.summary | 1 - pengine/test10/bug-n-385265-2.dot | 3 - pengine/test10/bug-n-385265-2.exp | 63 +- pengine/test10/bug-n-385265-2.summary | 1 - pengine/test10/bug-n-385265.dot | 2 - pengine/test10/bug-n-385265.exp | 20 +- pengine/test10/bug-n-385265.summary | 1 - pengine/test10/bug-n-387749.dot | 3 - pengine/test10/bug-n-387749.exp | 140 +- pengine/test10/bug-n-387749.summary | 1 - pengine/test10/bug-pm-11.exp | 76 +- pengine/test10/bug-pm-12.dot | 3 - pengine/test10/bug-pm-12.exp | 155 +- pengine/test10/bug-pm-12.summary | 1 - pengine/test10/bug-rh-1097457.dot | 22 +- pengine/test10/bug-rh-1097457.exp | 258 ++- pengine/test10/bug-rh-1097457.summary | 16 +- pengine/test10/bug-rh-880249.dot | 4 - pengine/test10/bug-rh-880249.exp | 57 +- pengine/test10/bug-rh-880249.summary | 1 - pengine/test10/bug-suse-707150.exp | 60 +- pengine/test10/bundle-nested-colocation.dot | 4 - pengine/test10/bundle-nested-colocation.exp | 328 ++-- pengine/test10/bundle-nested-colocation.summary | 1 - pengine/test10/bundle-order-fencing.dot | 69 +- pengine/test10/bundle-order-fencing.exp | 798 +++++----- pengine/test10/bundle-order-fencing.summary | 10 +- pengine/test10/bundle-order-partial-start-2.dot | 3 - pengine/test10/bundle-order-partial-start-2.exp | 223 ++- .../test10/bundle-order-partial-start-2.summary | 1 - pengine/test10/bundle-order-partial-start.exp | 198 +-- pengine/test10/bundle-order-partial-stop.dot | 20 - pengine/test10/bundle-order-partial-stop.exp | 386 ++--- pengine/test10/bundle-order-partial-stop.summary | 1 - pengine/test10/bundle-order-startup-clone-2.exp | 842 +++++----- pengine/test10/bundle-order-startup-clone.exp | 156 +- pengine/test10/bundle-order-startup.exp | 358 ++--- pengine/test10/bundle-order-stop-clone.dot | 6 - pengine/test10/bundle-order-stop-clone.exp | 162 +- pengine/test10/bundle-order-stop-clone.summary | 1 - pengine/test10/bundle-order-stop-on-remote.dot | 54 +- pengine/test10/bundle-order-stop-on-remote.exp | 704 ++++----- pengine/test10/bundle-order-stop-on-remote.summary | 2 - pengine/test10/bundle-order-stop.dot | 20 - pengine/test10/bundle-order-stop.exp | 386 ++--- pengine/test10/bundle-order-stop.summary | 1 - pengine/test10/bundle-probe-remotes.exp | 714 ++++----- pengine/test10/bundle-replicas-change.dot | 4 - pengine/test10/bundle-replicas-change.exp | 220 ++- pengine/test10/bundle-replicas-change.summary | 1 - pengine/test10/clone-anon-dup.dot | 2 - pengine/test10/clone-anon-dup.exp | 49 +- pengine/test10/clone-anon-dup.summary | 1 - pengine/test10/clone-anon-failcount.dot | 9 - pengine/test10/clone-anon-failcount.exp | 221 ++- pengine/test10/clone-anon-failcount.summary | 1 - pengine/test10/clone-anon-probe-1.exp | 26 +- pengine/test10/clone-anon-probe-2.exp | 12 +- pengine/test10/clone-colocate-instance-1.exp | 46 +- pengine/test10/clone-colocate-instance-2.exp | 46 +- pengine/test10/clone-fail-block-colocation.dot | 5 - pengine/test10/clone-fail-block-colocation.exp | 119 +- pengine/test10/clone-fail-block-colocation.summary | 1 - pengine/test10/clone-interleave-1.exp | 76 +- pengine/test10/clone-interleave-2.dot | 4 - pengine/test10/clone-interleave-2.exp | 64 +- pengine/test10/clone-interleave-2.summary | 1 - pengine/test10/clone-interleave-3.dot | 4 - pengine/test10/clone-interleave-3.exp | 86 +- pengine/test10/clone-interleave-3.summary | 1 - pengine/test10/clone-max-zero.dot | 7 - pengine/test10/clone-max-zero.exp | 94 +- pengine/test10/clone-max-zero.summary | 1 - pengine/test10/clone-no-shuffle.dot | 4 - pengine/test10/clone-no-shuffle.exp | 173 +- pengine/test10/clone-no-shuffle.summary | 1 - pengine/test10/clone-order-16instances.exp | 172 +- pengine/test10/clone-order-instance.exp | 38 +- pengine/test10/clone-order-primitive.exp | 22 +- pengine/test10/clone-require-all-1.exp | 26 +- pengine/test10/clone-require-all-2.dot | 4 - pengine/test10/clone-require-all-2.exp | 46 +- pengine/test10/clone-require-all-2.summary | 1 - pengine/test10/clone-require-all-3.dot | 6 - pengine/test10/clone-require-all-3.exp | 72 +- pengine/test10/clone-require-all-3.summary | 1 - pengine/test10/clone-require-all-4.dot | 3 - pengine/test10/clone-require-all-4.exp | 45 +- pengine/test10/clone-require-all-4.summary | 1 - pengine/test10/clone-require-all-5.exp | 54 +- pengine/test10/clone-require-all-6.dot | 3 - pengine/test10/clone-require-all-6.exp | 41 +- pengine/test10/clone-require-all-6.summary | 1 - pengine/test10/clone-require-all-7.exp | 72 +- .../test10/clone-require-all-no-interleave-1.exp | 72 +- .../test10/clone-require-all-no-interleave-2.exp | 72 +- .../test10/clone-require-all-no-interleave-3.dot | 4 - .../test10/clone-require-all-no-interleave-3.exp | 122 +- .../clone-require-all-no-interleave-3.summary | 1 - pengine/test10/clone_min_interleave_start_one.exp | 16 +- pengine/test10/clone_min_interleave_start_two.exp | 110 +- pengine/test10/clone_min_interleave_stop_one.dot | 2 - pengine/test10/clone_min_interleave_stop_one.exp | 32 +- .../test10/clone_min_interleave_stop_one.summary | 1 - pengine/test10/clone_min_interleave_stop_two.dot | 9 - pengine/test10/clone_min_interleave_stop_two.exp | 121 +- .../test10/clone_min_interleave_stop_two.summary | 1 - pengine/test10/clone_min_start_one.dot | 2 - pengine/test10/clone_min_start_one.exp | 38 +- pengine/test10/clone_min_start_one.summary | 1 - pengine/test10/clone_min_start_two.exp | 36 +- pengine/test10/clone_min_stop_all.dot | 6 - pengine/test10/clone_min_stop_all.exp | 62 +- pengine/test10/clone_min_stop_all.summary | 1 - pengine/test10/clone_min_stop_one.dot | 2 - pengine/test10/clone_min_stop_one.exp | 32 +- pengine/test10/clone_min_stop_one.summary | 1 - pengine/test10/clone_min_stop_two.dot | 5 - pengine/test10/clone_min_stop_two.exp | 61 +- pengine/test10/clone_min_stop_two.summary | 1 - pengine/test10/cloned-group-stop.dot | 17 - pengine/test10/cloned-group-stop.exp | 239 ++- pengine/test10/cloned-group-stop.summary | 1 - pengine/test10/cloned-group.dot | 5 - pengine/test10/cloned-group.exp | 117 +- pengine/test10/cloned-group.summary | 1 - pengine/test10/cloned_start_one.dot | 3 - pengine/test10/cloned_start_one.exp | 49 +- pengine/test10/cloned_start_one.summary | 1 - pengine/test10/cloned_start_two.dot | 2 - pengine/test10/cloned_start_two.exp | 54 +- pengine/test10/cloned_start_two.summary | 1 - pengine/test10/cloned_stop_one.dot | 3 - pengine/test10/cloned_stop_one.exp | 49 +- pengine/test10/cloned_stop_one.summary | 1 - pengine/test10/cloned_stop_two.dot | 5 - pengine/test10/cloned_stop_two.exp | 67 +- pengine/test10/cloned_stop_two.summary | 1 - pengine/test10/cluster-specific-params.exp | 14 +- pengine/test10/colo_master_w_native.exp | 118 +- pengine/test10/colo_slave_w_native.dot | 2 - pengine/test10/colo_slave_w_native.exp | 140 +- pengine/test10/colo_slave_w_native.summary | 1 - pengine/test10/coloc-attr.exp | 26 +- pengine/test10/coloc-clone-stays-active.dot | 2 - pengine/test10/coloc-clone-stays-active.exp | 32 +- pengine/test10/coloc-clone-stays-active.summary | 1 - pengine/test10/coloc-group.exp | 34 +- pengine/test10/coloc-intra-set.dot | 3 - pengine/test10/coloc-intra-set.exp | 46 +- pengine/test10/coloc-intra-set.summary | 1 - pengine/test10/coloc-list.exp | 42 +- pengine/test10/coloc-loop.exp | 42 +- pengine/test10/coloc-many-one.exp | 38 +- pengine/test10/coloc-slave-anti.exp | 40 +- pengine/test10/coloc_fp_logic.dot | 2 - pengine/test10/coloc_fp_logic.exp | 23 +- pengine/test10/coloc_fp_logic.summary | 1 - pengine/test10/colocate-primitive-with-clone.exp | 50 +- pengine/test10/colocated-utilization-clone.exp | 178 +-- pengine/test10/colocated-utilization-group.exp | 96 +- .../test10/colocated-utilization-primitive-1.exp | 40 +- .../test10/colocated-utilization-primitive-2.exp | 32 +- .../test10/colocation_constraint_stops_master.dot | 3 - .../test10/colocation_constraint_stops_master.exp | 103 +- .../colocation_constraint_stops_master.summary | 1 - .../test10/colocation_constraint_stops_slave.dot | 4 - .../test10/colocation_constraint_stops_slave.exp | 57 +- .../colocation_constraint_stops_slave.summary | 1 - pengine/test10/comments.exp | 20 +- pengine/test10/complex_enforce_colo.dot | 94 -- pengine/test10/complex_enforce_colo.exp | 1226 ++++++--------- pengine/test10/complex_enforce_colo.summary | 1 - pengine/test10/concurrent-fencing.dot | 6 - pengine/test10/concurrent-fencing.exp | 34 +- pengine/test10/concurrent-fencing.summary | 2 - pengine/test10/container-1.exp | 30 +- pengine/test10/container-2.dot | 4 - pengine/test10/container-2.exp | 46 +- pengine/test10/container-2.summary | 1 - pengine/test10/container-3.dot | 3 - pengine/test10/container-3.exp | 39 +- pengine/test10/container-3.summary | 1 - pengine/test10/container-4.dot | 4 - pengine/test10/container-4.exp | 53 +- pengine/test10/container-4.summary | 1 - pengine/test10/container-group-1.exp | 50 +- pengine/test10/container-group-2.dot | 4 - pengine/test10/container-group-2.exp | 86 +- pengine/test10/container-group-2.summary | 1 - pengine/test10/container-group-3.dot | 2 - pengine/test10/container-group-3.exp | 62 +- pengine/test10/container-group-3.summary | 1 - pengine/test10/container-group-4.dot | 4 - pengine/test10/container-group-4.exp | 92 +- pengine/test10/container-group-4.summary | 1 - pengine/test10/container-is-remote-node.exp | 8 +- pengine/test10/date-1.exp | 10 +- pengine/test10/enforce-colo1.dot | 6 - pengine/test10/enforce-colo1.exp | 54 +- pengine/test10/enforce-colo1.summary | 1 - pengine/test10/failcount-block.exp | 12 +- pengine/test10/group-dependents.dot | 14 - pengine/test10/group-dependents.exp | 636 ++++---- pengine/test10/group-dependents.summary | 1 - pengine/test10/group-fail.dot | 3 - pengine/test10/group-fail.exp | 77 +- pengine/test10/group-fail.summary | 1 - pengine/test10/group-unmanaged-stopped.dot | 2 - pengine/test10/group-unmanaged-stopped.exp | 24 +- pengine/test10/group-unmanaged-stopped.summary | 1 - pengine/test10/group1.exp | 52 +- pengine/test10/group10.dot | 4 - pengine/test10/group10.exp | 101 +- pengine/test10/group10.summary | 1 - pengine/test10/group11.dot | 3 - pengine/test10/group11.exp | 39 +- pengine/test10/group11.summary | 1 - pengine/test10/group13.dot | 2 - pengine/test10/group13.exp | 24 +- pengine/test10/group13.summary | 1 - pengine/test10/group14.dot | 2 - pengine/test10/group14.exp | 55 +- pengine/test10/group14.summary | 1 - pengine/test10/group15.exp | 64 +- pengine/test10/group2.exp | 76 +- pengine/test10/group3.exp | 106 +- pengine/test10/group4.exp | 10 +- pengine/test10/group5.dot | 6 - pengine/test10/group5.exp | 129 +- pengine/test10/group5.summary | 1 - pengine/test10/group6.dot | 7 - pengine/test10/group6.exp | 184 +-- pengine/test10/group6.summary | 1 - pengine/test10/group7.exp | 144 +- pengine/test10/group8.exp | 52 +- pengine/test10/group9.dot | 6 - pengine/test10/group9.exp | 147 +- pengine/test10/group9.summary | 1 - pengine/test10/guest-node-cleanup.dot | 14 +- pengine/test10/guest-node-cleanup.exp | 140 +- pengine/test10/guest-node-cleanup.summary | 6 +- pengine/test10/guest-node-host-dies.dot | 47 +- pengine/test10/guest-node-host-dies.exp | 319 ++-- pengine/test10/guest-node-host-dies.summary | 14 +- pengine/test10/honor_stonith_rsc_order1.exp | 40 +- pengine/test10/honor_stonith_rsc_order2.exp | 64 +- pengine/test10/honor_stonith_rsc_order3.exp | 74 +- pengine/test10/honor_stonith_rsc_order4.exp | 20 +- pengine/test10/ignore_stonith_rsc_order1.exp | 14 +- pengine/test10/ignore_stonith_rsc_order2.exp | 36 +- pengine/test10/ignore_stonith_rsc_order3.exp | 46 +- pengine/test10/ignore_stonith_rsc_order4.exp | 56 +- pengine/test10/inc0.exp | 70 +- pengine/test10/inc1.exp | 94 +- pengine/test10/inc10.dot | 4 - pengine/test10/inc10.exp | 102 +- pengine/test10/inc10.summary | 1 - pengine/test10/inc11.exp | 70 +- pengine/test10/inc12.dot | 26 - pengine/test10/inc12.exp | 300 ++-- pengine/test10/inc12.summary | 1 - pengine/test10/inc2.dot | 4 - pengine/test10/inc2.exp | 86 +- pengine/test10/inc2.summary | 1 - pengine/test10/inc3.dot | 6 - pengine/test10/inc3.exp | 158 +- pengine/test10/inc3.summary | 1 - pengine/test10/inc4.dot | 6 - pengine/test10/inc4.exp | 168 +- pengine/test10/inc4.summary | 1 - pengine/test10/inc5.dot | 5 - pengine/test10/inc5.exp | 230 ++- pengine/test10/inc5.summary | 1 - pengine/test10/inc6.dot | 7 - pengine/test10/inc6.exp | 185 +-- pengine/test10/inc6.summary | 1 - pengine/test10/inc7.exp | 218 +-- pengine/test10/inc8.exp | 88 +- pengine/test10/inc9.dot | 4 - pengine/test10/inc9.exp | 43 +- pengine/test10/inc9.summary | 1 - pengine/test10/interleave-0.exp | 506 +++--- pengine/test10/interleave-1.exp | 506 +++--- pengine/test10/interleave-2.exp | 506 +++--- pengine/test10/interleave-3.exp | 506 +++--- pengine/test10/interleave-pseudo-stop.dot | 14 - pengine/test10/interleave-pseudo-stop.exp | 230 ++- pengine/test10/interleave-pseudo-stop.summary | 2 - pengine/test10/interleave-restart.dot | 7 - pengine/test10/interleave-restart.exp | 351 ++--- pengine/test10/interleave-restart.summary | 1 - pengine/test10/interleave-stop.dot | 8 - pengine/test10/interleave-stop.exp | 194 +-- pengine/test10/interleave-stop.summary | 1 - pengine/test10/isolation-clone.exp | 42 +- pengine/test10/isolation-restart-all.dot | 12 - pengine/test10/isolation-restart-all.exp | 326 ++-- pengine/test10/isolation-restart-all.summary | 1 - pengine/test10/isolation-start-all.exp | 158 +- pengine/test10/load-stopped-loop-2.dot | 9 - pengine/test10/load-stopped-loop-2.exp | 247 ++- pengine/test10/load-stopped-loop-2.summary | 1 - pengine/test10/load-stopped-loop.dot | 5 - pengine/test10/load-stopped-loop.exp | 125 +- pengine/test10/load-stopped-loop.summary | 1 - pengine/test10/location-sets-templates.exp | 60 +- pengine/test10/managed-0.exp | 162 +- pengine/test10/managed-1.exp | 162 +- pengine/test10/managed-2.exp | 230 +-- pengine/test10/master-0.exp | 70 +- pengine/test10/master-1.exp | 84 +- pengine/test10/master-10.exp | 238 +-- pengine/test10/master-11.exp | 58 +- pengine/test10/master-12.exp | 10 +- pengine/test10/master-13.exp | 152 +- pengine/test10/master-2.exp | 202 +-- pengine/test10/master-3.exp | 84 +- pengine/test10/master-4.exp | 68 +- pengine/test10/master-5.exp | 54 +- pengine/test10/master-6.exp | 48 +- pengine/test10/master-7.dot | 25 +- pengine/test10/master-7.exp | 241 ++- pengine/test10/master-7.summary | 6 +- pengine/test10/master-8.dot | 26 +- pengine/test10/master-8.exp | 280 ++-- pengine/test10/master-8.summary | 6 +- pengine/test10/master-9.dot | 2 - pengine/test10/master-9.exp | 62 +- pengine/test10/master-9.summary | 1 - pengine/test10/master-asymmetrical-order.dot | 3 - pengine/test10/master-asymmetrical-order.exp | 49 +- pengine/test10/master-asymmetrical-order.summary | 1 - pengine/test10/master-colocation.exp | 16 +- pengine/test10/master-demote-2.dot | 2 - pengine/test10/master-demote-2.exp | 106 +- pengine/test10/master-demote-2.summary | 1 - pengine/test10/master-demote-block.exp | 2 +- pengine/test10/master-demote.dot | 2 - pengine/test10/master-demote.exp | 78 +- pengine/test10/master-demote.summary | 1 - pengine/test10/master-depend.exp | 72 +- pengine/test10/master-dependent-ban.exp | 66 +- pengine/test10/master-failed-demote-2.dot | 2 - pengine/test10/master-failed-demote-2.exp | 71 +- pengine/test10/master-failed-demote-2.summary | 1 - pengine/test10/master-failed-demote.dot | 3 - pengine/test10/master-failed-demote.exp | 173 +- pengine/test10/master-failed-demote.summary | 1 - pengine/test10/master-group.exp | 22 +- pengine/test10/master-move.dot | 3 - pengine/test10/master-move.exp | 205 ++- pengine/test10/master-move.summary | 1 - pengine/test10/master-notify.exp | 64 +- pengine/test10/master-ordering.exp | 142 +- pengine/test10/master-partially-demoted-group.dot | 5 - pengine/test10/master-partially-demoted-group.exp | 331 ++-- .../test10/master-partially-demoted-group.summary | 1 - pengine/test10/master-probed-score.exp | 1010 ++++++------ pengine/test10/master-promotion-constraint.exp | 16 +- pengine/test10/master-pseudo.dot | 3 - pengine/test10/master-pseudo.exp | 155 +- pengine/test10/master-pseudo.summary | 1 - pengine/test10/master-reattach.exp | 6 +- pengine/test10/master-role.exp | 12 +- pengine/test10/master-score-startup.exp | 148 +- pengine/test10/master-stop.dot | 2 - pengine/test10/master-stop.exp | 24 +- pengine/test10/master-stop.summary | 1 - pengine/test10/master_monitor_restart.exp | 2 +- pengine/test10/migrate-1.dot | 2 - pengine/test10/migrate-1.exp | 35 +- pengine/test10/migrate-1.summary | 1 - pengine/test10/migrate-3.dot | 2 - pengine/test10/migrate-3.exp | 19 +- pengine/test10/migrate-3.summary | 1 - pengine/test10/migrate-4.dot | 2 - pengine/test10/migrate-4.exp | 15 +- pengine/test10/migrate-4.summary | 1 - pengine/test10/migrate-5.dot | 3 - pengine/test10/migrate-5.exp | 54 +- pengine/test10/migrate-5.summary | 1 - pengine/test10/migrate-begin.dot | 2 - pengine/test10/migrate-begin.exp | 38 +- pengine/test10/migrate-begin.summary | 1 - pengine/test10/migrate-both-vms.dot | 13 - pengine/test10/migrate-both-vms.exp | 233 ++- pengine/test10/migrate-both-vms.summary | 1 - pengine/test10/migrate-fail-2.dot | 3 - pengine/test10/migrate-fail-2.exp | 30 +- pengine/test10/migrate-fail-2.summary | 1 - pengine/test10/migrate-fail-3.dot | 2 - pengine/test10/migrate-fail-3.exp | 20 +- pengine/test10/migrate-fail-3.summary | 1 - pengine/test10/migrate-fail-4.dot | 3 - pengine/test10/migrate-fail-4.exp | 35 +- pengine/test10/migrate-fail-4.summary | 1 - pengine/test10/migrate-fail-5.exp | 8 +- pengine/test10/migrate-fail-6.dot | 3 - pengine/test10/migrate-fail-6.exp | 29 +- pengine/test10/migrate-fail-6.summary | 1 - pengine/test10/migrate-fail-7.exp | 8 +- pengine/test10/migrate-fail-8.dot | 2 - pengine/test10/migrate-fail-8.exp | 20 +- pengine/test10/migrate-fail-8.summary | 1 - pengine/test10/migrate-fail-9.dot | 2 - pengine/test10/migrate-fail-9.exp | 25 +- pengine/test10/migrate-fail-9.summary | 1 - pengine/test10/migrate-fencing.dot | 29 +- pengine/test10/migrate-fencing.exp | 265 ++-- pengine/test10/migrate-fencing.summary | 12 +- pengine/test10/migrate-partial-1.dot | 2 - pengine/test10/migrate-partial-1.exp | 19 +- pengine/test10/migrate-partial-1.summary | 1 - pengine/test10/migrate-partial-2.dot | 2 - pengine/test10/migrate-partial-2.exp | 33 +- pengine/test10/migrate-partial-2.summary | 1 - pengine/test10/migrate-partial-3.dot | 2 - pengine/test10/migrate-partial-3.exp | 28 +- pengine/test10/migrate-partial-3.summary | 1 - pengine/test10/migrate-partial-4.dot | 4 - pengine/test10/migrate-partial-4.exp | 108 +- pengine/test10/migrate-partial-4.summary | 1 - pengine/test10/migrate-shutdown.dot | 17 - pengine/test10/migrate-shutdown.exp | 213 +-- pengine/test10/migrate-shutdown.summary | 1 - pengine/test10/migrate-start-complex.dot | 3 - pengine/test10/migrate-start-complex.exp | 99 +- pengine/test10/migrate-start-complex.summary | 1 - pengine/test10/migrate-start.dot | 2 - pengine/test10/migrate-start.exp | 55 +- pengine/test10/migrate-start.summary | 1 - pengine/test10/migrate-stop-complex.dot | 5 - pengine/test10/migrate-stop-complex.exp | 84 +- pengine/test10/migrate-stop-complex.summary | 1 - pengine/test10/migrate-stop-start-complex.dot | 4 - pengine/test10/migrate-stop-start-complex.exp | 88 +- pengine/test10/migrate-stop-start-complex.summary | 1 - pengine/test10/migrate-stop.dot | 3 - pengine/test10/migrate-stop.exp | 54 +- pengine/test10/migrate-stop.summary | 1 - pengine/test10/migrate-stop_start.dot | 3 - pengine/test10/migrate-stop_start.exp | 85 +- pengine/test10/migrate-stop_start.summary | 1 - pengine/test10/migrate-success.exp | 4 +- .../test10/migration-behind-migrating-remote.dot | 3 - .../test10/migration-behind-migrating-remote.exp | 59 +- .../migration-behind-migrating-remote.summary | 1 - pengine/test10/minimal.exp | 28 +- pengine/test10/mon-rsc-1.exp | 14 +- pengine/test10/mon-rsc-2.dot | 2 - pengine/test10/mon-rsc-2.exp | 27 +- pengine/test10/mon-rsc-2.summary | 1 - pengine/test10/mon-rsc-3.exp | 10 +- pengine/test10/mon-rsc-4.dot | 2 - pengine/test10/mon-rsc-4.exp | 27 +- pengine/test10/mon-rsc-4.summary | 1 - pengine/test10/monitor-onfail-restart.dot | 2 - pengine/test10/monitor-onfail-restart.exp | 16 +- pengine/test10/monitor-onfail-restart.summary | 1 - pengine/test10/monitor-onfail-stop.dot | 2 - pengine/test10/monitor-onfail-stop.exp | 15 +- pengine/test10/monitor-onfail-stop.summary | 1 - pengine/test10/monitor-recovery.dot | 2 - pengine/test10/monitor-recovery.exp | 25 +- pengine/test10/monitor-recovery.summary | 1 - pengine/test10/multi1.dot | 3 - pengine/test10/multi1.exp | 26 +- pengine/test10/multi1.summary | 1 - pengine/test10/multiple-monitor-one-failed.dot | 2 - pengine/test10/multiple-monitor-one-failed.exp | 18 +- pengine/test10/multiple-monitor-one-failed.summary | 1 - pengine/test10/node-maintenance-1.dot | 2 - pengine/test10/node-maintenance-1.exp | 15 +- pengine/test10/node-maintenance-1.summary | 1 - pengine/test10/node-maintenance-2.exp | 8 +- pengine/test10/not-installed-agent.dot | 3 - pengine/test10/not-installed-agent.exp | 31 +- pengine/test10/not-installed-agent.summary | 1 - pengine/test10/not-installed-tools.dot | 2 - pengine/test10/not-installed-tools.exp | 18 +- pengine/test10/not-installed-tools.summary | 1 - pengine/test10/not-reschedule-unneeded-monitor.dot | 2 - pengine/test10/not-reschedule-unneeded-monitor.exp | 18 +- .../test10/not-reschedule-unneeded-monitor.summary | 1 - pengine/test10/notify-0.dot | 2 - pengine/test10/notify-0.exp | 43 +- pengine/test10/notify-0.summary | 1 - pengine/test10/notify-1.dot | 3 - pengine/test10/notify-1.exp | 105 +- pengine/test10/notify-1.summary | 1 - pengine/test10/notify-2.dot | 3 - pengine/test10/notify-2.exp | 105 +- pengine/test10/notify-2.summary | 1 - pengine/test10/notify-3.dot | 5 - pengine/test10/notify-3.exp | 173 +- pengine/test10/notify-3.summary | 1 - pengine/test10/notify-behind-stopping-remote.dot | 3 - pengine/test10/notify-behind-stopping-remote.exp | 137 +- .../test10/notify-behind-stopping-remote.summary | 1 - pengine/test10/novell-239079.exp | 48 +- pengine/test10/novell-239082.dot | 4 - pengine/test10/novell-239082.exp | 190 +-- pengine/test10/novell-239082.summary | 1 - pengine/test10/novell-251689.dot | 2 - pengine/test10/novell-251689.exp | 15 +- pengine/test10/novell-251689.summary | 1 - pengine/test10/novell-252693-2.dot | 2 - pengine/test10/novell-252693-2.exp | 261 ++- pengine/test10/novell-252693-2.summary | 1 - pengine/test10/novell-252693-3.dot | 4 - pengine/test10/novell-252693-3.exp | 309 ++-- pengine/test10/novell-252693-3.summary | 1 - pengine/test10/novell-252693.dot | 10 - pengine/test10/novell-252693.exp | 244 ++- pengine/test10/novell-252693.summary | 1 - pengine/test10/nvpair-id-ref.exp | 28 +- pengine/test10/obsolete-lrm-resource.exp | 18 +- pengine/test10/on-fail-ignore.dot | 3 - pengine/test10/on-fail-ignore.exp | 31 +- pengine/test10/on-fail-ignore.summary | 1 - pengine/test10/one-or-more-0.exp | 32 +- pengine/test10/one-or-more-1.exp | 8 +- pengine/test10/one-or-more-2.exp | 24 +- pengine/test10/one-or-more-3.exp | 12 +- pengine/test10/one-or-more-4.exp | 28 +- pengine/test10/one-or-more-5.exp | 34 +- pengine/test10/one-or-more-6.dot | 2 - pengine/test10/one-or-more-6.exp | 15 +- pengine/test10/one-or-more-6.summary | 1 - pengine/test10/one-or-more-7.dot | 2 - pengine/test10/one-or-more-7.exp | 15 +- pengine/test10/one-or-more-7.summary | 1 - .../test10/one-or-more-unrunnable-instances.exp | 1656 ++++++++++---------- pengine/test10/order-clone.exp | 2 +- pengine/test10/order-mandatory.dot | 3 - pengine/test10/order-mandatory.exp | 28 +- pengine/test10/order-mandatory.summary | 1 - pengine/test10/order-optional-keyword.exp | 2 +- pengine/test10/order-optional.exp | 2 +- pengine/test10/order-required.dot | 3 - pengine/test10/order-required.exp | 28 +- pengine/test10/order-required.summary | 1 - pengine/test10/order-serialize-set.dot | 8 - pengine/test10/order-serialize-set.exp | 180 +-- pengine/test10/order-serialize-set.summary | 1 - pengine/test10/order-serialize.dot | 8 - pengine/test10/order-serialize.exp | 148 +- pengine/test10/order-serialize.summary | 1 - pengine/test10/order-sets.dot | 5 - pengine/test10/order-sets.exp | 74 +- pengine/test10/order-sets.summary | 1 - pengine/test10/order-wrong-kind.dot | 2 - pengine/test10/order-wrong-kind.exp | 23 +- pengine/test10/order-wrong-kind.summary | 1 - pengine/test10/order1.exp | 34 +- pengine/test10/order2.exp | 46 +- pengine/test10/order3.dot | 5 - pengine/test10/order3.exp | 74 +- pengine/test10/order3.summary | 1 - pengine/test10/order4.exp | 34 +- pengine/test10/order5.dot | 5 - pengine/test10/order5.exp | 70 +- pengine/test10/order5.summary | 1 - pengine/test10/order6.dot | 5 - pengine/test10/order6.exp | 70 +- pengine/test10/order6.summary | 1 - pengine/test10/order7.exp | 20 +- pengine/test10/order_constraint_stops_master.dot | 4 - pengine/test10/order_constraint_stops_master.exp | 110 +- .../test10/order_constraint_stops_master.summary | 1 - pengine/test10/order_constraint_stops_slave.dot | 4 - pengine/test10/order_constraint_stops_slave.exp | 58 +- .../test10/order_constraint_stops_slave.summary | 1 - pengine/test10/ordered-set-basic-startup.exp | 16 +- pengine/test10/origin.exp | 2 +- pengine/test10/orphan-0.exp | 26 +- pengine/test10/orphan-1.dot | 2 - pengine/test10/orphan-1.exp | 44 +- pengine/test10/orphan-1.summary | 1 - pengine/test10/orphan-2.dot | 2 - pengine/test10/orphan-2.exp | 52 +- pengine/test10/orphan-2.summary | 1 - pengine/test10/params-0.exp | 30 +- pengine/test10/params-1.dot | 2 - pengine/test10/params-1.exp | 59 +- pengine/test10/params-1.summary | 1 - pengine/test10/params-2.dot | 3 - pengine/test10/params-2.exp | 59 +- pengine/test10/params-2.summary | 1 - pengine/test10/params-4.exp | 42 +- pengine/test10/params-5.dot | 2 - pengine/test10/params-5.exp | 59 +- pengine/test10/params-5.summary | 1 - pengine/test10/params-6.exp | 14 +- pengine/test10/per-node-attrs.exp | 14 +- pengine/test10/per-op-failcount.dot | 8 +- pengine/test10/per-op-failcount.exp | 48 +- pengine/test10/per-op-failcount.summary | 2 - pengine/test10/placement-capacity.dot | 2 - pengine/test10/placement-capacity.exp | 20 +- pengine/test10/placement-capacity.summary | 1 - pengine/test10/placement-location.dot | 2 - pengine/test10/placement-location.exp | 20 +- pengine/test10/placement-location.summary | 1 - pengine/test10/placement-priority.dot | 2 - pengine/test10/placement-priority.exp | 21 +- pengine/test10/placement-priority.summary | 1 - pengine/test10/placement-stickiness.dot | 2 - pengine/test10/placement-stickiness.exp | 20 +- pengine/test10/placement-stickiness.summary | 1 - pengine/test10/probe-0.exp | 56 +- pengine/test10/probe-1.exp | 10 +- pengine/test10/probe-2.dot | 14 - pengine/test10/probe-2.exp | 458 +++--- pengine/test10/probe-2.summary | 1 - pengine/test10/probe-timeout.exp | 36 +- pengine/test10/quorum-1.dot | 2 - pengine/test10/quorum-1.exp | 35 +- pengine/test10/quorum-1.summary | 1 - pengine/test10/quorum-2.dot | 2 - pengine/test10/quorum-2.exp | 29 +- pengine/test10/quorum-2.summary | 1 - pengine/test10/quorum-3.dot | 3 - pengine/test10/quorum-3.exp | 28 +- pengine/test10/quorum-3.summary | 1 - pengine/test10/quorum-4.exp | 10 +- pengine/test10/quorum-5.exp | 36 +- pengine/test10/quorum-6.exp | 48 +- pengine/test10/rebalance-unique-clones.dot | 2 - pengine/test10/rebalance-unique-clones.exp | 44 +- pengine/test10/rebalance-unique-clones.summary | 1 - pengine/test10/rec-node-1.exp | 12 +- pengine/test10/rec-node-10.dot | 3 - pengine/test10/rec-node-10.exp | 6 +- pengine/test10/rec-node-11.dot | 15 +- pengine/test10/rec-node-11.exp | 111 +- pengine/test10/rec-node-11.summary | 4 +- pengine/test10/rec-node-12.dot | 14 +- pengine/test10/rec-node-12.exp | 211 ++- pengine/test10/rec-node-12.summary | 2 - pengine/test10/rec-node-13.dot | 5 - pengine/test10/rec-node-13.exp | 39 +- pengine/test10/rec-node-13.summary | 2 - pengine/test10/rec-node-14.dot | 4 - pengine/test10/rec-node-14.exp | 28 +- pengine/test10/rec-node-14.summary | 2 - pengine/test10/rec-node-15.dot | 25 +- pengine/test10/rec-node-15.exp | 201 +-- pengine/test10/rec-node-15.summary | 16 +- pengine/test10/rec-node-2.dot | 18 +- pengine/test10/rec-node-2.exp | 115 +- pengine/test10/rec-node-2.summary | 2 - pengine/test10/rec-node-3.exp | 12 +- pengine/test10/rec-node-4.dot | 12 +- pengine/test10/rec-node-4.exp | 62 +- pengine/test10/rec-node-4.summary | 4 +- pengine/test10/rec-node-5.exp | 12 +- pengine/test10/rec-node-6.dot | 12 +- pengine/test10/rec-node-6.exp | 62 +- pengine/test10/rec-node-6.summary | 4 +- pengine/test10/rec-node-7.dot | 12 +- pengine/test10/rec-node-7.exp | 62 +- pengine/test10/rec-node-7.summary | 4 +- pengine/test10/rec-node-8.dot | 3 - pengine/test10/rec-node-8.exp | 8 +- pengine/test10/rec-node-9.exp | 4 +- pengine/test10/rec-rsc-0.dot | 3 - pengine/test10/rec-rsc-0.exp | 16 - pengine/test10/rec-rsc-0.summary | 1 - pengine/test10/rec-rsc-1.dot | 2 - pengine/test10/rec-rsc-1.exp | 19 +- pengine/test10/rec-rsc-1.summary | 1 - pengine/test10/rec-rsc-2.dot | 2 - pengine/test10/rec-rsc-2.exp | 19 +- pengine/test10/rec-rsc-2.summary | 1 - pengine/test10/rec-rsc-3.exp | 6 +- pengine/test10/rec-rsc-5.dot | 12 +- pengine/test10/rec-rsc-5.exp | 62 +- pengine/test10/rec-rsc-5.summary | 4 +- pengine/test10/rec-rsc-6.dot | 3 - pengine/test10/rec-rsc-6.exp | 26 +- pengine/test10/rec-rsc-6.summary | 1 - pengine/test10/rec-rsc-7.dot | 3 - pengine/test10/rec-rsc-7.exp | 20 +- pengine/test10/rec-rsc-7.summary | 1 - pengine/test10/rec-rsc-9.dot | 4 - pengine/test10/rec-rsc-9.exp | 82 +- pengine/test10/rec-rsc-9.summary | 1 - pengine/test10/reload-becomes-restart.dot | 2 - pengine/test10/reload-becomes-restart.exp | 110 +- pengine/test10/reload-becomes-restart.summary | 1 - pengine/test10/remote-connection-unrecoverable.dot | 13 +- pengine/test10/remote-connection-unrecoverable.exp | 103 +- .../test10/remote-connection-unrecoverable.summary | 6 +- pengine/test10/remote-disable.dot | 3 - pengine/test10/remote-disable.exp | 21 +- pengine/test10/remote-disable.summary | 1 - pengine/test10/remote-fence-before-reconnect.dot | 8 +- pengine/test10/remote-fence-before-reconnect.exp | 44 +- .../test10/remote-fence-before-reconnect.summary | 2 - pengine/test10/remote-fence-unclean-3.dot | 7 +- pengine/test10/remote-fence-unclean-3.exp | 85 +- pengine/test10/remote-fence-unclean-3.summary | 2 - pengine/test10/remote-fence-unclean.dot | 16 +- pengine/test10/remote-fence-unclean.exp | 82 +- pengine/test10/remote-fence-unclean.summary | 10 +- pengine/test10/remote-fence-unclean2.dot | 5 - pengine/test10/remote-fence-unclean2.exp | 29 +- pengine/test10/remote-fence-unclean2.summary | 2 - pengine/test10/remote-move.dot | 3 - pengine/test10/remote-move.exp | 45 +- pengine/test10/remote-move.summary | 1 - pengine/test10/remote-orphaned.dot | 4 - pengine/test10/remote-orphaned.exp | 54 +- pengine/test10/remote-orphaned.summary | 1 - pengine/test10/remote-partial-migrate.dot | 9 +- pengine/test10/remote-partial-migrate.exp | 182 +-- pengine/test10/remote-partial-migrate.summary | 7 +- pengine/test10/remote-partial-migrate2.dot | 62 +- pengine/test10/remote-partial-migrate2.exp | 382 ++--- pengine/test10/remote-partial-migrate2.summary | 24 +- pengine/test10/remote-probe-disable.dot | 2 - pengine/test10/remote-probe-disable.exp | 30 +- pengine/test10/remote-probe-disable.summary | 1 - pengine/test10/remote-reconnect-delay.dot | 2 - pengine/test10/remote-reconnect-delay.exp | 20 +- pengine/test10/remote-reconnect-delay.summary | 1 - pengine/test10/remote-recover-all.dot | 44 +- pengine/test10/remote-recover-all.exp | 354 ++--- pengine/test10/remote-recover-all.summary | 20 +- pengine/test10/remote-recover-connection.dot | 23 +- pengine/test10/remote-recover-connection.exp | 247 ++- pengine/test10/remote-recover-connection.summary | 2 - pengine/test10/remote-recover-fail.dot | 15 +- pengine/test10/remote-recover-fail.exp | 81 +- pengine/test10/remote-recover-fail.summary | 6 +- pengine/test10/remote-recover-no-resources.dot | 36 +- pengine/test10/remote-recover-no-resources.exp | 290 ++-- pengine/test10/remote-recover-no-resources.summary | 20 +- pengine/test10/remote-recover-unknown.dot | 43 +- pengine/test10/remote-recover-unknown.exp | 315 ++-- pengine/test10/remote-recover-unknown.summary | 20 +- pengine/test10/remote-recover.exp | 16 +- pengine/test10/remote-recovery.dot | 23 +- pengine/test10/remote-recovery.exp | 247 ++- pengine/test10/remote-recovery.summary | 2 - pengine/test10/remote-stale-node-entry.exp | 182 +-- pengine/test10/remote-start-fail.dot | 2 - pengine/test10/remote-start-fail.exp | 18 +- pengine/test10/remote-start-fail.summary | 1 - pengine/test10/remote-startup-probes.dot | 4 +- pengine/test10/remote-startup-probes.exp | 71 +- pengine/test10/remote-startup-probes.summary | 1 - pengine/test10/remote-startup.dot | 2 - pengine/test10/remote-startup.exp | 60 +- pengine/test10/remote-startup.summary | 1 - pengine/test10/remote-unclean2.dot | 7 +- pengine/test10/remote-unclean2.exp | 35 +- pengine/test10/remote-unclean2.summary | 2 - pengine/test10/reprobe-target_rc.exp | 4 +- pengine/test10/resource-discovery.exp | 282 ++-- pengine/test10/route-remote-notify.dot | 9 - pengine/test10/route-remote-notify.exp | 225 ++- pengine/test10/route-remote-notify.summary | 1 - pengine/test10/rsc-discovery-per-node.dot | 5 +- pengine/test10/rsc-discovery-per-node.exp | 332 ++-- pengine/test10/rsc-discovery-per-node.summary | 7 +- pengine/test10/rsc-sets-clone-1.dot | 2 - pengine/test10/rsc-sets-clone-1.exp | 175 +-- pengine/test10/rsc-sets-clone-1.summary | 1 - pengine/test10/rsc-sets-clone.dot | 4 - pengine/test10/rsc-sets-clone.exp | 46 +- pengine/test10/rsc-sets-clone.summary | 1 - pengine/test10/rsc-sets-master.dot | 5 - pengine/test10/rsc-sets-master.exp | 94 +- pengine/test10/rsc-sets-master.summary | 1 - pengine/test10/rsc-sets-seq-false.dot | 7 - pengine/test10/rsc-sets-seq-false.exp | 84 +- pengine/test10/rsc-sets-seq-false.summary | 1 - pengine/test10/rsc-sets-seq-true.dot | 7 - pengine/test10/rsc-sets-seq-true.exp | 84 +- pengine/test10/rsc-sets-seq-true.summary | 1 - pengine/test10/rsc_dep1.exp | 20 +- pengine/test10/rsc_dep10.exp | 14 +- pengine/test10/rsc_dep2.exp | 24 +- pengine/test10/rsc_dep3.exp | 20 +- pengine/test10/rsc_dep4.dot | 2 - pengine/test10/rsc_dep4.exp | 45 +- pengine/test10/rsc_dep4.summary | 1 - pengine/test10/rsc_dep5.exp | 24 +- pengine/test10/rsc_dep7.exp | 30 +- pengine/test10/rsc_dep8.exp | 24 +- pengine/test10/simple11.exp | 20 +- pengine/test10/simple12.exp | 20 +- pengine/test10/simple2.exp | 10 +- pengine/test10/simple3.exp | 2 +- pengine/test10/simple4.dot | 2 - pengine/test10/simple4.exp | 13 - pengine/test10/simple4.summary | 1 - pengine/test10/simple6.dot | 2 - pengine/test10/simple6.exp | 23 +- pengine/test10/simple6.summary | 1 - pengine/test10/simple7.dot | 2 - pengine/test10/simple7.exp | 18 +- pengine/test10/simple7.summary | 1 - pengine/test10/simple8.exp | 8 +- pengine/test10/site-specific-params.exp | 18 +- pengine/test10/standby.dot | 9 - pengine/test10/standby.exp | 229 ++- pengine/test10/standby.summary | 1 - pengine/test10/start-then-stop-with-unfence.dot | 2 - pengine/test10/start-then-stop-with-unfence.exp | 64 +- .../test10/start-then-stop-with-unfence.summary | 1 - pengine/test10/stonith-0.dot | 26 +- pengine/test10/stonith-0.exp | 190 +-- pengine/test10/stonith-0.summary | 2 - pengine/test10/stonith-1.dot | 27 +- pengine/test10/stonith-1.exp | 223 ++- pengine/test10/stonith-1.summary | 8 +- pengine/test10/stonith-2.dot | 6 +- pengine/test10/stonith-2.exp | 32 +- pengine/test10/stonith-2.summary | 2 - pengine/test10/stonith-3.dot | 8 +- pengine/test10/stonith-3.exp | 67 +- pengine/test10/stonith-3.summary | 2 - pengine/test10/stonith-4.dot | 9 +- pengine/test10/stonith-4.exp | 30 +- pengine/test10/stonith-4.summary | 2 - pengine/test10/stop-failure-no-quorum.dot | 5 - pengine/test10/stop-failure-no-quorum.exp | 39 +- pengine/test10/stop-failure-no-quorum.summary | 2 - pengine/test10/stop-failure-with-fencing.dot | 5 - pengine/test10/stop-failure-with-fencing.exp | 41 +- pengine/test10/stop-failure-with-fencing.summary | 2 - pengine/test10/stopped-monitor-00.exp | 18 +- pengine/test10/stopped-monitor-01.dot | 2 - pengine/test10/stopped-monitor-01.exp | 16 +- pengine/test10/stopped-monitor-01.summary | 1 - pengine/test10/stopped-monitor-02.dot | 3 - pengine/test10/stopped-monitor-02.exp | 23 +- pengine/test10/stopped-monitor-02.summary | 1 - pengine/test10/stopped-monitor-03.dot | 2 - pengine/test10/stopped-monitor-03.exp | 19 +- pengine/test10/stopped-monitor-03.summary | 1 - pengine/test10/stopped-monitor-08.dot | 2 - pengine/test10/stopped-monitor-08.exp | 27 +- pengine/test10/stopped-monitor-08.summary | 1 - pengine/test10/stopped-monitor-20.exp | 12 +- pengine/test10/stopped-monitor-21.dot | 2 - pengine/test10/stopped-monitor-21.exp | 13 - pengine/test10/stopped-monitor-21.summary | 1 - pengine/test10/stopped-monitor-22.dot | 3 - pengine/test10/stopped-monitor-22.exp | 16 - pengine/test10/stopped-monitor-22.summary | 1 - pengine/test10/stopped-monitor-23.exp | 6 +- pengine/test10/stopped-monitor-30.exp | 6 +- pengine/test10/stopped-monitor-31.exp | 6 +- pengine/test10/suicide-needed-inquorate.dot | 4 - pengine/test10/suicide-needed-inquorate.exp | 28 +- pengine/test10/suicide-needed-inquorate.summary | 2 - .../test10/suicide-not-needed-initial-quorum.exp | 18 +- .../test10/suicide-not-needed-never-quorate.exp | 6 +- pengine/test10/suicide-not-needed-quorate.exp | 18 +- pengine/test10/systemhealth1.dot | 4 - pengine/test10/systemhealth1.exp | 30 +- pengine/test10/systemhealth1.summary | 2 - pengine/test10/systemhealth2.dot | 10 +- pengine/test10/systemhealth2.exp | 59 +- pengine/test10/systemhealth2.summary | 2 - pengine/test10/systemhealth3.dot | 10 +- pengine/test10/systemhealth3.exp | 59 +- pengine/test10/systemhealth3.summary | 2 - pengine/test10/systemhealthm1.dot | 4 - pengine/test10/systemhealthm1.exp | 30 +- pengine/test10/systemhealthm1.summary | 2 - pengine/test10/systemhealthm2.dot | 10 +- pengine/test10/systemhealthm2.exp | 59 +- pengine/test10/systemhealthm2.summary | 2 - pengine/test10/systemhealthm3.dot | 4 - pengine/test10/systemhealthm3.exp | 33 +- pengine/test10/systemhealthm3.summary | 2 - pengine/test10/systemhealthn1.dot | 4 - pengine/test10/systemhealthn1.exp | 30 +- pengine/test10/systemhealthn1.summary | 2 - pengine/test10/systemhealthn2.dot | 10 +- pengine/test10/systemhealthn2.exp | 59 +- pengine/test10/systemhealthn2.summary | 2 - pengine/test10/systemhealthn3.dot | 10 +- pengine/test10/systemhealthn3.exp | 59 +- pengine/test10/systemhealthn3.summary | 2 - pengine/test10/systemhealtho1.dot | 4 - pengine/test10/systemhealtho1.exp | 30 +- pengine/test10/systemhealtho1.summary | 2 - pengine/test10/systemhealtho2.dot | 4 - pengine/test10/systemhealtho2.exp | 33 +- pengine/test10/systemhealtho2.summary | 2 - pengine/test10/systemhealtho3.dot | 4 - pengine/test10/systemhealtho3.exp | 33 +- pengine/test10/systemhealtho3.summary | 2 - pengine/test10/systemhealthp1.dot | 4 - pengine/test10/systemhealthp1.exp | 30 +- pengine/test10/systemhealthp1.summary | 2 - pengine/test10/systemhealthp2.dot | 8 +- pengine/test10/systemhealthp2.exp | 53 +- pengine/test10/systemhealthp2.summary | 2 - pengine/test10/systemhealthp3.dot | 4 - pengine/test10/systemhealthp3.exp | 33 +- pengine/test10/systemhealthp3.summary | 2 - pengine/test10/tags-coloc-order-1.exp | 46 +- pengine/test10/tags-coloc-order-2.exp | 142 +- pengine/test10/tags-location.exp | 60 +- pengine/test10/tags-ticket.exp | 24 +- pengine/test10/target-0.exp | 30 +- pengine/test10/target-1.dot | 2 - pengine/test10/target-1.exp | 39 +- pengine/test10/target-1.summary | 1 - pengine/test10/target-2.dot | 2 - pengine/test10/target-2.exp | 45 +- pengine/test10/target-2.summary | 1 - pengine/test10/template-1.exp | 24 +- pengine/test10/template-2.exp | 24 +- pengine/test10/template-3.exp | 44 +- pengine/test10/template-clone-group.exp | 70 +- pengine/test10/template-clone-primitive.exp | 26 +- pengine/test10/template-coloc-1.exp | 40 +- pengine/test10/template-coloc-2.exp | 40 +- pengine/test10/template-coloc-3.exp | 60 +- pengine/test10/template-order-1.exp | 46 +- pengine/test10/template-order-2.exp | 46 +- pengine/test10/template-order-3.exp | 78 +- pengine/test10/template-rsc-sets-1.exp | 58 +- pengine/test10/template-rsc-sets-2.exp | 62 +- pengine/test10/template-rsc-sets-3.exp | 58 +- pengine/test10/template-rsc-sets-4.exp | 12 +- pengine/test10/template-ticket.exp | 12 +- pengine/test10/ticket-clone-1.exp | 4 +- pengine/test10/ticket-clone-10.exp | 4 +- pengine/test10/ticket-clone-11.exp | 26 +- pengine/test10/ticket-clone-14.dot | 3 - pengine/test10/ticket-clone-14.exp | 34 +- pengine/test10/ticket-clone-14.summary | 1 - pengine/test10/ticket-clone-15.dot | 3 - pengine/test10/ticket-clone-15.exp | 34 +- pengine/test10/ticket-clone-15.summary | 1 - pengine/test10/ticket-clone-17.dot | 3 - pengine/test10/ticket-clone-17.exp | 34 +- pengine/test10/ticket-clone-17.summary | 1 - pengine/test10/ticket-clone-18.dot | 3 - pengine/test10/ticket-clone-18.exp | 34 +- pengine/test10/ticket-clone-18.summary | 1 - pengine/test10/ticket-clone-2.exp | 26 +- pengine/test10/ticket-clone-20.dot | 3 - pengine/test10/ticket-clone-20.exp | 34 +- pengine/test10/ticket-clone-20.summary | 1 - pengine/test10/ticket-clone-21.dot | 7 - pengine/test10/ticket-clone-21.exp | 55 +- pengine/test10/ticket-clone-21.summary | 2 - pengine/test10/ticket-clone-23.dot | 3 - pengine/test10/ticket-clone-23.exp | 34 +- pengine/test10/ticket-clone-23.summary | 1 - pengine/test10/ticket-clone-3.dot | 3 - pengine/test10/ticket-clone-3.exp | 34 +- pengine/test10/ticket-clone-3.summary | 1 - pengine/test10/ticket-clone-4.exp | 4 +- pengine/test10/ticket-clone-5.exp | 26 +- pengine/test10/ticket-clone-6.dot | 3 - pengine/test10/ticket-clone-6.exp | 34 +- pengine/test10/ticket-clone-6.summary | 1 - pengine/test10/ticket-clone-7.exp | 4 +- pengine/test10/ticket-clone-8.exp | 26 +- pengine/test10/ticket-clone-9.dot | 7 - pengine/test10/ticket-clone-9.exp | 55 +- pengine/test10/ticket-clone-9.summary | 2 - pengine/test10/ticket-group-1.exp | 8 +- pengine/test10/ticket-group-10.exp | 8 +- pengine/test10/ticket-group-11.exp | 28 +- pengine/test10/ticket-group-14.dot | 3 - pengine/test10/ticket-group-14.exp | 35 +- pengine/test10/ticket-group-14.summary | 1 - pengine/test10/ticket-group-15.dot | 3 - pengine/test10/ticket-group-15.exp | 35 +- pengine/test10/ticket-group-15.summary | 1 - pengine/test10/ticket-group-17.dot | 3 - pengine/test10/ticket-group-17.exp | 35 +- pengine/test10/ticket-group-17.summary | 1 - pengine/test10/ticket-group-18.dot | 3 - pengine/test10/ticket-group-18.exp | 35 +- pengine/test10/ticket-group-18.summary | 1 - pengine/test10/ticket-group-2.exp | 28 +- pengine/test10/ticket-group-20.dot | 3 - pengine/test10/ticket-group-20.exp | 35 +- pengine/test10/ticket-group-20.summary | 1 - pengine/test10/ticket-group-21.dot | 6 - pengine/test10/ticket-group-21.exp | 50 +- pengine/test10/ticket-group-21.summary | 2 - pengine/test10/ticket-group-23.dot | 3 - pengine/test10/ticket-group-23.exp | 35 +- pengine/test10/ticket-group-23.summary | 1 - pengine/test10/ticket-group-3.dot | 3 - pengine/test10/ticket-group-3.exp | 35 +- pengine/test10/ticket-group-3.summary | 1 - pengine/test10/ticket-group-4.exp | 8 +- pengine/test10/ticket-group-5.exp | 28 +- pengine/test10/ticket-group-6.dot | 3 - pengine/test10/ticket-group-6.exp | 35 +- pengine/test10/ticket-group-6.summary | 1 - pengine/test10/ticket-group-7.exp | 8 +- pengine/test10/ticket-group-8.exp | 28 +- pengine/test10/ticket-group-9.dot | 6 - pengine/test10/ticket-group-9.exp | 50 +- pengine/test10/ticket-group-9.summary | 2 - pengine/test10/ticket-master-1.exp | 4 +- pengine/test10/ticket-master-10.exp | 26 +- pengine/test10/ticket-master-11.exp | 10 +- pengine/test10/ticket-master-14.dot | 3 - pengine/test10/ticket-master-14.exp | 49 +- pengine/test10/ticket-master-14.summary | 1 - pengine/test10/ticket-master-15.dot | 3 - pengine/test10/ticket-master-15.exp | 49 +- pengine/test10/ticket-master-15.summary | 1 - pengine/test10/ticket-master-17.exp | 12 +- pengine/test10/ticket-master-18.exp | 12 +- pengine/test10/ticket-master-2.exp | 32 +- pengine/test10/ticket-master-20.exp | 12 +- pengine/test10/ticket-master-21.dot | 6 - pengine/test10/ticket-master-21.exp | 64 +- pengine/test10/ticket-master-21.summary | 2 - pengine/test10/ticket-master-23.exp | 12 +- pengine/test10/ticket-master-3.dot | 3 - pengine/test10/ticket-master-3.exp | 49 +- pengine/test10/ticket-master-3.summary | 1 - pengine/test10/ticket-master-4.exp | 26 +- pengine/test10/ticket-master-5.exp | 10 +- pengine/test10/ticket-master-6.exp | 12 +- pengine/test10/ticket-master-7.exp | 26 +- pengine/test10/ticket-master-8.exp | 10 +- pengine/test10/ticket-master-9.dot | 6 - pengine/test10/ticket-master-9.exp | 64 +- pengine/test10/ticket-master-9.summary | 2 - pengine/test10/ticket-primitive-1.exp | 4 +- pengine/test10/ticket-primitive-10.exp | 4 +- pengine/test10/ticket-primitive-11.exp | 6 +- pengine/test10/ticket-primitive-14.dot | 2 - pengine/test10/ticket-primitive-14.exp | 15 +- pengine/test10/ticket-primitive-14.summary | 1 - pengine/test10/ticket-primitive-15.dot | 2 - pengine/test10/ticket-primitive-15.exp | 15 +- pengine/test10/ticket-primitive-15.summary | 1 - pengine/test10/ticket-primitive-17.dot | 2 - pengine/test10/ticket-primitive-17.exp | 15 +- pengine/test10/ticket-primitive-17.summary | 1 - pengine/test10/ticket-primitive-18.dot | 2 - pengine/test10/ticket-primitive-18.exp | 15 +- pengine/test10/ticket-primitive-18.summary | 1 - pengine/test10/ticket-primitive-2.exp | 6 +- pengine/test10/ticket-primitive-20.dot | 2 - pengine/test10/ticket-primitive-20.exp | 15 +- pengine/test10/ticket-primitive-20.summary | 1 - pengine/test10/ticket-primitive-21.dot | 5 - pengine/test10/ticket-primitive-21.exp | 29 +- pengine/test10/ticket-primitive-21.summary | 2 - pengine/test10/ticket-primitive-23.dot | 2 - pengine/test10/ticket-primitive-23.exp | 15 +- pengine/test10/ticket-primitive-23.summary | 1 - pengine/test10/ticket-primitive-3.dot | 2 - pengine/test10/ticket-primitive-3.exp | 15 +- pengine/test10/ticket-primitive-3.summary | 1 - pengine/test10/ticket-primitive-4.exp | 4 +- pengine/test10/ticket-primitive-5.exp | 6 +- pengine/test10/ticket-primitive-6.dot | 2 - pengine/test10/ticket-primitive-6.exp | 15 +- pengine/test10/ticket-primitive-6.summary | 1 - pengine/test10/ticket-primitive-7.exp | 4 +- pengine/test10/ticket-primitive-8.exp | 6 +- pengine/test10/ticket-primitive-9.dot | 5 - pengine/test10/ticket-primitive-9.exp | 29 +- pengine/test10/ticket-primitive-9.summary | 2 - pengine/test10/ticket-rsc-sets-1.exp | 42 +- pengine/test10/ticket-rsc-sets-10.dot | 6 - pengine/test10/ticket-rsc-sets-10.exp | 77 +- pengine/test10/ticket-rsc-sets-10.summary | 1 - pengine/test10/ticket-rsc-sets-12.dot | 4 - pengine/test10/ticket-rsc-sets-12.exp | 40 +- pengine/test10/ticket-rsc-sets-12.summary | 1 - pengine/test10/ticket-rsc-sets-13.dot | 6 - pengine/test10/ticket-rsc-sets-13.exp | 77 +- pengine/test10/ticket-rsc-sets-13.summary | 1 - pengine/test10/ticket-rsc-sets-14.dot | 6 - pengine/test10/ticket-rsc-sets-14.exp | 77 +- pengine/test10/ticket-rsc-sets-14.summary | 1 - pengine/test10/ticket-rsc-sets-2.exp | 70 +- pengine/test10/ticket-rsc-sets-3.dot | 6 - pengine/test10/ticket-rsc-sets-3.exp | 77 +- pengine/test10/ticket-rsc-sets-3.summary | 1 - pengine/test10/ticket-rsc-sets-4.exp | 42 +- pengine/test10/ticket-rsc-sets-5.exp | 34 +- pengine/test10/ticket-rsc-sets-6.exp | 36 +- pengine/test10/ticket-rsc-sets-7.dot | 6 - pengine/test10/ticket-rsc-sets-7.exp | 77 +- pengine/test10/ticket-rsc-sets-7.summary | 1 - pengine/test10/ticket-rsc-sets-9.dot | 6 - pengine/test10/ticket-rsc-sets-9.exp | 77 +- pengine/test10/ticket-rsc-sets-9.summary | 1 - pengine/test10/unfence-definition.dot | 19 +- pengine/test10/unfence-definition.exp | 189 +-- pengine/test10/unfence-definition.summary | 2 - pengine/test10/unfence-device.exp | 32 +- pengine/test10/unfence-parameters.dot | 19 +- pengine/test10/unfence-parameters.exp | 183 +-- pengine/test10/unfence-parameters.summary | 2 - pengine/test10/unfence-startup.dot | 10 +- pengine/test10/unfence-startup.exp | 94 +- pengine/test10/unfence-startup.summary | 2 - pengine/test10/unmanaged-block-restart.dot | 3 - pengine/test10/unmanaged-block-restart.exp | 12 +- pengine/test10/unmanaged-master.exp | 6 +- pengine/test10/unmanaged-stop-1.dot | 2 - pengine/test10/unmanaged-stop-2.dot | 2 - pengine/test10/unmanaged-stop-3.dot | 2 - pengine/test10/unmanaged-stop-3.exp | 2 +- pengine/test10/unmanaged-stop-4.dot | 2 - pengine/test10/unmanaged-stop-4.exp | 2 +- pengine/test10/unrunnable-1.dot | 2 - pengine/test10/unrunnable-1.exp | 28 +- pengine/test10/use-after-free-merge.exp | 44 +- pengine/test10/utilization-check-allowed-nodes.exp | 18 +- pengine/test10/utilization-order1.dot | 2 - pengine/test10/utilization-order1.exp | 25 +- pengine/test10/utilization-order1.summary | 1 - pengine/test10/utilization-order2.dot | 4 - pengine/test10/utilization-order2.exp | 54 +- pengine/test10/utilization-order2.summary | 1 - pengine/test10/utilization-order3.dot | 2 - pengine/test10/utilization-order3.exp | 43 +- pengine/test10/utilization-order3.summary | 1 - pengine/test10/utilization-order4.dot | 7 - pengine/test10/utilization-order4.exp | 119 +- pengine/test10/utilization-order4.summary | 1 - pengine/test10/utilization-shuffle.exp | 88 +- pengine/test10/utilization.exp | 20 +- pengine/test10/whitebox-asymmetric.exp | 34 +- pengine/test10/whitebox-fail1.dot | 16 +- pengine/test10/whitebox-fail1.exp | 129 +- pengine/test10/whitebox-fail1.summary | 10 +- pengine/test10/whitebox-fail2.dot | 16 +- pengine/test10/whitebox-fail2.exp | 129 +- pengine/test10/whitebox-fail2.summary | 10 +- pengine/test10/whitebox-fail3.dot | 3 +- pengine/test10/whitebox-fail3.exp | 87 +- pengine/test10/whitebox-fail3.summary | 5 +- pengine/test10/whitebox-imply-stop-on-fence.dot | 36 +- pengine/test10/whitebox-imply-stop-on-fence.exp | 246 ++- .../test10/whitebox-imply-stop-on-fence.summary | 18 +- pengine/test10/whitebox-migrate1.dot | 5 - pengine/test10/whitebox-migrate1.exp | 93 +- pengine/test10/whitebox-migrate1.summary | 1 - pengine/test10/whitebox-move.dot | 5 - pengine/test10/whitebox-move.exp | 99 +- pengine/test10/whitebox-move.summary | 1 - pengine/test10/whitebox-ms-ordering-move.dot | 4 - pengine/test10/whitebox-ms-ordering-move.exp | 164 +- pengine/test10/whitebox-ms-ordering-move.summary | 1 - pengine/test10/whitebox-ms-ordering.dot | 28 +- pengine/test10/whitebox-ms-ordering.exp | 260 ++- pengine/test10/whitebox-ms-ordering.summary | 10 +- pengine/test10/whitebox-nested-group.exp | 226 +-- pengine/test10/whitebox-orphan-ms.dot | 8 - pengine/test10/whitebox-orphan-ms.exp | 138 +- pengine/test10/whitebox-orphan-ms.summary | 1 - pengine/test10/whitebox-orphaned.dot | 5 - pengine/test10/whitebox-orphaned.exp | 93 +- pengine/test10/whitebox-orphaned.summary | 1 - pengine/test10/whitebox-start.dot | 4 +- pengine/test10/whitebox-start.exp | 85 +- pengine/test10/whitebox-start.summary | 7 +- pengine/test10/whitebox-stop.dot | 5 - pengine/test10/whitebox-stop.exp | 61 +- pengine/test10/whitebox-stop.summary | 1 - pengine/test10/whitebox-unexpectedly-running.dot | 9 +- pengine/test10/whitebox-unexpectedly-running.exp | 63 +- .../test10/whitebox-unexpectedly-running.summary | 2 - 1412 files changed, 23359 insertions(+), 33813 deletions(-) diff --git a/pengine/test10/1-a-then-bm-move-b.dot b/pengine/test10/1-a-then-bm-move-b.dot index 674bee6..93be6d0 100644 --- a/pengine/test10/1-a-then-bm-move-b.dot +++ b/pengine/test10/1-a-then-bm-move-b.dot @@ -8,7 +8,5 @@ "B_start_0 18node1" -> "B_monitor_60000 18node1" [ style = bold] "B_start_0 18node1" [ style=bold color="green" fontcolor="orange"] "B_stop_0 18node2" -> "B_start_0 18node1" [ style = bold] -"B_stop_0 18node2" -> "all_stopped" [ style = bold] "B_stop_0 18node2" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/1-a-then-bm-move-b.exp b/pengine/test10/1-a-then-bm-move-b.exp index b29c4ff..8019a03 100644 --- a/pengine/test10/1-a-then-bm-move-b.exp +++ b/pengine/test10/1-a-then-bm-move-b.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,54 +23,42 @@ - + - + - + - + - + - + - - - - - - - - - - - - - + diff --git a/pengine/test10/1-a-then-bm-move-b.summary b/pengine/test10/1-a-then-bm-move-b.summary index f4d6207..c7a176b 100644 --- a/pengine/test10/1-a-then-bm-move-b.summary +++ b/pengine/test10/1-a-then-bm-move-b.summary @@ -12,7 +12,6 @@ Executing cluster transition: * Resource action: B migrate_to on 18node2 * Resource action: B migrate_from on 18node1 * Resource action: B stop on 18node2 - * Pseudo action: all_stopped * Pseudo action: B_start_0 * Resource action: B monitor=60000 on 18node1 diff --git a/pengine/test10/10-a-then-bm-b-move-a-clone.dot b/pengine/test10/10-a-then-bm-b-move-a-clone.dot index cc6a5a2..cd948f5 100644 --- a/pengine/test10/10-a-then-bm-b-move-a-clone.dot +++ b/pengine/test10/10-a-then-bm-b-move-a-clone.dot @@ -1,10 +1,8 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "myclone-clone_stop_0" -> "myclone-clone_stopped_0" [ style = bold] "myclone-clone_stop_0" -> "myclone_stop_0 f20node1" [ style = bold] "myclone-clone_stop_0" [ style=bold color="green" fontcolor="orange"] "myclone-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] -"myclone_stop_0 f20node1" -> "all_stopped" [ style = bold] "myclone_stop_0 f20node1" -> "myclone-clone_stopped_0" [ style = bold] "myclone_stop_0 f20node1" [ style=bold color="green" fontcolor="black"] "vm_migrate_from_0 f20node2" -> "vm_start_0 f20node2" [ style = bold] @@ -13,7 +11,6 @@ "vm_migrate_to_0 f20node1" -> "vm_migrate_from_0 f20node2" [ style = bold] "vm_migrate_to_0 f20node1" [ style=bold color="green" fontcolor="black"] "vm_start_0 f20node2" [ style=bold color="green" fontcolor="orange"] -"vm_stop_0 f20node1" -> "all_stopped" [ style = bold] "vm_stop_0 f20node1" -> "myclone-clone_stop_0" [ style = bold] "vm_stop_0 f20node1" -> "vm_start_0 f20node2" [ style = bold] "vm_stop_0 f20node1" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/10-a-then-bm-b-move-a-clone.exp b/pengine/test10/10-a-then-bm-b-move-a-clone.exp index c7ea7dc..5cead0d 100644 --- a/pengine/test10/10-a-then-bm-b-move-a-clone.exp +++ b/pengine/test10/10-a-then-bm-b-move-a-clone.exp @@ -1,60 +1,60 @@ - + - + - + - + - + - + - + - + - + - + @@ -63,44 +63,29 @@ - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/10-a-then-bm-b-move-a-clone.summary b/pengine/test10/10-a-then-bm-b-move-a-clone.summary index ee7697f..b378c9c 100644 --- a/pengine/test10/10-a-then-bm-b-move-a-clone.summary +++ b/pengine/test10/10-a-then-bm-b-move-a-clone.summary @@ -19,7 +19,6 @@ Executing cluster transition: * Pseudo action: vm_start_0 * Resource action: myclone stop on f20node1 * Pseudo action: myclone-clone_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Node f20node1 (1): standby diff --git a/pengine/test10/11-a-then-bm-b-move-a-clone-starting.dot b/pengine/test10/11-a-then-bm-b-move-a-clone-starting.dot index f9b1125..2b45d58 100644 --- a/pengine/test10/11-a-then-bm-b-move-a-clone-starting.dot +++ b/pengine/test10/11-a-then-bm-b-move-a-clone-starting.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "myclone-clone_running_0" -> "vm_migrate_to_0 f20node1" [ style = dashed] "myclone-clone_running_0" -> "vm_start_0 f20node2" [ style = bold] "myclone-clone_running_0" [ style=bold color="green" fontcolor="orange"] @@ -15,7 +14,6 @@ "myclone_monitor_0 f20node2" [ style=bold color="green" fontcolor="black"] "myclone_start_0 f20node2" -> "myclone-clone_running_0" [ style = bold] "myclone_start_0 f20node2" [ style=bold color="green" fontcolor="black"] -"myclone_stop_0 f20node1" -> "all_stopped" [ style = bold] "myclone_stop_0 f20node1" -> "myclone-clone_stopped_0" [ style = bold] "myclone_stop_0 f20node1" -> "myclone_start_0 f20node2" [ style = bold] "myclone_stop_0 f20node1" [ style=bold color="green" fontcolor="black"] @@ -25,7 +23,6 @@ "vm_migrate_to_0 f20node1" -> "vm_migrate_from_0 f20node2" [ style = dashed] "vm_migrate_to_0 f20node1" [ style=dashed color="red" fontcolor="black"] "vm_start_0 f20node2" [ style=bold color="green" fontcolor="black"] -"vm_stop_0 f20node1" -> "all_stopped" [ style = bold] "vm_stop_0 f20node1" -> "myclone-clone_stop_0" [ style = bold] "vm_stop_0 f20node1" -> "vm_start_0 f20node2" [ style = bold] "vm_stop_0 f20node1" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/11-a-then-bm-b-move-a-clone-starting.exp b/pengine/test10/11-a-then-bm-b-move-a-clone-starting.exp index 3f17925..b391b42 100644 --- a/pengine/test10/11-a-then-bm-b-move-a-clone-starting.exp +++ b/pengine/test10/11-a-then-bm-b-move-a-clone-starting.exp @@ -1,36 +1,36 @@ - + - + - + - + - + - + @@ -39,99 +39,84 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - diff --git a/pengine/test10/11-a-then-bm-b-move-a-clone-starting.summary b/pengine/test10/11-a-then-bm-b-move-a-clone-starting.summary index 9138c81..3e909d1 100644 --- a/pengine/test10/11-a-then-bm-b-move-a-clone-starting.summary +++ b/pengine/test10/11-a-then-bm-b-move-a-clone-starting.summary @@ -19,7 +19,6 @@ Executing cluster transition: * Resource action: myclone stop on f20node1 * Pseudo action: myclone-clone_stopped_0 * Pseudo action: myclone-clone_start_0 - * Pseudo action: all_stopped * Resource action: myclone start on f20node2 * Pseudo action: myclone-clone_running_0 * Resource action: vm start on f20node2 diff --git a/pengine/test10/1360.dot b/pengine/test10/1360.dot index 48ba497..c5d7df0 100644 --- a/pengine/test10/1360.dot +++ b/pengine/test10/1360.dot @@ -1,8 +1,6 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "dollies:0_start_0 ssgtest1b" -> "dolly_running_0" [ style = bold] "dollies:0_start_0 ssgtest1b" [ style=bold color="green" fontcolor="black" ] -"dollies:0_stop_0 ssgtest1a" -> "all_stopped" [ style = bold] "dollies:0_stop_0 ssgtest1a" -> "dollies:0_start_0 ssgtest1b" [ style = bold] "dollies:0_stop_0 ssgtest1a" -> "dolly_stopped_0" [ style = bold] "dollies:0_stop_0 ssgtest1a" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/1360.exp b/pengine/test10/1360.exp index 4db2681..a31674e 100644 --- a/pengine/test10/1360.exp +++ b/pengine/test10/1360.exp @@ -1,51 +1,51 @@ - + - + - + - + - + - + - + - + - + @@ -53,40 +53,28 @@ - + - + - + - + - - - - - - - - - - - - - + diff --git a/pengine/test10/1360.summary b/pengine/test10/1360.summary index acff1b8..396cc54 100644 --- a/pengine/test10/1360.summary +++ b/pengine/test10/1360.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Resource action: dollies:0 stop on ssgtest1a * Pseudo action: dolly_stopped_0 * Pseudo action: dolly_start_0 - * Pseudo action: all_stopped * Resource action: dollies:0 start on ssgtest1b * Pseudo action: dolly_running_0 diff --git a/pengine/test10/1484.dot b/pengine/test10/1484.dot index c3837d1..17d0b9e 100644 --- a/pengine/test10/1484.dot +++ b/pengine/test10/1484.dot @@ -1,7 +1,5 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "the-future-of-vaj_start_0 " [ style=dashed color="red" fontcolor="black" ] -"the-future-of-vaj_stop_0 hb2" -> "all_stopped" [ style = bold] "the-future-of-vaj_stop_0 hb2" -> "the-future-of-vaj_start_0 " [ style = dashed] "the-future-of-vaj_stop_0 hb2" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/1484.exp b/pengine/test10/1484.exp index 91807b8..bbd4111 100644 --- a/pengine/test10/1484.exp +++ b/pengine/test10/1484.exp @@ -1,24 +1,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/1484.summary b/pengine/test10/1484.summary index 4b5d8a6..0a63925 100644 --- a/pengine/test10/1484.summary +++ b/pengine/test10/1484.summary @@ -10,7 +10,6 @@ Transition Summary: Executing cluster transition: * Resource action: the-future-of-vaj stop on hb2 - * Pseudo action: all_stopped Revised cluster status: Online: [ hb1 hb2 ] diff --git a/pengine/test10/1494.dot b/pengine/test10/1494.dot index 54586f1..df56072 100644 --- a/pengine/test10/1494.dot +++ b/pengine/test10/1494.dot @@ -1,10 +1,8 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "ima_cloneid_stop_0" -> "ima_cloneid_stopped_0" [ style = bold] "ima_cloneid_stop_0" -> "ima_rscid:0_stop_0 hb1" [ style = bold] "ima_cloneid_stop_0" [ style=bold color="green" fontcolor="orange" ] "ima_cloneid_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"ima_rscid:0_stop_0 hb1" -> "all_stopped" [ style = bold] "ima_rscid:0_stop_0 hb1" -> "ima_cloneid_stopped_0" [ style = bold] "ima_rscid:0_stop_0 hb1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/1494.exp b/pengine/test10/1494.exp index b5e03e9..d549879 100644 --- a/pengine/test10/1494.exp +++ b/pengine/test10/1494.exp @@ -1,51 +1,38 @@ - + - + - + - + - + - + - - - - - - - - - - - - - diff --git a/pengine/test10/1494.summary b/pengine/test10/1494.summary index be13fdd..b3f85ae 100644 --- a/pengine/test10/1494.summary +++ b/pengine/test10/1494.summary @@ -14,7 +14,6 @@ Executing cluster transition: * Pseudo action: ima_cloneid_stop_0 * Resource action: ima_rscid:0 stop on hb1 * Pseudo action: ima_cloneid_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ hb1 hb2 ] diff --git a/pengine/test10/2-am-then-b-move-a.dot b/pengine/test10/2-am-then-b-move-a.dot index f54a578..12d40eb 100644 --- a/pengine/test10/2-am-then-b-move-a.dot +++ b/pengine/test10/2-am-then-b-move-a.dot @@ -8,7 +8,5 @@ "A_start_0 18node2" -> "A_monitor_60000 18node2" [ style = bold] "A_start_0 18node2" [ style=bold color="green" fontcolor="orange"] "A_stop_0 18node1" -> "A_start_0 18node2" [ style = bold] -"A_stop_0 18node1" -> "all_stopped" [ style = bold] "A_stop_0 18node1" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/2-am-then-b-move-a.exp b/pengine/test10/2-am-then-b-move-a.exp index ed7d3fa..25ecb63 100644 --- a/pengine/test10/2-am-then-b-move-a.exp +++ b/pengine/test10/2-am-then-b-move-a.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,54 +23,42 @@ - + - + - + - + - + - + - - - - - - - - - - - - - + diff --git a/pengine/test10/2-am-then-b-move-a.summary b/pengine/test10/2-am-then-b-move-a.summary index a238cf6..ac90e68 100644 --- a/pengine/test10/2-am-then-b-move-a.summary +++ b/pengine/test10/2-am-then-b-move-a.summary @@ -12,7 +12,6 @@ Executing cluster transition: * Resource action: A migrate_to on 18node1 * Resource action: A migrate_from on 18node2 * Resource action: A stop on 18node1 - * Pseudo action: all_stopped * Pseudo action: A_start_0 * Resource action: A monitor=60000 on 18node2 diff --git a/pengine/test10/3-am-then-bm-both-migrate.dot b/pengine/test10/3-am-then-bm-both-migrate.dot index c989457..a80b6cd 100644 --- a/pengine/test10/3-am-then-bm-both-migrate.dot +++ b/pengine/test10/3-am-then-bm-both-migrate.dot @@ -11,7 +11,6 @@ "A_start_0 18node2" -> "B_start_0 18node1" [ style = bold] "A_start_0 18node2" [ style=bold color="green" fontcolor="orange"] "A_stop_0 18node1" -> "A_start_0 18node2" [ style = bold] -"A_stop_0 18node1" -> "all_stopped" [ style = bold] "A_stop_0 18node1" [ style=bold color="green" fontcolor="black"] "B_migrate_from_0 18node1" -> "B_start_0 18node1" [ style = bold] "B_migrate_from_0 18node1" -> "B_stop_0 18node2" [ style = bold] @@ -24,7 +23,5 @@ "B_stop_0 18node2" -> "A_migrate_to_0 18node1" [ style = dashed] "B_stop_0 18node2" -> "A_stop_0 18node1" [ style = bold] "B_stop_0 18node2" -> "B_start_0 18node1" [ style = bold] -"B_stop_0 18node2" -> "all_stopped" [ style = bold] "B_stop_0 18node2" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/3-am-then-bm-both-migrate.exp b/pengine/test10/3-am-then-bm-both-migrate.exp index aac63ba..b3c065c 100644 --- a/pengine/test10/3-am-then-bm-both-migrate.exp +++ b/pengine/test10/3-am-then-bm-both-migrate.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,130 +23,115 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/3-am-then-bm-both-migrate.summary b/pengine/test10/3-am-then-bm-both-migrate.summary index d938449..6a50df8 100644 --- a/pengine/test10/3-am-then-bm-both-migrate.summary +++ b/pengine/test10/3-am-then-bm-both-migrate.summary @@ -16,7 +16,6 @@ Executing cluster transition: * Resource action: B migrate_from on 18node1 * Resource action: B stop on 18node2 * Resource action: A stop on 18node1 - * Pseudo action: all_stopped * Pseudo action: A_start_0 * Pseudo action: B_start_0 * Resource action: A monitor=60000 on 18node2 diff --git a/pengine/test10/4-am-then-bm-b-not-migratable.dot b/pengine/test10/4-am-then-bm-b-not-migratable.dot index 99d52e2..08312e9 100644 --- a/pengine/test10/4-am-then-bm-b-not-migratable.dot +++ b/pengine/test10/4-am-then-bm-b-not-migratable.dot @@ -9,7 +9,6 @@ "A_start_0 18node2" -> "B_start_0 18node1" [ style = bold] "A_start_0 18node2" [ style=bold color="green" fontcolor="orange"] "A_stop_0 18node1" -> "A_start_0 18node2" [ style = bold] -"A_stop_0 18node1" -> "all_stopped" [ style = bold] "A_stop_0 18node1" [ style=bold color="green" fontcolor="black"] "B_monitor_60000 18node1" [ style=bold color="green" fontcolor="black"] "B_start_0 18node1" -> "B_monitor_60000 18node1" [ style = bold] @@ -17,7 +16,5 @@ "B_stop_0 18node2" -> "A_migrate_to_0 18node1" [ style = bold] "B_stop_0 18node2" -> "A_stop_0 18node1" [ style = bold] "B_stop_0 18node2" -> "B_start_0 18node1" [ style = bold] -"B_stop_0 18node2" -> "all_stopped" [ style = bold] "B_stop_0 18node2" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/4-am-then-bm-b-not-migratable.exp b/pengine/test10/4-am-then-bm-b-not-migratable.exp index 66aa4ad..2edba79 100644 --- a/pengine/test10/4-am-then-bm-b-not-migratable.exp +++ b/pengine/test10/4-am-then-bm-b-not-migratable.exp @@ -1,125 +1,110 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - diff --git a/pengine/test10/4-am-then-bm-b-not-migratable.summary b/pengine/test10/4-am-then-bm-b-not-migratable.summary index 16ce149..f17b66a 100644 --- a/pengine/test10/4-am-then-bm-b-not-migratable.summary +++ b/pengine/test10/4-am-then-bm-b-not-migratable.summary @@ -14,7 +14,6 @@ Executing cluster transition: * Resource action: A migrate_to on 18node1 * Resource action: A migrate_from on 18node2 * Resource action: A stop on 18node1 - * Pseudo action: all_stopped * Pseudo action: A_start_0 * Resource action: B start on 18node1 * Resource action: A monitor=60000 on 18node2 diff --git a/pengine/test10/5-am-then-bm-a-not-migratable.dot b/pengine/test10/5-am-then-bm-a-not-migratable.dot index 83a8fb6..baf3ba1 100644 --- a/pengine/test10/5-am-then-bm-a-not-migratable.dot +++ b/pengine/test10/5-am-then-bm-a-not-migratable.dot @@ -5,7 +5,6 @@ "A_start_0 18node2" -> "B_start_0 18node1" [ style = bold] "A_start_0 18node2" [ style=bold color="green" fontcolor="black"] "A_stop_0 18node1" -> "A_start_0 18node2" [ style = bold] -"A_stop_0 18node1" -> "all_stopped" [ style = bold] "A_stop_0 18node1" [ style=bold color="green" fontcolor="black"] "B_migrate_from_0 18node1" -> "B_start_0 18node1" [ style = dashed] "B_migrate_from_0 18node1" -> "B_stop_0 18node2" [ style = dashed] @@ -17,7 +16,5 @@ "B_start_0 18node1" [ style=bold color="green" fontcolor="black"] "B_stop_0 18node2" -> "A_stop_0 18node1" [ style = bold] "B_stop_0 18node2" -> "B_start_0 18node1" [ style = bold] -"B_stop_0 18node2" -> "all_stopped" [ style = bold] "B_stop_0 18node2" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/5-am-then-bm-a-not-migratable.exp b/pengine/test10/5-am-then-bm-a-not-migratable.exp index c3bb278..cf69cdb 100644 --- a/pengine/test10/5-am-then-bm-a-not-migratable.exp +++ b/pengine/test10/5-am-then-bm-a-not-migratable.exp @@ -1,94 +1,79 @@ - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - diff --git a/pengine/test10/5-am-then-bm-a-not-migratable.summary b/pengine/test10/5-am-then-bm-a-not-migratable.summary index fa1dc33..8eb16d0 100644 --- a/pengine/test10/5-am-then-bm-a-not-migratable.summary +++ b/pengine/test10/5-am-then-bm-a-not-migratable.summary @@ -12,7 +12,6 @@ Transition Summary: Executing cluster transition: * Resource action: B stop on 18node2 * Resource action: A stop on 18node1 - * Pseudo action: all_stopped * Resource action: A start on 18node2 * Resource action: B start on 18node1 * Resource action: A monitor=60000 on 18node2 diff --git a/pengine/test10/594.dot b/pengine/test10/594.dot index dcc2795..4f3ea64 100644 --- a/pengine/test10/594.dot +++ b/pengine/test10/594.dot @@ -5,7 +5,6 @@ digraph "g" { "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] @@ -13,15 +12,12 @@ digraph "g" { "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" [ 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] @@ -29,15 +25,11 @@ digraph "g" { "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" -> "DcIPaddr_start_0 hadev1" [ style = bold] +"stonith 'reboot' hadev3" -> "rsc_hadev2_start_0 hadev1" [ 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 fb2e9dd..0bbf746 100644 --- a/pengine/test10/594.exp +++ b/pengine/test10/594.exp @@ -1,39 +1,39 @@ - + - + - + - + - + - + - + @@ -42,7 +42,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -60,39 +60,39 @@ - + - + - + - + - + - + - + @@ -101,7 +101,7 @@ - + @@ -110,20 +110,20 @@ - + - + - + @@ -132,20 +132,20 @@ - + - + - + @@ -154,25 +154,25 @@ - + - + - + - + - + @@ -180,7 +180,7 @@ - + @@ -189,54 +189,18 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/594.summary b/pengine/test10/594.summary index fc15c50..85a5cfd 100644 --- a/pengine/test10/594.summary +++ b/pengine/test10/594.summary @@ -30,14 +30,12 @@ Executing cluster transition: * Resource action: child_DoFencing:2 monitor on hadev2 * Pseudo action: DoFencing_stop_0 * Fencing hadev3 (reboot) + * Resource action: DcIPaddr start on hadev1 + * Resource action: rsc_hadev2 start on hadev1 * Resource action: child_DoFencing:0 stop on hadev2 * Resource action: child_DoFencing:2 stop on hadev1 * Pseudo action: DoFencing_stopped_0 * Cluster action: do_shutdown on hadev2 - * Pseudo action: stonith_complete - * Pseudo action: all_stopped - * Resource action: DcIPaddr start on hadev1 - * Resource action: rsc_hadev2 start on hadev1 * Resource action: DcIPaddr monitor=5000 on hadev1 * Resource action: rsc_hadev2 monitor=5000 on hadev1 diff --git a/pengine/test10/6-migrate-group.dot b/pengine/test10/6-migrate-group.dot index 7aa8978..c4b6ad7 100644 --- a/pengine/test10/6-migrate-group.dot +++ b/pengine/test10/6-migrate-group.dot @@ -12,7 +12,6 @@ "A_start_0 18node2" -> "thegroup_running_0" [ style = bold] "A_start_0 18node2" [ style=bold color="green" fontcolor="orange"] "A_stop_0 18node1" -> "A_start_0 18node2" [ style = bold] -"A_stop_0 18node1" -> "all_stopped" [ style = bold] "A_stop_0 18node1" -> "thegroup_stopped_0" [ style = bold] "A_stop_0 18node1" [ style=bold color="green" fontcolor="black"] "B_migrate_from_0 18node2" -> "B_start_0 18node2" [ style = bold] @@ -30,7 +29,6 @@ "B_stop_0 18node1" -> "A_migrate_to_0 18node1" [ style = dashed] "B_stop_0 18node1" -> "A_stop_0 18node1" [ style = bold] "B_stop_0 18node1" -> "B_start_0 18node2" [ style = bold] -"B_stop_0 18node1" -> "all_stopped" [ style = bold] "B_stop_0 18node1" -> "thegroup_stopped_0" [ style = bold] "B_stop_0 18node1" [ style=bold color="green" fontcolor="black"] "C_migrate_from_0 18node2" -> "C_start_0 18node2" [ style = bold] @@ -45,11 +43,9 @@ "C_stop_0 18node1" -> "B_migrate_to_0 18node1" [ style = dashed] "C_stop_0 18node1" -> "B_stop_0 18node1" [ style = bold] "C_stop_0 18node1" -> "C_start_0 18node2" [ style = bold] -"C_stop_0 18node1" -> "all_stopped" [ style = bold] "C_stop_0 18node1" -> "thegroup_stopped_0" [ style = bold] "C_stop_0 18node1" -> "thegroup_stopped_0" [ style = dashed] "C_stop_0 18node1" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "thegroup_running_0" [ style=bold color="green" fontcolor="orange"] "thegroup_start_0" -> "A_start_0 18node2" [ style = bold] "thegroup_start_0" -> "B_start_0 18node2" [ style = bold] diff --git a/pengine/test10/6-migrate-group.exp b/pengine/test10/6-migrate-group.exp index 23c5fae..1b17af5 100644 --- a/pengine/test10/6-migrate-group.exp +++ b/pengine/test10/6-migrate-group.exp @@ -1,28 +1,28 @@ - + - + - + - + - + - + @@ -30,53 +30,53 @@ - + - + - + - + - + - + - + - + - + - + @@ -85,224 +85,206 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/6-migrate-group.summary b/pengine/test10/6-migrate-group.summary index c7c9f6d..00ebb4d 100644 --- a/pengine/test10/6-migrate-group.summary +++ b/pengine/test10/6-migrate-group.summary @@ -23,7 +23,6 @@ Executing cluster transition: * Resource action: C stop on 18node1 * Resource action: B stop on 18node1 * Resource action: A stop on 18node1 - * Pseudo action: all_stopped * Pseudo action: thegroup_stopped_0 * Pseudo action: thegroup_start_0 * Pseudo action: A_start_0 diff --git a/pengine/test10/662.dot b/pengine/test10/662.dot index 524e968..9848322 100644 --- a/pengine/test10/662.dot +++ b/pengine/test10/662.dot @@ -6,11 +6,9 @@ "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" [ style=bold color="green" fontcolor="black" ] "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" ] @@ -30,7 +28,6 @@ "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" ] diff --git a/pengine/test10/662.exp b/pengine/test10/662.exp index 8aa7140..3751565 100644 --- a/pengine/test10/662.exp +++ b/pengine/test10/662.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,42 +55,42 @@ - + - + - + - + - + - + - + - + @@ -99,7 +99,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -144,7 +144,7 @@ - + @@ -153,7 +153,7 @@ - + @@ -162,7 +162,7 @@ - + @@ -171,20 +171,20 @@ - + - + - + @@ -193,7 +193,7 @@ - + @@ -202,7 +202,7 @@ - + @@ -211,7 +211,7 @@ - + @@ -220,7 +220,7 @@ - + @@ -229,7 +229,7 @@ - + @@ -238,7 +238,7 @@ - + @@ -247,7 +247,7 @@ - + @@ -256,7 +256,7 @@ - + @@ -265,22 +265,22 @@ - + - + - + - + @@ -288,7 +288,7 @@ - + @@ -297,25 +297,10 @@ - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/662.summary b/pengine/test10/662.summary index 569b178..9361816 100644 --- a/pengine/test10/662.summary +++ b/pengine/test10/662.summary @@ -48,7 +48,6 @@ Executing cluster transition: * Resource action: child_DoFencing:0 stop on c001n02 * Pseudo action: DoFencing_stopped_0 * Cluster action: do_shutdown on c001n02 - * Pseudo action: all_stopped * Resource action: rsc_c001n02 monitor=5000 on c001n03 Revised cluster status: diff --git a/pengine/test10/696.dot b/pengine/test10/696.dot index 032e927..2ae2686 100644 --- a/pengine/test10/696.dot +++ b/pengine/test10/696.dot @@ -10,7 +10,6 @@ "DoFencing_start_0" -> "DoFencing_running_0" [ style = bold] "DoFencing_start_0" -> "child_DoFencing:2_start_0 hadev1" [ style = bold] "DoFencing_start_0" [ style=bold color="green" fontcolor="orange" ] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:0_monitor_0 hadev1" -> "DoFencing_start_0" [ style = bold] "child_DoFencing:0_monitor_0 hadev1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_monitor_0 hadev3" -> "DoFencing_start_0" [ style = bold] @@ -38,7 +37,6 @@ "rsc_hadev1_monitor_5000 hadev1" [ style=bold color="green" fontcolor="black" ] "rsc_hadev1_start_0 hadev1" -> "rsc_hadev1_monitor_5000 hadev1" [ style = bold] "rsc_hadev1_start_0 hadev1" [ style=bold color="green" fontcolor="black" ] -"rsc_hadev1_stop_0 hadev3" -> "all_stopped" [ style = bold] "rsc_hadev1_stop_0 hadev3" -> "rsc_hadev1_start_0 hadev1" [ style = bold] "rsc_hadev1_stop_0 hadev3" [ style=bold color="green" fontcolor="black" ] "rsc_hadev2_monitor_0 hadev1" -> "rsc_hadev2_start_0 hadev2" [ style = bold] diff --git a/pengine/test10/696.exp b/pengine/test10/696.exp index 74615b1..06f81ef 100644 --- a/pengine/test10/696.exp +++ b/pengine/test10/696.exp @@ -1,36 +1,36 @@ - + - + - + - + - + - + @@ -39,7 +39,7 @@ - + @@ -48,39 +48,39 @@ - + - + - + - + - + - + - + @@ -89,7 +89,7 @@ - + @@ -98,7 +98,7 @@ - + @@ -107,36 +107,36 @@ - + - + - + - + - + - + @@ -145,7 +145,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -226,7 +226,7 @@ - + @@ -235,33 +235,33 @@ - + - + - + - + - + @@ -270,7 +270,7 @@ - + @@ -279,7 +279,7 @@ - + @@ -288,58 +288,46 @@ - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - + diff --git a/pengine/test10/696.summary b/pengine/test10/696.summary index 6f6998a..965cf04 100644 --- a/pengine/test10/696.summary +++ b/pengine/test10/696.summary @@ -36,7 +36,6 @@ Executing cluster transition: * Resource action: child_DoFencing:2 monitor on hadev2 * Resource action: child_DoFencing:2 monitor on hadev1 * Pseudo action: DoFencing_start_0 - * Pseudo action: all_stopped * Resource action: DcIPaddr start on hadev2 * Resource action: rsc_hadev1 start on hadev1 * Resource action: rsc_hadev2 start on hadev2 diff --git a/pengine/test10/7-migrate-group-one-unmigratable.dot b/pengine/test10/7-migrate-group-one-unmigratable.dot index 4671da4..a3eee49 100644 --- a/pengine/test10/7-migrate-group-one-unmigratable.dot +++ b/pengine/test10/7-migrate-group-one-unmigratable.dot @@ -10,7 +10,6 @@ "A_start_0 18node2" -> "thegroup_running_0" [ style = bold] "A_start_0 18node2" [ style=bold color="green" fontcolor="orange"] "A_stop_0 18node1" -> "A_start_0 18node2" [ style = bold] -"A_stop_0 18node1" -> "all_stopped" [ style = bold] "A_stop_0 18node1" -> "thegroup_stopped_0" [ style = bold] "A_stop_0 18node1" [ style=bold color="green" fontcolor="black"] "B_monitor_60000 18node2" [ style=bold color="green" fontcolor="black"] @@ -22,7 +21,6 @@ "B_stop_0 18node1" -> "A_migrate_to_0 18node1" [ style = bold] "B_stop_0 18node1" -> "A_stop_0 18node1" [ style = bold] "B_stop_0 18node1" -> "B_start_0 18node2" [ style = bold] -"B_stop_0 18node1" -> "all_stopped" [ style = bold] "B_stop_0 18node1" -> "thegroup_stopped_0" [ style = bold] "B_stop_0 18node1" [ style=bold color="green" fontcolor="black"] "C_migrate_from_0 18node2" -> "C_start_0 18node2" [ style = dashed] @@ -36,10 +34,8 @@ "C_start_0 18node2" [ style=bold color="green" fontcolor="black"] "C_stop_0 18node1" -> "B_stop_0 18node1" [ style = bold] "C_stop_0 18node1" -> "C_start_0 18node2" [ style = bold] -"C_stop_0 18node1" -> "all_stopped" [ style = bold] "C_stop_0 18node1" -> "thegroup_stopped_0" [ style = bold] "C_stop_0 18node1" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "thegroup_running_0" [ style=bold color="green" fontcolor="orange"] "thegroup_start_0" -> "A_start_0 18node2" [ style = bold] "thegroup_start_0" -> "B_start_0 18node2" [ style = bold] diff --git a/pengine/test10/7-migrate-group-one-unmigratable.exp b/pengine/test10/7-migrate-group-one-unmigratable.exp index 8005321..b1ad13f 100644 --- a/pengine/test10/7-migrate-group-one-unmigratable.exp +++ b/pengine/test10/7-migrate-group-one-unmigratable.exp @@ -1,28 +1,28 @@ - + - + - + - + - + - + @@ -30,221 +30,203 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/7-migrate-group-one-unmigratable.summary b/pengine/test10/7-migrate-group-one-unmigratable.summary index 6c6b127..a1cafba 100644 --- a/pengine/test10/7-migrate-group-one-unmigratable.summary +++ b/pengine/test10/7-migrate-group-one-unmigratable.summary @@ -19,7 +19,6 @@ Executing cluster transition: * Resource action: A migrate_to on 18node1 * Resource action: A migrate_from on 18node2 * Resource action: A stop on 18node1 - * Pseudo action: all_stopped * Pseudo action: thegroup_stopped_0 * Pseudo action: thegroup_start_0 * Pseudo action: A_start_0 diff --git a/pengine/test10/726.dot b/pengine/test10/726.dot index be2a036..f24c2b7 100644 --- a/pengine/test10/726.dot +++ b/pengine/test10/726.dot @@ -10,7 +10,6 @@ "DoFencing_start_0" -> "child_DoFencing:2_start_0 ibm1" [ style = bold] "DoFencing_start_0" -> "child_DoFencing:3_start_0 sgi2" [ style = bold] "DoFencing_start_0" [ style=bold color="green" fontcolor="orange" ] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:0_monitor_0 ibm1" -> "DoFencing_start_0" [ style = bold] "child_DoFencing:0_monitor_0 ibm1" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_monitor_0 sgi2" -> "DoFencing_start_0" [ style = bold] @@ -62,7 +61,6 @@ "rsc_ibm1_monitor_5000 ibm1" [ style=bold color="green" fontcolor="black" ] "rsc_ibm1_start_0 ibm1" -> "rsc_ibm1_monitor_5000 ibm1" [ style = bold] "rsc_ibm1_start_0 ibm1" [ style=bold color="green" fontcolor="black" ] -"rsc_ibm1_stop_0 test03" -> "all_stopped" [ style = bold] "rsc_ibm1_stop_0 test03" -> "rsc_ibm1_start_0 ibm1" [ style = bold] "rsc_ibm1_stop_0 test03" [ style=bold color="green" fontcolor="black" ] "rsc_sgi2_monitor_0 ibm1" -> "rsc_sgi2_start_0 sgi2" [ style = bold] diff --git a/pengine/test10/726.exp b/pengine/test10/726.exp index 737218e..470be8f 100644 --- a/pengine/test10/726.exp +++ b/pengine/test10/726.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,42 +37,42 @@ - + - + - + - + - + - + - + - + @@ -81,7 +81,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -99,7 +99,7 @@ - + @@ -108,42 +108,42 @@ - + - + - + - + - + - + - + - + @@ -152,7 +152,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -170,7 +170,7 @@ - + @@ -179,42 +179,42 @@ - + - + - + - + - + - + - + - + @@ -223,7 +223,7 @@ - + @@ -232,7 +232,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -250,7 +250,7 @@ - + @@ -259,7 +259,7 @@ - + @@ -268,7 +268,7 @@ - + @@ -277,7 +277,7 @@ - + @@ -286,33 +286,33 @@ - + - + - + - + - + @@ -321,7 +321,7 @@ - + @@ -330,33 +330,33 @@ - + - + - + - + - + @@ -365,7 +365,7 @@ - + @@ -374,7 +374,7 @@ - + @@ -383,33 +383,33 @@ - + - + - + - + - + @@ -418,7 +418,7 @@ - + @@ -427,7 +427,7 @@ - + @@ -436,7 +436,7 @@ - + @@ -445,33 +445,33 @@ - + - + - + - + - + @@ -480,7 +480,7 @@ - + @@ -489,7 +489,7 @@ - + @@ -498,7 +498,7 @@ - + @@ -507,85 +507,73 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - + diff --git a/pengine/test10/726.summary b/pengine/test10/726.summary index f525dcc..9196db8 100644 --- a/pengine/test10/726.summary +++ b/pengine/test10/726.summary @@ -55,7 +55,6 @@ Executing cluster transition: * Resource action: child_DoFencing:3 monitor on sgi2 * Resource action: child_DoFencing:3 monitor on ibm1 * Pseudo action: DoFencing_start_0 - * Pseudo action: all_stopped * Resource action: rsc_sgi2 start on sgi2 * Resource action: rsc_ibm1 start on ibm1 * Resource action: rsc_test02 start on test02 diff --git a/pengine/test10/735.dot b/pengine/test10/735.dot index 228cc93..5f40c64 100644 --- a/pengine/test10/735.dot +++ b/pengine/test10/735.dot @@ -5,7 +5,6 @@ "DoFencing_start_0" -> "child_DoFencing:0_start_0 hadev2" [ style = bold] "DoFencing_start_0" -> "child_DoFencing:1_start_0 hadev3" [ style = bold] "DoFencing_start_0" [ style=bold color="green" fontcolor="orange" ] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:0_monitor_0 hadev3" -> "DoFencing_start_0" [ style = bold] "child_DoFencing:0_monitor_0 hadev3" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_monitor_5000 hadev2" [ style=bold color="green" fontcolor="black" ] @@ -21,7 +20,6 @@ "rsc_hadev1_monitor_5000 hadev3" [ style=bold color="green" fontcolor="black" ] "rsc_hadev1_start_0 hadev3" -> "rsc_hadev1_monitor_5000 hadev3" [ style = bold] "rsc_hadev1_start_0 hadev3" [ style=bold color="green" fontcolor="black" ] -"rsc_hadev1_stop_0 hadev2" -> "all_stopped" [ style = bold] "rsc_hadev1_stop_0 hadev2" -> "rsc_hadev1_start_0 hadev3" [ style = bold] "rsc_hadev1_stop_0 hadev2" [ style=bold color="green" fontcolor="black" ] "rsc_hadev2_monitor_0 hadev3" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/735.exp b/pengine/test10/735.exp index b5f89bf..60bc4e0 100644 --- a/pengine/test10/735.exp +++ b/pengine/test10/735.exp @@ -1,7 +1,7 @@ - + @@ -10,20 +10,20 @@ - + - + - + @@ -32,20 +32,20 @@ - + - + - + @@ -54,20 +54,20 @@ - + - + - + @@ -76,33 +76,33 @@ - + - + - + - + - + @@ -111,33 +111,33 @@ - + - + - + - + - + @@ -146,46 +146,34 @@ - + - + - + - + - + - + - - - - - - - - - - - - - + diff --git a/pengine/test10/735.summary b/pengine/test10/735.summary index 2db520a..38b90ad 100644 --- a/pengine/test10/735.summary +++ b/pengine/test10/735.summary @@ -27,7 +27,6 @@ Executing cluster transition: * Resource action: child_DoFencing:0 monitor on hadev3 * Resource action: child_DoFencing:2 monitor on hadev3 * Pseudo action: DoFencing_start_0 - * Pseudo action: all_stopped * Resource action: rsc_hadev1 monitor=5000 on hadev3 * Resource action: rsc_hadev3 monitor=5000 on hadev3 * Resource action: child_DoFencing:0 start on hadev2 diff --git a/pengine/test10/764.dot b/pengine/test10/764.dot index 886cbb7..d486343 100644 --- a/pengine/test10/764.dot +++ b/pengine/test10/764.dot @@ -5,9 +5,7 @@ "DcIPaddr_start_0 posic043" -> "DcIPaddr_monitor_5000 posic043" [ style = dashed] "DcIPaddr_start_0 posic043" [ style=dashed color="red" fontcolor="black" ] "DcIPaddr_stop_0 posic043" -> "DcIPaddr_start_0 posic043" [ style = dashed] -"DcIPaddr_stop_0 posic043" -> "all_stopped" [ style = bold] "DcIPaddr_stop_0 posic043" [ style=bold color="green" fontcolor="black" ] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:0_monitor_5000 posic043" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_0 posic043" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_monitor_5000 posic041" [ style=bold color="green" fontcolor="black" ] @@ -18,7 +16,6 @@ "rsc_posic041_monitor_5000 posic041" [ style=dashed color="red" fontcolor="black"] "rsc_posic041_start_0 posic041" -> "rsc_posic041_monitor_5000 posic041" [ style = dashed] "rsc_posic041_start_0 posic041" [ style=dashed color="red" fontcolor="black" ] -"rsc_posic041_stop_0 posic041" -> "all_stopped" [ style = bold] "rsc_posic041_stop_0 posic041" -> "rsc_posic041_start_0 posic041" [ style = dashed] "rsc_posic041_stop_0 posic041" [ style=bold color="green" fontcolor="black" ] "rsc_posic042_monitor_0 posic043" -> "rsc_posic042_start_0 posic041" [ style = dashed] @@ -26,7 +23,6 @@ "rsc_posic042_monitor_5000 posic041" [ style=dashed color="red" fontcolor="black"] "rsc_posic042_start_0 posic041" -> "rsc_posic042_monitor_5000 posic041" [ style = dashed] "rsc_posic042_start_0 posic041" [ style=dashed color="red" fontcolor="black" ] -"rsc_posic042_stop_0 posic041" -> "all_stopped" [ style = bold] "rsc_posic042_stop_0 posic041" -> "rsc_posic042_start_0 posic041" [ style = dashed] "rsc_posic042_stop_0 posic041" [ style=bold color="green" fontcolor="black" ] "rsc_posic043_monitor_0 posic041" -> "rsc_posic043_start_0 posic043" [ style = dashed] @@ -34,7 +30,6 @@ "rsc_posic043_monitor_5000 posic043" [ style=dashed color="red" fontcolor="black"] "rsc_posic043_start_0 posic043" -> "rsc_posic043_monitor_5000 posic043" [ style = dashed] "rsc_posic043_start_0 posic043" [ style=dashed color="red" fontcolor="black" ] -"rsc_posic043_stop_0 posic043" -> "all_stopped" [ style = bold] "rsc_posic043_stop_0 posic043" -> "rsc_posic043_start_0 posic043" [ style = dashed] "rsc_posic043_stop_0 posic043" [ style=bold color="green" fontcolor="black" ] "rsc_posic044_monitor_0 posic043" -> "rsc_posic044_start_0 posic041" [ style = dashed] @@ -42,7 +37,6 @@ "rsc_posic044_monitor_5000 posic041" [ style=dashed color="red" fontcolor="black"] "rsc_posic044_start_0 posic041" -> "rsc_posic044_monitor_5000 posic041" [ style = dashed] "rsc_posic044_start_0 posic041" [ style=dashed color="red" fontcolor="black" ] -"rsc_posic044_stop_0 posic041" -> "all_stopped" [ style = bold] "rsc_posic044_stop_0 posic041" -> "rsc_posic044_start_0 posic041" [ style = dashed] "rsc_posic044_stop_0 posic041" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/764.exp b/pengine/test10/764.exp index 1f5b7c8..d8e8b57 100644 --- a/pengine/test10/764.exp +++ b/pengine/test10/764.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -127,36 +127,11 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/764.summary b/pengine/test10/764.summary index b50cdd4..d86cf1a 100644 --- a/pengine/test10/764.summary +++ b/pengine/test10/764.summary @@ -37,7 +37,6 @@ Executing cluster transition: * Resource action: child_DoFencing:1 monitor on posic043 * Resource action: child_DoFencing:2 monitor on posic041 * Resource action: child_DoFencing:3 monitor on posic041 - * Pseudo action: all_stopped Revised cluster status: Online: [ posic041 posic043 ] diff --git a/pengine/test10/797.dot b/pengine/test10/797.dot index d02f0b6..9ef868a 100644 --- a/pengine/test10/797.dot +++ b/pengine/test10/797.dot @@ -10,7 +10,6 @@ "DcIPaddr_start_0 c001n03" [ style=dashed color="red" fontcolor="black" ] "DcIPaddr_stop_0 c001n03" -> "DcIPaddr_delete_0 c001n03" [ style = bold] "DcIPaddr_stop_0 c001n03" -> "DcIPaddr_start_0 c001n03" [ style = dashed] -"DcIPaddr_stop_0 c001n03" -> "all_stopped" [ style = bold] "DcIPaddr_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ] "DoFencing_running_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_start_0" -> "DoFencing_running_0" [ style = bold] @@ -23,21 +22,17 @@ "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stopped_0" -> "DoFencing_start_0" [ style = bold] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:0_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_start_0 c001n01" -> "DoFencing_running_0" [ style = bold] "child_DoFencing:0_start_0 c001n01" -> "child_DoFencing:0_monitor_5000 c001n01" [ style = bold] "child_DoFencing:0_start_0 c001n01" [ style=bold color="green" fontcolor="black" ] "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" -> "child_DoFencing:0_start_0 c001n01" [ style = bold] "child_DoFencing:0_stop_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_stop_0 c001n03" -> "DoFencing_stopped_0" [ style = bold] -"child_DoFencing:0_stop_0 c001n03" -> "all_stopped" [ style = bold] "child_DoFencing:0_stop_0 c001n03" -> "child_DoFencing:0_start_0 c001n01" [ style = bold] "child_DoFencing:0_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:1_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = bold] -"child_DoFencing:1_stop_0 c001n02" -> "all_stopped" [ style = bold] "child_DoFencing:1_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "child_DoFencing:1_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_monitor_0 c001n01" -> "DoFencing_start_0" [ style = bold] @@ -54,7 +49,6 @@ "rsc_c001n01_monitor_5000 c001n01" [ style=dashed color="red" fontcolor="black"] "rsc_c001n01_start_0 c001n01" -> "rsc_c001n01_monitor_5000 c001n01" [ style = dashed] "rsc_c001n01_start_0 c001n01" [ style=dashed color="red" fontcolor="black" ] -"rsc_c001n01_stop_0 c001n01" -> "all_stopped" [ style = bold] "rsc_c001n01_stop_0 c001n01" -> "rsc_c001n01_start_0 c001n01" [ style = dashed] "rsc_c001n01_stop_0 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n02_monitor_0 c001n01" -> "rsc_c001n02_start_0 c001n01" [ style = dashed] @@ -64,7 +58,6 @@ "rsc_c001n02_monitor_5000 c001n01" [ style=dashed color="red" fontcolor="black" ] "rsc_c001n02_start_0 c001n01" -> "rsc_c001n02_monitor_5000 c001n01" [ style = dashed] "rsc_c001n02_start_0 c001n01" [ style=dashed color="red" 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 c001n01" [ style = dashed] "rsc_c001n02_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] @@ -75,7 +68,6 @@ "rsc_c001n03_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black"] "rsc_c001n03_start_0 c001n03" -> "rsc_c001n03_monitor_5000 c001n03" [ style = dashed] "rsc_c001n03_start_0 c001n03" [ style=dashed color="red" fontcolor="black" ] -"rsc_c001n03_stop_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n03_stop_0 c001n03" -> "rsc_c001n03_start_0 c001n03" [ style = dashed] "rsc_c001n03_stop_0 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_monitor_0 c001n01" -> "rsc_c001n08_start_0 c001n01" [ style = dashed] @@ -85,7 +77,6 @@ "rsc_c001n08_monitor_5000 c001n01" [ style=dashed color="red" fontcolor="black" ] "rsc_c001n08_start_0 c001n01" -> "rsc_c001n08_monitor_5000 c001n01" [ style = dashed] "rsc_c001n08_start_0 c001n01" [ style=dashed color="red" fontcolor="black" ] -"rsc_c001n08_stop_0 c001n02" -> "all_stopped" [ style = bold] "rsc_c001n08_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "rsc_c001n08_stop_0 c001n02" -> "rsc_c001n08_start_0 c001n01" [ style = dashed] "rsc_c001n08_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/797.exp b/pengine/test10/797.exp index eb78641..62a01ae 100644 --- a/pengine/test10/797.exp +++ b/pengine/test10/797.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,20 +19,20 @@ - + - + - + @@ -41,7 +41,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -131,7 +131,7 @@ - + @@ -140,46 +140,46 @@ - + - + - + - + - + - + - + - + @@ -192,26 +192,26 @@ - + - + - + - + @@ -220,7 +220,7 @@ - + @@ -229,7 +229,7 @@ - + @@ -238,7 +238,7 @@ - + @@ -247,28 +247,28 @@ - + - + - + - + - + - + @@ -276,46 +276,46 @@ - + - + - + - + - + - + - + - + - + - + @@ -324,46 +324,13 @@ - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/797.summary b/pengine/test10/797.summary index 47db825..79c0a08 100644 --- a/pengine/test10/797.summary +++ b/pengine/test10/797.summary @@ -51,7 +51,6 @@ Executing cluster transition: * Pseudo action: DoFencing_stopped_0 * Pseudo action: DoFencing_start_0 * Cluster action: do_shutdown on c001n02 - * Pseudo action: all_stopped * Resource action: child_DoFencing:0 start on c001n01 * Resource action: child_DoFencing:0 monitor=5000 on c001n01 * Pseudo action: DoFencing_running_0 diff --git a/pengine/test10/8-am-then-bm-a-migrating-b-stopping.dot b/pengine/test10/8-am-then-bm-a-migrating-b-stopping.dot index 7c976c4..3472382 100644 --- a/pengine/test10/8-am-then-bm-a-migrating-b-stopping.dot +++ b/pengine/test10/8-am-then-bm-a-migrating-b-stopping.dot @@ -8,11 +8,8 @@ "A_start_0 18node2" -> "A_monitor_60000 18node2" [ style = bold] "A_start_0 18node2" [ style=bold color="green" fontcolor="orange"] "A_stop_0 18node1" -> "A_start_0 18node2" [ style = bold] -"A_stop_0 18node1" -> "all_stopped" [ style = bold] "A_stop_0 18node1" [ style=bold color="green" fontcolor="black"] "B_stop_0 18node2" -> "A_migrate_to_0 18node1" [ style = bold] "B_stop_0 18node2" -> "A_stop_0 18node1" [ style = bold] -"B_stop_0 18node2" -> "all_stopped" [ style = bold] "B_stop_0 18node2" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/8-am-then-bm-a-migrating-b-stopping.exp b/pengine/test10/8-am-then-bm-a-migrating-b-stopping.exp index 6fb28d5..b236a17 100644 --- a/pengine/test10/8-am-then-bm-a-migrating-b-stopping.exp +++ b/pengine/test10/8-am-then-bm-a-migrating-b-stopping.exp @@ -1,96 +1,81 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - diff --git a/pengine/test10/8-am-then-bm-a-migrating-b-stopping.summary b/pengine/test10/8-am-then-bm-a-migrating-b-stopping.summary index 99d5c09..527bd58 100644 --- a/pengine/test10/8-am-then-bm-a-migrating-b-stopping.summary +++ b/pengine/test10/8-am-then-bm-a-migrating-b-stopping.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Resource action: A migrate_to on 18node1 * Resource action: A migrate_from on 18node2 * Resource action: A stop on 18node1 - * Pseudo action: all_stopped * Pseudo action: A_start_0 * Resource action: A monitor=60000 on 18node2 diff --git a/pengine/test10/829.dot b/pengine/test10/829.dot index 1daa2aa..16ba24c 100644 --- a/pengine/test10/829.dot +++ b/pengine/test10/829.dot @@ -5,10 +5,8 @@ digraph "g" { "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" [ 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" ] @@ -26,7 +24,6 @@ digraph "g" { "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" ] @@ -35,10 +32,7 @@ digraph "g" { "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_start_0 c001n01" [ 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 ed8be6e..74afbcc 100644 --- a/pengine/test10/829.exp +++ b/pengine/test10/829.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,45 +37,45 @@ - + - + - + - + - + - + - + - + - + @@ -87,7 +87,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -132,7 +132,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -159,13 +159,13 @@ - + - + @@ -174,7 +174,7 @@ - + @@ -183,7 +183,7 @@ - + @@ -192,7 +192,7 @@ - + @@ -201,7 +201,7 @@ - + @@ -210,7 +210,7 @@ - + @@ -219,22 +219,22 @@ - + - + - + - + @@ -246,36 +246,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/829.summary b/pengine/test10/829.summary index 8cc27dc..c8223b0 100644 --- a/pengine/test10/829.summary +++ b/pengine/test10/829.summary @@ -40,11 +40,9 @@ Executing cluster transition: * Fencing c001n02 (reboot) * Pseudo action: rsc_c001n02_stop_0 * Pseudo action: DoFencing_stop_0 - * Pseudo action: stonith_complete * Resource action: rsc_c001n02 start on c001n01 * Pseudo action: child_DoFencing:0_stop_0 * Pseudo action: DoFencing_stopped_0 - * Pseudo action: all_stopped * Resource action: rsc_c001n02 monitor=5000 on c001n01 Revised cluster status: diff --git a/pengine/test10/9-am-then-bm-b-migrating-a-stopping.dot b/pengine/test10/9-am-then-bm-b-migrating-a-stopping.dot index 05aef65..6a9f523 100644 --- a/pengine/test10/9-am-then-bm-b-migrating-a-stopping.dot +++ b/pengine/test10/9-am-then-bm-b-migrating-a-stopping.dot @@ -3,7 +3,6 @@ "A_start_0 " -> "B_start_0 18node1" [ style = dashed] "A_start_0 " [ style=dashed color="red" fontcolor="black"] "A_stop_0 18node1" -> "A_start_0 " [ style = dashed] -"A_stop_0 18node1" -> "all_stopped" [ style = bold] "A_stop_0 18node1" [ style=bold color="green" fontcolor="black"] "B_migrate_from_0 18node1" -> "B_start_0 18node1" [ style = dashed] "B_migrate_from_0 18node1" -> "B_stop_0 18node2" [ style = dashed] @@ -15,7 +14,5 @@ "B_start_0 18node1" [ style=dashed color="red" fontcolor="black"] "B_stop_0 18node2" -> "A_stop_0 18node1" [ style = bold] "B_stop_0 18node2" -> "B_start_0 18node1" [ style = dashed] -"B_stop_0 18node2" -> "all_stopped" [ style = bold] "B_stop_0 18node2" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/9-am-then-bm-b-migrating-a-stopping.exp b/pengine/test10/9-am-then-bm-b-migrating-a-stopping.exp index 10f0f8c..dd8db61 100644 --- a/pengine/test10/9-am-then-bm-b-migrating-a-stopping.exp +++ b/pengine/test10/9-am-then-bm-b-migrating-a-stopping.exp @@ -1,39 +1,24 @@ - + - + - + - - - - - - - - - - - - - - - diff --git a/pengine/test10/9-am-then-bm-b-migrating-a-stopping.summary b/pengine/test10/9-am-then-bm-b-migrating-a-stopping.summary index 250d888..058813e 100644 --- a/pengine/test10/9-am-then-bm-b-migrating-a-stopping.summary +++ b/pengine/test10/9-am-then-bm-b-migrating-a-stopping.summary @@ -13,7 +13,6 @@ Transition Summary: Executing cluster transition: * Resource action: B stop on 18node2 * Resource action: A stop on 18node1 - * Pseudo action: all_stopped Revised cluster status: Online: [ 18node1 18node2 18node3 ] diff --git a/pengine/test10/994-2.dot b/pengine/test10/994-2.dot index cc9fd7e..e7f5644 100644 --- a/pengine/test10/994-2.dot +++ b/pengine/test10/994-2.dot @@ -1,7 +1,5 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "depends_start_0 paul" [ style=bold color="green" fontcolor="black" ] -"depends_stop_0 paul" -> "all_stopped" [ style = bold] "depends_stop_0 paul" -> "depends_start_0 paul" [ style = bold] "depends_stop_0 paul" -> "group_1_stop_0" [ style = bold] "depends_stop_0 paul" [ style=bold color="green" fontcolor="black" ] @@ -19,7 +17,6 @@ digraph "g" { "postfix_9_start_0 paul" -> "group_1_running_0" [ style = bold] "postfix_9_start_0 paul" -> "postfix_9_monitor_120000 paul" [ style = bold] "postfix_9_start_0 paul" [ style=bold color="green" fontcolor="black" ] -"postfix_9_stop_0 paul" -> "all_stopped" [ style = bold] "postfix_9_stop_0 paul" -> "group_1_stopped_0" [ style = bold] "postfix_9_stop_0 paul" -> "postfix_9_start_0 paul" [ style = bold] "postfix_9_stop_0 paul" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/994-2.exp b/pengine/test10/994-2.exp index c00f2f2..dd52aa5 100644 --- a/pengine/test10/994-2.exp +++ b/pengine/test10/994-2.exp @@ -1,7 +1,7 @@ - + @@ -10,52 +10,52 @@ - + - + - + - + - + - + - + - + - + @@ -65,7 +65,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -91,49 +91,33 @@ - + - + - + - + - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/994-2.summary b/pengine/test10/994-2.summary index 0f7def7..5f8ee9e 100644 --- a/pengine/test10/994-2.summary +++ b/pengine/test10/994-2.summary @@ -17,7 +17,6 @@ Executing cluster transition: * Resource action: depends stop on paul * Pseudo action: group_1_stop_0 * Resource action: postfix_9 stop on paul - * Pseudo action: all_stopped * Pseudo action: group_1_stopped_0 * Pseudo action: group_1_start_0 * Resource action: postfix_9 start on paul diff --git a/pengine/test10/994.dot b/pengine/test10/994.dot index e2d6f05..6d18051 100644 --- a/pengine/test10/994.dot +++ b/pengine/test10/994.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "group_1_running_0" [ style=bold color="green" fontcolor="orange" ] "group_1_start_0" -> "group_1_running_0" [ style = bold] "group_1_start_0" -> "postfix_9_start_0 paul" [ style = bold] @@ -13,7 +12,6 @@ "postfix_9_start_0 paul" -> "group_1_running_0" [ style = bold] "postfix_9_start_0 paul" -> "postfix_9_monitor_120000 paul" [ style = bold] "postfix_9_start_0 paul" [ style=bold color="green" fontcolor="black" ] -"postfix_9_stop_0 paul" -> "all_stopped" [ style = bold] "postfix_9_stop_0 paul" -> "group_1_stopped_0" [ style = bold] "postfix_9_stop_0 paul" -> "postfix_9_start_0 paul" [ style = bold] "postfix_9_stop_0 paul" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/994.exp b/pengine/test10/994.exp index b0111ff..6f3664d 100644 --- a/pengine/test10/994.exp +++ b/pengine/test10/994.exp @@ -1,7 +1,7 @@ - + @@ -10,13 +10,13 @@ - + - + @@ -24,34 +24,34 @@ - + - + - + - + - + - + @@ -61,7 +61,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -87,19 +87,7 @@ - - - - - - - - - - - - - + diff --git a/pengine/test10/994.summary b/pengine/test10/994.summary index 4f0c42f..11bf031 100644 --- a/pengine/test10/994.summary +++ b/pengine/test10/994.summary @@ -14,7 +14,6 @@ Transition Summary: Executing cluster transition: * Pseudo action: group_1_stop_0 * Resource action: postfix_9 stop on paul - * Pseudo action: all_stopped * Pseudo action: group_1_stopped_0 * Pseudo action: group_1_start_0 * Resource action: postfix_9 start on paul diff --git a/pengine/test10/a-demote-then-b-migrate.dot b/pengine/test10/a-demote-then-b-migrate.dot index d419eed..cc3d94e 100644 --- a/pengine/test10/a-demote-then-b-migrate.dot +++ b/pengine/test10/a-demote-then-b-migrate.dot @@ -3,7 +3,6 @@ digraph "g" { "Cancel rsc1:0_monitor_10000 node2" [ style=bold color="green" fontcolor="black"] "Cancel rsc1:1_monitor_5000 node1" -> "rsc1:1_demote_0 node1" [ style = bold] "Cancel rsc1:1_monitor_5000 node1" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "ms1_confirmed-post_notify_demoted_0" -> "ms1_pre_notify_promote_0" [ style = bold] "ms1_confirmed-post_notify_demoted_0" -> "rsc1:0_monitor_5000 node2" [ style = bold] "ms1_confirmed-post_notify_demoted_0" -> "rsc1:1_monitor_10000 node1" [ style = bold] @@ -78,7 +77,6 @@ digraph "g" { "rsc2_start_0 node2" -> "ms1_promote_0" [ style = bold] "rsc2_start_0 node2" -> "rsc2_monitor_5000 node2" [ style = bold] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="orange"] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/a-demote-then-b-migrate.exp b/pengine/test10/a-demote-then-b-migrate.exp index e31e125..8e72417 100644 --- a/pengine/test10/a-demote-then-b-migrate.exp +++ b/pengine/test10/a-demote-then-b-migrate.exp @@ -1,78 +1,78 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -82,7 +82,7 @@ - + @@ -97,78 +97,78 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -178,7 +178,7 @@ - + @@ -193,58 +193,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -252,203 +252,191 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - + diff --git a/pengine/test10/a-demote-then-b-migrate.summary b/pengine/test10/a-demote-then-b-migrate.summary index 9e461e8..61178f0 100644 --- a/pengine/test10/a-demote-then-b-migrate.summary +++ b/pengine/test10/a-demote-then-b-migrate.summary @@ -33,7 +33,6 @@ Executing cluster transition: * Pseudo action: ms1_confirmed-pre_notify_promote_0 * Resource action: rsc2 migrate_from on node2 * Resource action: rsc2 stop on node1 - * Pseudo action: all_stopped * Pseudo action: rsc2_start_0 * Pseudo action: ms1_promote_0 * Resource action: rsc2 monitor=5000 on node2 diff --git a/pengine/test10/a-promote-then-b-migrate.dot b/pengine/test10/a-promote-then-b-migrate.dot index 1eafd30..4680d7b 100644 --- a/pengine/test10/a-promote-then-b-migrate.dot +++ b/pengine/test10/a-promote-then-b-migrate.dot @@ -1,7 +1,6 @@ digraph "g" { "Cancel rsc1:1_monitor_10000 node2" -> "rsc1:1_promote_0 node2" [ style = bold] "Cancel rsc1:1_monitor_10000 node2" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "ms1_confirmed-post_notify_promoted_0" -> "rsc1:1_monitor_5000 node2" [ style = bold] "ms1_confirmed-post_notify_promoted_0" -> "rsc2_migrate_to_0 node1" [ style = bold] "ms1_confirmed-post_notify_promoted_0" -> "rsc2_start_0 node2" [ style = bold] @@ -41,7 +40,6 @@ digraph "g" { "rsc2_monitor_5000 node2" [ style=bold color="green" fontcolor="black"] "rsc2_start_0 node2" -> "rsc2_monitor_5000 node2" [ style = bold] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="orange"] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/a-promote-then-b-migrate.exp b/pengine/test10/a-promote-then-b-migrate.exp index f5ef735..f9cce5c 100644 --- a/pengine/test10/a-promote-then-b-migrate.exp +++ b/pengine/test10/a-promote-then-b-migrate.exp @@ -1,75 +1,75 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -79,7 +79,7 @@ - + @@ -94,58 +94,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -153,107 +153,95 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - + diff --git a/pengine/test10/a-promote-then-b-migrate.summary b/pengine/test10/a-promote-then-b-migrate.summary index 166b7b0..3d5839f 100644 --- a/pengine/test10/a-promote-then-b-migrate.summary +++ b/pengine/test10/a-promote-then-b-migrate.summary @@ -28,7 +28,6 @@ Executing cluster transition: * Resource action: rsc1:1 monitor=5000 on node2 * Resource action: rsc2 migrate_from on node2 * Resource action: rsc2 stop on node1 - * Pseudo action: all_stopped * Pseudo action: rsc2_start_0 * Resource action: rsc2 monitor=5000 on node2 diff --git a/pengine/test10/anti-colocation-master.dot b/pengine/test10/anti-colocation-master.dot index 0f0385f..699f292 100644 --- a/pengine/test10/anti-colocation-master.dot +++ b/pengine/test10/anti-colocation-master.dot @@ -1,7 +1,5 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "dummy1_start_0 sle12sp2-1" [ style=bold color="green" fontcolor="black"] -"dummy1_stop_0 sle12sp2-2" -> "all_stopped" [ style = bold] "dummy1_stop_0 sle12sp2-2" -> "dummy1_start_0 sle12sp2-1" [ style = bold] "dummy1_stop_0 sle12sp2-2" -> "ms1_promote_0" [ style = bold] "dummy1_stop_0 sle12sp2-2" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/anti-colocation-master.exp b/pengine/test10/anti-colocation-master.exp index 011bfdd..0148d6b 100644 --- a/pengine/test10/anti-colocation-master.exp +++ b/pengine/test10/anti-colocation-master.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,48 +26,48 @@ - + - + - + - + - + - + - + - + @@ -75,40 +75,28 @@ - + - + - + - + - - - - - - - - - - - - - + diff --git a/pengine/test10/anti-colocation-master.summary b/pengine/test10/anti-colocation-master.summary index df4c4ed..f03f9a5 100644 --- a/pengine/test10/anti-colocation-master.summary +++ b/pengine/test10/anti-colocation-master.summary @@ -17,7 +17,6 @@ Transition Summary: Executing cluster transition: * Resource action: dummy1 stop on sle12sp2-2 * Pseudo action: ms1_demote_0 - * Pseudo action: all_stopped * Resource action: state1 demote on sle12sp2-1 * Pseudo action: ms1_demoted_0 * Pseudo action: ms1_promote_0 diff --git a/pengine/test10/anti-colocation-order.dot b/pengine/test10/anti-colocation-order.dot index 0d49c59..b827f52 100644 --- a/pengine/test10/anti-colocation-order.dot +++ b/pengine/test10/anti-colocation-order.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "group1_running_0" [ style=bold color="green" fontcolor="orange"] "group1_start_0" -> "group1_running_0" [ style = bold] "group1_start_0" -> "rsc1_start_0 node2" [ style = bold] @@ -20,21 +19,17 @@ digraph "g" { "rsc1_start_0 node2" -> "group1_running_0" [ style = bold] "rsc1_start_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "group1_stopped_0" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black"] "rsc2_start_0 node2" -> "group1_running_0" [ style = bold] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "group1_stopped_0" [ style = bold] "rsc2_stop_0 node1" -> "rsc1_stop_0 node1" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc3_stop_0 node2" -> "all_stopped" [ style = bold] "rsc3_stop_0 node2" -> "group2_stopped_0" [ style = bold] "rsc3_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc4_stop_0 node2" -> "all_stopped" [ style = bold] "rsc4_stop_0 node2" -> "group2_stopped_0" [ style = bold] "rsc4_stop_0 node2" -> "rsc3_stop_0 node2" [ style = bold] "rsc4_stop_0 node2" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/anti-colocation-order.exp b/pengine/test10/anti-colocation-order.exp index fa5304f..d1c2d05 100644 --- a/pengine/test10/anti-colocation-order.exp +++ b/pengine/test10/anti-colocation-order.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -27,122 +27,122 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -150,51 +150,30 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/anti-colocation-order.summary b/pengine/test10/anti-colocation-order.summary index 4f03a68..583aa96 100644 --- a/pengine/test10/anti-colocation-order.summary +++ b/pengine/test10/anti-colocation-order.summary @@ -23,7 +23,6 @@ Executing cluster transition: * Resource action: rsc4 stop on node2 * Resource action: rsc1 stop on node1 * Resource action: rsc3 stop on node2 - * Pseudo action: all_stopped * Pseudo action: group1_stopped_0 * Pseudo action: group2_stopped_0 * Pseudo action: group1_start_0 diff --git a/pengine/test10/anti-colocation-slave.dot b/pengine/test10/anti-colocation-slave.dot index da2a38d..854ec75 100644 --- a/pengine/test10/anti-colocation-slave.dot +++ b/pengine/test10/anti-colocation-slave.dot @@ -1,7 +1,5 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "dummy1_start_0 sle12sp2-2" [ style=bold color="green" fontcolor="black"] -"dummy1_stop_0 sle12sp2-1" -> "all_stopped" [ style = bold] "dummy1_stop_0 sle12sp2-1" -> "dummy1_start_0 sle12sp2-2" [ style = bold] "dummy1_stop_0 sle12sp2-1" -> "ms1_demote_0" [ style = bold] "dummy1_stop_0 sle12sp2-1" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/anti-colocation-slave.exp b/pengine/test10/anti-colocation-slave.exp index dc3eb08..152a1b4 100644 --- a/pengine/test10/anti-colocation-slave.exp +++ b/pengine/test10/anti-colocation-slave.exp @@ -1,116 +1,104 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - diff --git a/pengine/test10/anti-colocation-slave.summary b/pengine/test10/anti-colocation-slave.summary index 0d77064..1f058d7 100644 --- a/pengine/test10/anti-colocation-slave.summary +++ b/pengine/test10/anti-colocation-slave.summary @@ -15,7 +15,6 @@ Transition Summary: Executing cluster transition: * Resource action: dummy1 stop on sle12sp2-1 - * Pseudo action: all_stopped * Pseudo action: ms1_demote_0 * Resource action: state1 demote on sle12sp2-1 * Pseudo action: ms1_demoted_0 diff --git a/pengine/test10/asymmetric.exp b/pengine/test10/asymmetric.exp index 6284925..f06fddf 100644 --- a/pengine/test10/asymmetric.exp +++ b/pengine/test10/asymmetric.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/pengine/test10/asymmetrical-order-move.dot b/pengine/test10/asymmetrical-order-move.dot index f36234b..8eb3ebf 100644 --- a/pengine/test10/asymmetrical-order-move.dot +++ b/pengine/test10/asymmetrical-order-move.dot @@ -1,7 +1,5 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "dummy2_start_0 sle12sp2-2" [ style=dashed color="red" fontcolor="black"] -"dummy2_stop_0 sle12sp2-1" -> "all_stopped" [ style = bold] "dummy2_stop_0 sle12sp2-1" -> "dummy2_start_0 sle12sp2-2" [ style = dashed] "dummy2_stop_0 sle12sp2-1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/asymmetrical-order-move.exp b/pengine/test10/asymmetrical-order-move.exp index ac48583..afa5500 100644 --- a/pengine/test10/asymmetrical-order-move.exp +++ b/pengine/test10/asymmetrical-order-move.exp @@ -1,23 +1,11 @@ - + - - - - - - - - - - - - diff --git a/pengine/test10/asymmetrical-order-move.summary b/pengine/test10/asymmetrical-order-move.summary index 34869d5..15ceeae 100644 --- a/pengine/test10/asymmetrical-order-move.summary +++ b/pengine/test10/asymmetrical-order-move.summary @@ -13,7 +13,6 @@ Transition Summary: Executing cluster transition: * Resource action: dummy2 stop on sle12sp2-1 - * Pseudo action: all_stopped Using the original execution date of: 2016-04-28 11:50:29Z Revised cluster status: diff --git a/pengine/test10/attrs1.exp b/pengine/test10/attrs1.exp index 7df2479..f16f7c0 100644 --- a/pengine/test10/attrs1.exp +++ b/pengine/test10/attrs1.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + diff --git a/pengine/test10/attrs2.exp b/pengine/test10/attrs2.exp index 7df2479..f16f7c0 100644 --- a/pengine/test10/attrs2.exp +++ b/pengine/test10/attrs2.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + diff --git a/pengine/test10/attrs3.exp b/pengine/test10/attrs3.exp index d86378f..87ae235 100644 --- a/pengine/test10/attrs3.exp +++ b/pengine/test10/attrs3.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + diff --git a/pengine/test10/attrs4.exp b/pengine/test10/attrs4.exp index d86378f..87ae235 100644 --- a/pengine/test10/attrs4.exp +++ b/pengine/test10/attrs4.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + diff --git a/pengine/test10/attrs5.exp b/pengine/test10/attrs5.exp index f74da82..38fd7c1 100644 --- a/pengine/test10/attrs5.exp +++ b/pengine/test10/attrs5.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/pengine/test10/attrs6.exp b/pengine/test10/attrs6.exp index d86378f..87ae235 100644 --- a/pengine/test10/attrs6.exp +++ b/pengine/test10/attrs6.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + diff --git a/pengine/test10/attrs7.exp b/pengine/test10/attrs7.exp index 7df2479..f16f7c0 100644 --- a/pengine/test10/attrs7.exp +++ b/pengine/test10/attrs7.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + diff --git a/pengine/test10/attrs8.exp b/pengine/test10/attrs8.exp index 7df2479..f16f7c0 100644 --- a/pengine/test10/attrs8.exp +++ b/pengine/test10/attrs8.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + diff --git a/pengine/test10/balanced.exp b/pengine/test10/balanced.exp index cfe66f8..ac37802 100644 --- a/pengine/test10/balanced.exp +++ b/pengine/test10/balanced.exp @@ -1,26 +1,26 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -38,26 +38,26 @@ - + - + - + - + - + @@ -66,7 +66,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -83,7 +83,7 @@ - + diff --git a/pengine/test10/base-score.exp b/pengine/test10/base-score.exp index a13d02f..9bf5c2d 100644 --- a/pengine/test10/base-score.exp +++ b/pengine/test10/base-score.exp @@ -1,29 +1,29 @@ - + - + - + - + - + - + @@ -32,7 +32,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/pengine/test10/bnc-515172.exp b/pengine/test10/bnc-515172.exp index 4086cff..68f6b7d 100644 --- a/pengine/test10/bnc-515172.exp +++ b/pengine/test10/bnc-515172.exp @@ -1,22 +1,22 @@ - + - + - + - + @@ -24,27 +24,27 @@ - + - + - + - + diff --git a/pengine/test10/bug-1572-1.dot b/pengine/test10/bug-1572-1.dot index b77b8f2..2301f23 100644 --- a/pengine/test10/bug-1572-1.dot +++ b/pengine/test10/bug-1572-1.dot @@ -4,16 +4,13 @@ digraph "g" { "IPaddr_147_81_84_133_start_0 arc-tkincaidlx.wsicorp.com" -> "grp_pgsql_mirror_running_0" [ style = bold] "IPaddr_147_81_84_133_start_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] "IPaddr_147_81_84_133_stop_0 arc-tkincaidlx.wsicorp.com" -> "IPaddr_147_81_84_133_start_0 arc-tkincaidlx.wsicorp.com" [ style = bold] -"IPaddr_147_81_84_133_stop_0 arc-tkincaidlx.wsicorp.com" -> "all_stopped" [ style = bold] "IPaddr_147_81_84_133_stop_0 arc-tkincaidlx.wsicorp.com" -> "grp_pgsql_mirror_stopped_0" [ style = bold] "IPaddr_147_81_84_133_stop_0 arc-tkincaidlx.wsicorp.com" -> "pgsql_5555_stop_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "IPaddr_147_81_84_133_stop_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "do_shutdown arc-dknightlx" [ style=bold color="green" fontcolor="black" ] "fs_mirror_start_0 arc-tkincaidlx.wsicorp.com" -> "grp_pgsql_mirror_running_0" [ style = bold] "fs_mirror_start_0 arc-tkincaidlx.wsicorp.com" -> "pgsql_5555_start_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "fs_mirror_start_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] -"fs_mirror_stop_0 arc-tkincaidlx.wsicorp.com" -> "all_stopped" [ style = bold] "fs_mirror_stop_0 arc-tkincaidlx.wsicorp.com" -> "fs_mirror_start_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "fs_mirror_stop_0 arc-tkincaidlx.wsicorp.com" -> "grp_pgsql_mirror_stopped_0" [ style = bold] "fs_mirror_stop_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] @@ -39,7 +36,6 @@ digraph "g" { "ms_drbd_7788_confirmed-post_notify_promoted_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_confirmed-post_notify_running_0" -> "ms_drbd_7788_pre_notify_promote_0" [ style = bold] "ms_drbd_7788_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange" ] -"ms_drbd_7788_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "ms_drbd_7788_confirmed-post_notify_stopped_0" -> "ms_drbd_7788_pre_notify_promote_0" [ style = bold] "ms_drbd_7788_confirmed-post_notify_stopped_0" -> "ms_drbd_7788_pre_notify_start_0" [ style = bold] "ms_drbd_7788_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] @@ -111,7 +107,6 @@ digraph "g" { "pgsql_5555_start_0 arc-tkincaidlx.wsicorp.com" -> "grp_pgsql_mirror_running_0" [ style = bold] "pgsql_5555_start_0 arc-tkincaidlx.wsicorp.com" -> "pgsql_5555_monitor_30000 arc-tkincaidlx.wsicorp.com" [ style = bold] "pgsql_5555_start_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] -"pgsql_5555_stop_0 arc-tkincaidlx.wsicorp.com" -> "all_stopped" [ style = bold] "pgsql_5555_stop_0 arc-tkincaidlx.wsicorp.com" -> "fs_mirror_stop_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "pgsql_5555_stop_0 arc-tkincaidlx.wsicorp.com" -> "grp_pgsql_mirror_stopped_0" [ style = bold] "pgsql_5555_stop_0 arc-tkincaidlx.wsicorp.com" -> "pgsql_5555_start_0 arc-tkincaidlx.wsicorp.com" [ style = bold] @@ -122,7 +117,6 @@ digraph "g" { "rsc_drbd_7788:0_pre_notify_demote_0 arc-dknightlx" [ style=bold color="green" fontcolor="black" ] "rsc_drbd_7788:0_pre_notify_stop_0 arc-dknightlx" -> "ms_drbd_7788_confirmed-pre_notify_stop_0" [ style = bold] "rsc_drbd_7788:0_pre_notify_stop_0 arc-dknightlx" [ style=bold color="green" fontcolor="black" ] -"rsc_drbd_7788:0_stop_0 arc-dknightlx" -> "all_stopped" [ style = bold] "rsc_drbd_7788:0_stop_0 arc-dknightlx" -> "do_shutdown arc-dknightlx" [ style = bold] "rsc_drbd_7788:0_stop_0 arc-dknightlx" -> "ms_drbd_7788_stopped_0" [ style = bold] "rsc_drbd_7788:0_stop_0 arc-dknightlx" [ style=bold color="green" fontcolor="black" ] @@ -147,7 +141,6 @@ digraph "g" { "rsc_drbd_7788:1_start_0 arc-tkincaidlx.wsicorp.com" -> "ms_drbd_7788_running_0" [ style = bold] "rsc_drbd_7788:1_start_0 arc-tkincaidlx.wsicorp.com" -> "rsc_drbd_7788:1_promote_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "rsc_drbd_7788:1_start_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] -"rsc_drbd_7788:1_stop_0 arc-tkincaidlx.wsicorp.com" -> "all_stopped" [ style = bold] "rsc_drbd_7788:1_stop_0 arc-tkincaidlx.wsicorp.com" -> "ms_drbd_7788_stopped_0" [ style = bold] "rsc_drbd_7788:1_stop_0 arc-tkincaidlx.wsicorp.com" -> "rsc_drbd_7788:1_start_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "rsc_drbd_7788:1_stop_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/bug-1572-1.exp b/pengine/test10/bug-1572-1.exp index 5d781c2..3f85761 100644 --- a/pengine/test10/bug-1572-1.exp +++ b/pengine/test10/bug-1572-1.exp @@ -1,252 +1,252 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -254,334 +254,334 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -589,104 +589,104 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -699,39 +699,39 @@ - + - + - + - + - + - + - + @@ -744,13 +744,13 @@ - + - + @@ -759,34 +759,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/bug-1572-1.summary b/pengine/test10/bug-1572-1.summary index 7ca83a9..3fb0d70 100644 --- a/pengine/test10/bug-1572-1.summary +++ b/pengine/test10/bug-1572-1.summary @@ -47,7 +47,6 @@ Executing cluster transition: * Pseudo action: ms_drbd_7788_post_notify_stopped_0 * Pseudo action: ms_drbd_7788_confirmed-post_notify_stopped_0 * Pseudo action: ms_drbd_7788_pre_notify_start_0 - * Pseudo action: all_stopped * Pseudo action: ms_drbd_7788_confirmed-pre_notify_start_0 * Pseudo action: ms_drbd_7788_start_0 * Resource action: rsc_drbd_7788:1 start on arc-tkincaidlx.wsicorp.com diff --git a/pengine/test10/bug-1572-2.dot b/pengine/test10/bug-1572-2.dot index f2399b0..e7faea0 100644 --- a/pengine/test10/bug-1572-2.dot +++ b/pengine/test10/bug-1572-2.dot @@ -1,11 +1,8 @@ digraph "g" { -"IPaddr_147_81_84_133_stop_0 arc-tkincaidlx.wsicorp.com" -> "all_stopped" [ style = bold] "IPaddr_147_81_84_133_stop_0 arc-tkincaidlx.wsicorp.com" -> "grp_pgsql_mirror_stopped_0" [ style = bold] "IPaddr_147_81_84_133_stop_0 arc-tkincaidlx.wsicorp.com" -> "pgsql_5555_stop_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "IPaddr_147_81_84_133_stop_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "do_shutdown arc-dknightlx" [ style=bold color="green" fontcolor="black" ] -"fs_mirror_stop_0 arc-tkincaidlx.wsicorp.com" -> "all_stopped" [ style = bold] "fs_mirror_stop_0 arc-tkincaidlx.wsicorp.com" -> "grp_pgsql_mirror_stopped_0" [ style = bold] "fs_mirror_stop_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] "grp_pgsql_mirror_stop_0" -> "IPaddr_147_81_84_133_stop_0 arc-tkincaidlx.wsicorp.com" [ style = bold] @@ -17,7 +14,6 @@ digraph "g" { "grp_pgsql_mirror_stopped_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_confirmed-post_notify_demoted_0" -> "ms_drbd_7788_pre_notify_stop_0" [ style = bold] "ms_drbd_7788_confirmed-post_notify_demoted_0" [ style=bold color="green" fontcolor="orange" ] -"ms_drbd_7788_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "ms_drbd_7788_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_confirmed-pre_notify_demote_0" -> "ms_drbd_7788_demote_0" [ style = bold] "ms_drbd_7788_confirmed-pre_notify_demote_0" -> "ms_drbd_7788_post_notify_demoted_0" [ style = bold] @@ -51,7 +47,6 @@ digraph "g" { "ms_drbd_7788_stop_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_7788_stopped_0" -> "ms_drbd_7788_post_notify_stopped_0" [ style = bold] "ms_drbd_7788_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"pgsql_5555_stop_0 arc-tkincaidlx.wsicorp.com" -> "all_stopped" [ style = bold] "pgsql_5555_stop_0 arc-tkincaidlx.wsicorp.com" -> "fs_mirror_stop_0 arc-tkincaidlx.wsicorp.com" [ style = bold] "pgsql_5555_stop_0 arc-tkincaidlx.wsicorp.com" -> "grp_pgsql_mirror_stopped_0" [ style = bold] "pgsql_5555_stop_0 arc-tkincaidlx.wsicorp.com" [ style=bold color="green" fontcolor="black" ] @@ -61,7 +56,6 @@ digraph "g" { "rsc_drbd_7788:0_pre_notify_demote_0 arc-dknightlx" [ style=bold color="green" fontcolor="black" ] "rsc_drbd_7788:0_pre_notify_stop_0 arc-dknightlx" -> "ms_drbd_7788_confirmed-pre_notify_stop_0" [ style = bold] "rsc_drbd_7788:0_pre_notify_stop_0 arc-dknightlx" [ style=bold color="green" fontcolor="black" ] -"rsc_drbd_7788:0_stop_0 arc-dknightlx" -> "all_stopped" [ style = bold] "rsc_drbd_7788:0_stop_0 arc-dknightlx" -> "do_shutdown arc-dknightlx" [ style = bold] "rsc_drbd_7788:0_stop_0 arc-dknightlx" -> "ms_drbd_7788_stopped_0" [ style = bold] "rsc_drbd_7788:0_stop_0 arc-dknightlx" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/bug-1572-2.exp b/pengine/test10/bug-1572-2.exp index 58885e2..7d82780 100644 --- a/pengine/test10/bug-1572-2.exp +++ b/pengine/test10/bug-1572-2.exp @@ -1,175 +1,175 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -177,148 +177,148 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -326,52 +326,52 @@ - + - + - + - + - + - + - + - + - + @@ -380,31 +380,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/bug-1572-2.summary b/pengine/test10/bug-1572-2.summary index 9d2b885..4ce1555 100644 --- a/pengine/test10/bug-1572-2.summary +++ b/pengine/test10/bug-1572-2.summary @@ -46,7 +46,6 @@ Executing cluster transition: * Pseudo action: ms_drbd_7788_post_notify_stopped_0 * Resource action: rsc_drbd_7788:1 notify on arc-tkincaidlx.wsicorp.com * Pseudo action: ms_drbd_7788_confirmed-post_notify_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ arc-dknightlx arc-tkincaidlx.wsicorp.com ] diff --git a/pengine/test10/bug-1573.dot b/pengine/test10/bug-1573.dot index e28c250..5fb1c40 100644 --- a/pengine/test10/bug-1573.dot +++ b/pengine/test10/bug-1573.dot @@ -1,9 +1,7 @@ digraph "g" { -"IPaddr_192_168_1_102_stop_0 xen-b" -> "all_stopped" [ style = bold] "IPaddr_192_168_1_102_stop_0 xen-b" -> "do_shutdown xen-b" [ style = bold] "IPaddr_192_168_1_102_stop_0 xen-b" -> "group_11_stopped_0" [ style = bold] "IPaddr_192_168_1_102_stop_0 xen-b" [ style=bold color="green" fontcolor="black" ] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "do_shutdown xen-b" [ style=bold color="green" fontcolor="black" ] "group_11_stop_0" -> "IPaddr_192_168_1_102_stop_0 xen-b" [ style = bold] "group_11_stop_0" -> "group_11_stopped_0" [ style = bold] diff --git a/pengine/test10/bug-1573.exp b/pengine/test10/bug-1573.exp index 79700fc..c2a7212 100644 --- a/pengine/test10/bug-1573.exp +++ b/pengine/test10/bug-1573.exp @@ -1,22 +1,22 @@ - + - + - + - + @@ -24,20 +24,20 @@ - + - + - + @@ -46,19 +46,7 @@ - - - - - - - - - - - - - + diff --git a/pengine/test10/bug-1573.summary b/pengine/test10/bug-1573.summary index 02d93a6..8381f7d 100644 --- a/pengine/test10/bug-1573.summary +++ b/pengine/test10/bug-1573.summary @@ -18,7 +18,6 @@ Executing cluster transition: * Pseudo action: group_11_stop_0 * Resource action: IPaddr_192_168_1_102 stop on xen-b * Cluster action: do_shutdown on xen-b - * Pseudo action: all_stopped * Pseudo action: group_11_stopped_0 Revised cluster status: diff --git a/pengine/test10/bug-1685.exp b/pengine/test10/bug-1685.exp index 7d6f29b..aec5a8e 100644 --- a/pengine/test10/bug-1685.exp +++ b/pengine/test10/bug-1685.exp @@ -1,136 +1,136 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -138,51 +138,51 @@ - + - + - + - + - + - + - + - + diff --git a/pengine/test10/bug-1718.dot b/pengine/test10/bug-1718.dot index aa392d8..29bddb9 100644 --- a/pengine/test10/bug-1718.dot +++ b/pengine/test10/bug-1718.dot @@ -4,7 +4,6 @@ digraph "g" { "Apache_delete_0 ops.ds9" [ style=bold color="green" fontcolor="black"] "OpenVPN_IP_delete_0 heartbeat.ds9" [ style=bold color="green" fontcolor="black"] "OpenVPN_IP_delete_0 ops.ds9" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "group_fUN_running_0" [ style=dashed color="red" fontcolor="orange" ] "group_fUN_start_0" -> "group_fUN_running_0" [ style = dashed] "group_fUN_start_0" -> "resource_IP3_start_0 ops.ds9" [ style = dashed] @@ -19,13 +18,11 @@ digraph "g" { "resource_IP3_start_0 ops.ds9" -> "group_fUN_running_0" [ style = dashed] "resource_IP3_start_0 ops.ds9" -> "resource_dummy_start_0 ops.ds9" [ style = dashed] "resource_IP3_start_0 ops.ds9" [ style=dashed color="red" fontcolor="black" ] -"resource_IP3_stop_0 ops.ds9" -> "all_stopped" [ style = bold] "resource_IP3_stop_0 ops.ds9" -> "group_fUN_stopped_0" [ style = bold] "resource_IP3_stop_0 ops.ds9" -> "resource_IP3_start_0 ops.ds9" [ style = dashed] "resource_IP3_stop_0 ops.ds9" [ style=bold color="green" fontcolor="black" ] "resource_dummy_start_0 ops.ds9" -> "group_fUN_running_0" [ style = dashed] "resource_dummy_start_0 ops.ds9" [ style=dashed color="red" fontcolor="black" ] -"resource_dummy_stop_0 ops.ds9" -> "all_stopped" [ style = bold] "resource_dummy_stop_0 ops.ds9" -> "group_fUN_stopped_0" [ style = bold] "resource_dummy_stop_0 ops.ds9" -> "resource_IP3_stop_0 ops.ds9" [ style = bold] "resource_dummy_stop_0 ops.ds9" -> "resource_dummy_start_0 ops.ds9" [ style = dashed] diff --git a/pengine/test10/bug-1718.exp b/pengine/test10/bug-1718.exp index 7c5db02..09e330e 100644 --- a/pengine/test10/bug-1718.exp +++ b/pengine/test10/bug-1718.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -27,36 +27,36 @@ - + - + - + - + - + - + @@ -65,7 +65,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -92,27 +92,11 @@ - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/bug-1718.summary b/pengine/test10/bug-1718.summary index aec182e..accf9e9 100644 --- a/pengine/test10/bug-1718.summary +++ b/pengine/test10/bug-1718.summary @@ -25,7 +25,6 @@ Executing cluster transition: * Resource action: Apache delete on ops.ds9 * Resource action: Apache delete on heartbeat.ds9 * Resource action: resource_IP3 stop on ops.ds9 - * Pseudo action: all_stopped * Pseudo action: group_fUN_stopped_0 Revised cluster status: diff --git a/pengine/test10/bug-1765.exp b/pengine/test10/bug-1765.exp index 11c822e..505538d 100644 --- a/pengine/test10/bug-1765.exp +++ b/pengine/test10/bug-1765.exp @@ -1,107 +1,107 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -109,28 +109,28 @@ - + - + - + - + - + diff --git a/pengine/test10/bug-1820-1.dot b/pengine/test10/bug-1820-1.dot index dc1de79..9150c67 100644 --- a/pengine/test10/bug-1820-1.dot +++ b/pengine/test10/bug-1820-1.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "do_shutdown star" [ style=bold color="green" fontcolor="black" ] "gr1_running_0" [ style=bold color="green" fontcolor="orange" ] "gr1_start_0" -> "gr1_running_0" [ style = bold] @@ -29,7 +28,6 @@ digraph "g" { "test1_start_0 world" -> "test2_migrate_to_0 star" [ style = dashed] "test1_start_0 world" -> "test2_start_0 world" [ style = bold] "test1_start_0 world" [ style=bold color="green" fontcolor="orange"] -"test1_stop_0 star" -> "all_stopped" [ style = bold] "test1_stop_0 star" -> "do_shutdown star" [ style = bold] "test1_stop_0 star" -> "gr1_stopped_0" [ style = bold] "test1_stop_0 star" -> "test1_start_0 world" [ style = bold] @@ -43,7 +41,6 @@ digraph "g" { "test2_start_0 world" -> "gr1_running_0" [ style = bold] "test2_start_0 world" -> "test2_monitor_10000 world" [ style = bold] "test2_start_0 world" [ style=bold color="green" fontcolor="orange"] -"test2_stop_0 star" -> "all_stopped" [ style = bold] "test2_stop_0 star" -> "do_shutdown star" [ style = bold] "test2_stop_0 star" -> "gr1_stopped_0" [ style = bold] "test2_stop_0 star" -> "gr1_stopped_0" [ style = dashed] diff --git a/pengine/test10/bug-1820-1.exp b/pengine/test10/bug-1820-1.exp index 7a41069..4d28a88 100644 --- a/pengine/test10/bug-1820-1.exp +++ b/pengine/test10/bug-1820-1.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,25 +35,25 @@ - + - + - + - + - + @@ -61,50 +61,50 @@ - + - + - + - + - + - + - + - + - + @@ -113,133 +113,133 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -248,25 +248,10 @@ - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/bug-1820-1.summary b/pengine/test10/bug-1820-1.summary index 2b0673a..67772ca 100644 --- a/pengine/test10/bug-1820-1.summary +++ b/pengine/test10/bug-1820-1.summary @@ -25,7 +25,6 @@ Executing cluster transition: * Resource action: test2 stop on star * Resource action: test1 stop on star * Cluster action: do_shutdown on star - * Pseudo action: all_stopped * Pseudo action: gr1_stopped_0 * Pseudo action: gr1_start_0 * Pseudo action: test1_start_0 diff --git a/pengine/test10/bug-1820.dot b/pengine/test10/bug-1820.dot index 2488104..1b8653e 100644 --- a/pengine/test10/bug-1820.dot +++ b/pengine/test10/bug-1820.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "do_shutdown star" [ style=bold color="green" fontcolor="black" ] "gr1_running_0" [ style=bold color="green" fontcolor="orange" ] "gr1_start_0" -> "gr1_running_0" [ style = bold] @@ -24,7 +23,6 @@ digraph "g" { "test1_start_0 world" -> "test2_migrate_to_0 star" [ style = dashed] "test1_start_0 world" -> "test2_start_0 world" [ style = bold] "test1_start_0 world" [ style=bold color="green" fontcolor="orange" ] -"test1_stop_0 star" -> "all_stopped" [ style = bold] "test1_stop_0 star" -> "do_shutdown star" [ style = bold] "test1_stop_0 star" -> "gr1_stopped_0" [ style = bold] "test1_stop_0 star" -> "test1_start_0 world" [ style = bold] @@ -38,7 +36,6 @@ digraph "g" { "test2_start_0 world" -> "gr1_running_0" [ style = bold] "test2_start_0 world" -> "test2_monitor_10000 world" [ style = bold] "test2_start_0 world" [ style=bold color="green" fontcolor="orange"] -"test2_stop_0 star" -> "all_stopped" [ style = bold] "test2_stop_0 star" -> "do_shutdown star" [ style = bold] "test2_stop_0 star" -> "gr1_stopped_0" [ style = bold] "test2_stop_0 star" -> "gr1_stopped_0" [ style = dashed] diff --git a/pengine/test10/bug-1820.exp b/pengine/test10/bug-1820.exp index 35c0e65..984f03b 100644 --- a/pengine/test10/bug-1820.exp +++ b/pengine/test10/bug-1820.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -27,50 +27,50 @@ - + - + - + - + - + - + - + - + - + @@ -79,133 +79,133 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -214,25 +214,10 @@ - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/bug-1820.summary b/pengine/test10/bug-1820.summary index e13f8ad..64b16bc 100644 --- a/pengine/test10/bug-1820.summary +++ b/pengine/test10/bug-1820.summary @@ -20,7 +20,6 @@ Executing cluster transition: * Resource action: test2 stop on star * Resource action: test1 stop on star * Cluster action: do_shutdown on star - * Pseudo action: all_stopped * Pseudo action: gr1_stopped_0 * Pseudo action: gr1_start_0 * Pseudo action: test1_start_0 diff --git a/pengine/test10/bug-1822.dot b/pengine/test10/bug-1822.dot index ba3429e..3e73ed8 100644 --- a/pengine/test10/bug-1822.dot +++ b/pengine/test10/bug-1822.dot @@ -1,17 +1,14 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "do_shutdown process1a" [ style=bold color="green" fontcolor="black" ] "master_slave_Stateful:1_demote_0 process1a" -> "master_slave_Stateful:1_stop_0 process1a" [ style = bold] "master_slave_Stateful:1_demote_0 process1a" -> "ms-sf_group:1_demoted_0" [ style = bold] "master_slave_Stateful:1_demote_0 process1a" [ style=bold color="green" fontcolor="black" ] -"master_slave_Stateful:1_stop_0 process1a" -> "all_stopped" [ style = bold] "master_slave_Stateful:1_stop_0 process1a" -> "do_shutdown process1a" [ style = bold] "master_slave_Stateful:1_stop_0 process1a" -> "ms-sf_group:1_stopped_0" [ style = bold] "master_slave_Stateful:1_stop_0 process1a" [ style=bold color="green" fontcolor="black" ] "master_slave_procdctl:1_demote_0 process1a" -> "master_slave_procdctl:1_stop_0 process1a" [ style = bold] "master_slave_procdctl:1_demote_0 process1a" -> "ms-sf_group:1_demoted_0" [ style = bold] "master_slave_procdctl:1_demote_0 process1a" [ style=bold color="green" fontcolor="black" ] -"master_slave_procdctl:1_stop_0 process1a" -> "all_stopped" [ style = bold] "master_slave_procdctl:1_stop_0 process1a" -> "do_shutdown process1a" [ style = bold] "master_slave_procdctl:1_stop_0 process1a" -> "ms-sf_group:1_stopped_0" [ style = bold] "master_slave_procdctl:1_stop_0 process1a" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/bug-1822.exp b/pengine/test10/bug-1822.exp index 8ce6d70..2f08438 100644 --- a/pengine/test10/bug-1822.exp +++ b/pengine/test10/bug-1822.exp @@ -1,137 +1,137 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -139,34 +139,34 @@ - + - + - + - + - + - + @@ -175,25 +175,10 @@ - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/bug-1822.summary b/pengine/test10/bug-1822.summary index 5bf91b9..024da3b 100644 --- a/pengine/test10/bug-1822.summary +++ b/pengine/test10/bug-1822.summary @@ -27,7 +27,6 @@ Executing cluster transition: * Resource action: master_slave_Stateful:1 stop on process1a * Resource action: master_slave_procdctl:1 stop on process1a * Cluster action: do_shutdown on process1a - * Pseudo action: all_stopped * Pseudo action: ms-sf_group:1_stopped_0 * Pseudo action: ms-sf_stopped_0 diff --git a/pengine/test10/bug-5007-masterslave_colocation.dot b/pengine/test10/bug-5007-masterslave_colocation.dot index 3de8dd8..10047e4 100644 --- a/pengine/test10/bug-5007-masterslave_colocation.dot +++ b/pengine/test10/bug-5007-masterslave_colocation.dot @@ -1,11 +1,8 @@ digraph "g" { "MASTER_IP_start_0 fc16-builder" [ style=bold color="green" fontcolor="black"] "MASTER_IP_stop_0 fc16-builder2" -> "MASTER_IP_start_0 fc16-builder" [ style = bold] -"MASTER_IP_stop_0 fc16-builder2" -> "all_stopped" [ style = bold] "MASTER_IP_stop_0 fc16-builder2" [ style=bold color="green" fontcolor="black"] "SLAVE_IP_start_0 fc16-builder2" [ style=bold color="green" fontcolor="black"] "SLAVE_IP_stop_0 fc16-builder" -> "SLAVE_IP_start_0 fc16-builder2" [ style = bold] -"SLAVE_IP_stop_0 fc16-builder" -> "all_stopped" [ style = bold] "SLAVE_IP_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/bug-5007-masterslave_colocation.exp b/pengine/test10/bug-5007-masterslave_colocation.exp index bf83867..e2b20fa 100644 --- a/pengine/test10/bug-5007-masterslave_colocation.exp +++ b/pengine/test10/bug-5007-masterslave_colocation.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,40 +23,24 @@ - + - + - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/bug-5007-masterslave_colocation.summary b/pengine/test10/bug-5007-masterslave_colocation.summary index adbc1f1..b6ade60 100644 --- a/pengine/test10/bug-5007-masterslave_colocation.summary +++ b/pengine/test10/bug-5007-masterslave_colocation.summary @@ -15,7 +15,6 @@ Transition Summary: Executing cluster transition: * Resource action: SLAVE_IP stop on fc16-builder * Resource action: MASTER_IP stop on fc16-builder2 - * Pseudo action: all_stopped * Resource action: SLAVE_IP start on fc16-builder2 * Resource action: MASTER_IP start on fc16-builder diff --git a/pengine/test10/bug-5014-A-start-B-start.exp b/pengine/test10/bug-5014-A-start-B-start.exp index c89ed4b..d375e7a 100644 --- a/pengine/test10/bug-5014-A-start-B-start.exp +++ b/pengine/test10/bug-5014-A-start-B-start.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,36 +36,36 @@ - + - + - + - + - + - + diff --git a/pengine/test10/bug-5014-A-stop-B-started.dot b/pengine/test10/bug-5014-A-stop-B-started.dot index ec7dc53..9a20a07 100644 --- a/pengine/test10/bug-5014-A-stop-B-started.dot +++ b/pengine/test10/bug-5014-A-stop-B-started.dot @@ -1,7 +1,5 @@ digraph "g" { "ClusterIP_start_0 " [ style=dashed color="red" fontcolor="black"] "ClusterIP_stop_0 fc16-builder" -> "ClusterIP_start_0 " [ style = dashed] -"ClusterIP_stop_0 fc16-builder" -> "all_stopped" [ style = bold] "ClusterIP_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/bug-5014-A-stop-B-started.exp b/pengine/test10/bug-5014-A-stop-B-started.exp index dc289f0..4c15e22 100644 --- a/pengine/test10/bug-5014-A-stop-B-started.exp +++ b/pengine/test10/bug-5014-A-stop-B-started.exp @@ -1,24 +1,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/bug-5014-A-stop-B-started.summary b/pengine/test10/bug-5014-A-stop-B-started.summary index a00dfd7..25ca222 100644 --- a/pengine/test10/bug-5014-A-stop-B-started.summary +++ b/pengine/test10/bug-5014-A-stop-B-started.summary @@ -11,7 +11,6 @@ Transition Summary: Executing cluster transition: * Resource action: ClusterIP stop on fc16-builder - * Pseudo action: all_stopped Revised cluster status: Online: [ fc16-builder ] diff --git a/pengine/test10/bug-5014-A-stopped-B-stopped.exp b/pengine/test10/bug-5014-A-stopped-B-stopped.exp index 0d3b9ea..5549ff8 100644 --- a/pengine/test10/bug-5014-A-stopped-B-stopped.exp +++ b/pengine/test10/bug-5014-A-stopped-B-stopped.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/pengine/test10/bug-5014-CLONE-A-start-B-start.exp b/pengine/test10/bug-5014-CLONE-A-start-B-start.exp index 1e9013e..7fc5584 100644 --- a/pengine/test10/bug-5014-CLONE-A-start-B-start.exp +++ b/pengine/test10/bug-5014-CLONE-A-start-B-start.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,60 +36,60 @@ - + - + - + - + - + - + - + - + - + - + @@ -98,31 +98,31 @@ - + - + - + - + - + - + diff --git a/pengine/test10/bug-5014-CLONE-A-stop-B-started.dot b/pengine/test10/bug-5014-CLONE-A-stop-B-started.dot index 78d6998..4fdb217 100644 --- a/pengine/test10/bug-5014-CLONE-A-stop-B-started.dot +++ b/pengine/test10/bug-5014-CLONE-A-stop-B-started.dot @@ -1,8 +1,6 @@ digraph "g" { -"ClusterIP:0_stop_0 fc16-builder" -> "all_stopped" [ style = bold] "ClusterIP:0_stop_0 fc16-builder" -> "clone1_stopped_0" [ style = bold] "ClusterIP:0_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "clone1_stop_0" -> "ClusterIP:0_stop_0 fc16-builder" [ style = bold] "clone1_stop_0" -> "clone1_stopped_0" [ style = bold] "clone1_stop_0" [ style=bold color="green" fontcolor="orange"] diff --git a/pengine/test10/bug-5014-CLONE-A-stop-B-started.exp b/pengine/test10/bug-5014-CLONE-A-stop-B-started.exp index aa99923..25cab0a 100644 --- a/pengine/test10/bug-5014-CLONE-A-stop-B-started.exp +++ b/pengine/test10/bug-5014-CLONE-A-stop-B-started.exp @@ -1,51 +1,38 @@ - + - + - + - + - + - + - - - - - - - - - - - - - diff --git a/pengine/test10/bug-5014-CLONE-A-stop-B-started.summary b/pengine/test10/bug-5014-CLONE-A-stop-B-started.summary index c3fb6d5..c58d22e 100644 --- a/pengine/test10/bug-5014-CLONE-A-stop-B-started.summary +++ b/pengine/test10/bug-5014-CLONE-A-stop-B-started.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Pseudo action: clone1_stop_0 * Resource action: ClusterIP:0 stop on fc16-builder * Pseudo action: clone1_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ fc16-builder ] diff --git a/pengine/test10/bug-5014-CthenAthenB-C-stopped.exp b/pengine/test10/bug-5014-CthenAthenB-C-stopped.exp index 0896ce2..42e829d 100644 --- a/pengine/test10/bug-5014-CthenAthenB-C-stopped.exp +++ b/pengine/test10/bug-5014-CthenAthenB-C-stopped.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/pengine/test10/bug-5014-GROUP-A-start-B-start.exp b/pengine/test10/bug-5014-GROUP-A-start-B-start.exp index 598bdce..04ec51f 100644 --- a/pengine/test10/bug-5014-GROUP-A-start-B-start.exp +++ b/pengine/test10/bug-5014-GROUP-A-start-B-start.exp @@ -1,22 +1,22 @@ - + - + - + - + @@ -24,80 +24,80 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/bug-5014-GROUP-A-stopped-B-started.dot b/pengine/test10/bug-5014-GROUP-A-stopped-B-started.dot index a26267c..0c75e44 100644 --- a/pengine/test10/bug-5014-GROUP-A-stopped-B-started.dot +++ b/pengine/test10/bug-5014-GROUP-A-stopped-B-started.dot @@ -1,8 +1,6 @@ digraph "g" { -"ClusterIP_stop_0 fc16-builder" -> "all_stopped" [ style = bold] "ClusterIP_stop_0 fc16-builder" -> "group1_stopped_0" [ style = bold] "ClusterIP_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "group1_stop_0" -> "ClusterIP_stop_0 fc16-builder" [ style = bold] "group1_stop_0" -> "group1_stopped_0" [ style = bold] "group1_stop_0" [ style=bold color="green" fontcolor="orange"] diff --git a/pengine/test10/bug-5014-GROUP-A-stopped-B-started.exp b/pengine/test10/bug-5014-GROUP-A-stopped-B-started.exp index 0a0cb5c..e986316 100644 --- a/pengine/test10/bug-5014-GROUP-A-stopped-B-started.exp +++ b/pengine/test10/bug-5014-GROUP-A-stopped-B-started.exp @@ -1,22 +1,22 @@ - + - + - + - + @@ -24,26 +24,14 @@ - + - - - - - - - - - - - - - + diff --git a/pengine/test10/bug-5014-GROUP-A-stopped-B-started.summary b/pengine/test10/bug-5014-GROUP-A-stopped-B-started.summary index 5ea35cb..5ae9196 100644 --- a/pengine/test10/bug-5014-GROUP-A-stopped-B-started.summary +++ b/pengine/test10/bug-5014-GROUP-A-stopped-B-started.summary @@ -14,7 +14,6 @@ Transition Summary: Executing cluster transition: * Pseudo action: group1_stop_0 * Resource action: ClusterIP stop on fc16-builder - * Pseudo action: all_stopped * Pseudo action: group1_stopped_0 Revised cluster status: diff --git a/pengine/test10/bug-5014-ordered-set-symmetrical-false.dot b/pengine/test10/bug-5014-ordered-set-symmetrical-false.dot index 91f7d9f..0a45d65 100644 --- a/pengine/test10/bug-5014-ordered-set-symmetrical-false.dot +++ b/pengine/test10/bug-5014-ordered-set-symmetrical-false.dot @@ -1,7 +1,5 @@ digraph "g" { "C_start_0 " [ style=dashed color="red" fontcolor="black"] "C_stop_0 fc16-builder" -> "C_start_0 " [ style = dashed] -"C_stop_0 fc16-builder" -> "all_stopped" [ style = bold] "C_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/bug-5014-ordered-set-symmetrical-false.exp b/pengine/test10/bug-5014-ordered-set-symmetrical-false.exp index 4525661..679a30f 100644 --- a/pengine/test10/bug-5014-ordered-set-symmetrical-false.exp +++ b/pengine/test10/bug-5014-ordered-set-symmetrical-false.exp @@ -1,24 +1,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/bug-5014-ordered-set-symmetrical-false.summary b/pengine/test10/bug-5014-ordered-set-symmetrical-false.summary index 89b3416..3c65e3c 100644 --- a/pengine/test10/bug-5014-ordered-set-symmetrical-false.summary +++ b/pengine/test10/bug-5014-ordered-set-symmetrical-false.summary @@ -13,7 +13,6 @@ Transition Summary: Executing cluster transition: * Resource action: C stop on fc16-builder - * Pseudo action: all_stopped Revised cluster status: Online: [ fc16-builder ] diff --git a/pengine/test10/bug-5014-ordered-set-symmetrical-true.dot b/pengine/test10/bug-5014-ordered-set-symmetrical-true.dot index d4f5285..cc99f24 100644 --- a/pengine/test10/bug-5014-ordered-set-symmetrical-true.dot +++ b/pengine/test10/bug-5014-ordered-set-symmetrical-true.dot @@ -2,12 +2,9 @@ digraph "g" { "A_start_0 fc16-builder" [ style=dashed color="red" fontcolor="black"] "A_stop_0 fc16-builder" -> "A_start_0 fc16-builder" [ style = dashed] "A_stop_0 fc16-builder" -> "C_stop_0 fc16-builder" [ style = bold] -"A_stop_0 fc16-builder" -> "all_stopped" [ style = bold] "A_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"] "C_start_0 " -> "A_start_0 fc16-builder" [ style = dashed] "C_start_0 " [ style=dashed color="red" fontcolor="black"] "C_stop_0 fc16-builder" -> "C_start_0 " [ style = dashed] -"C_stop_0 fc16-builder" -> "all_stopped" [ style = bold] "C_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/bug-5014-ordered-set-symmetrical-true.exp b/pengine/test10/bug-5014-ordered-set-symmetrical-true.exp index d0c9593..2cc7df8 100644 --- a/pengine/test10/bug-5014-ordered-set-symmetrical-true.exp +++ b/pengine/test10/bug-5014-ordered-set-symmetrical-true.exp @@ -1,7 +1,7 @@ - + @@ -10,29 +10,14 @@ - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/bug-5014-ordered-set-symmetrical-true.summary b/pengine/test10/bug-5014-ordered-set-symmetrical-true.summary index 7c28340..cb83aa8 100644 --- a/pengine/test10/bug-5014-ordered-set-symmetrical-true.summary +++ b/pengine/test10/bug-5014-ordered-set-symmetrical-true.summary @@ -15,7 +15,6 @@ Transition Summary: Executing cluster transition: * Resource action: A stop on fc16-builder * Resource action: C stop on fc16-builder - * Pseudo action: all_stopped Revised cluster status: Online: [ fc16-builder ] diff --git a/pengine/test10/bug-5025-1.exp b/pengine/test10/bug-5025-1.exp index 2a82e79..0684710 100644 --- a/pengine/test10/bug-5025-1.exp +++ b/pengine/test10/bug-5025-1.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/pengine/test10/bug-5025-3.dot b/pengine/test10/bug-5025-3.dot index 783192c..42567b4 100644 --- a/pengine/test10/bug-5025-3.dot +++ b/pengine/test10/bug-5025-3.dot @@ -4,7 +4,5 @@ "A_start_0 fc16-builder" -> "A_monitor_30000 fc16-builder" [ style = bold] "A_start_0 fc16-builder" [ style=bold color="green" fontcolor="black"] "A_stop_0 fc16-builder" -> "A_start_0 fc16-builder" [ style = bold] -"A_stop_0 fc16-builder" -> "all_stopped" [ style = bold] "A_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/bug-5025-3.exp b/pengine/test10/bug-5025-3.exp index 9360ca7..8cd9fae 100644 --- a/pengine/test10/bug-5025-3.exp +++ b/pengine/test10/bug-5025-3.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,14 +19,14 @@ - + - + @@ -39,19 +39,7 @@ - - - - - - - - - - - - - + diff --git a/pengine/test10/bug-5025-3.summary b/pengine/test10/bug-5025-3.summary index 720b462..0335e2d 100644 --- a/pengine/test10/bug-5025-3.summary +++ b/pengine/test10/bug-5025-3.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Cluster action: clear_failcount for A on fc16-builder * Resource action: A start on fc16-builder * Resource action: A monitor=30000 on fc16-builder - * Pseudo action: all_stopped Revised cluster status: Online: [ fc16-builder ] diff --git a/pengine/test10/bug-5025-4.exp b/pengine/test10/bug-5025-4.exp index 586c540..4bfa4fa 100644 --- a/pengine/test10/bug-5025-4.exp +++ b/pengine/test10/bug-5025-4.exp @@ -1,33 +1,33 @@ - + - + - + - + - + diff --git a/pengine/test10/bug-5028-bottom.dot b/pengine/test10/bug-5028-bottom.dot index e25e097..59d1a28 100644 --- a/pengine/test10/bug-5028-bottom.dot +++ b/pengine/test10/bug-5028-bottom.dot @@ -1,11 +1,9 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "do_shutdown bl460g6a" [ style=dashed color="red" fontcolor="black"] "dummy-g_stop_0" -> "dummy-g_stopped_0" [ style = dashed] "dummy-g_stop_0" -> "dummy02_stop_0 bl460g6a" [ style = bold] "dummy-g_stop_0" [ style=bold color="green" fontcolor="orange"] "dummy-g_stopped_0" [ style=dashed color="red" fontcolor="orange"] -"dummy02_stop_0 bl460g6a" -> "all_stopped" [ style = bold] "dummy02_stop_0 bl460g6a" -> "do_shutdown bl460g6a" [ style = dashed] "dummy02_stop_0 bl460g6a" -> "dummy-g_stopped_0" [ style = dashed] "dummy02_stop_0 bl460g6a" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/bug-5028-bottom.exp b/pengine/test10/bug-5028-bottom.exp index f7e7050..c2810cb 100644 --- a/pengine/test10/bug-5028-bottom.exp +++ b/pengine/test10/bug-5028-bottom.exp @@ -1,7 +1,7 @@ - + @@ -9,26 +9,14 @@ - + - - - - - - - - - - - - - + diff --git a/pengine/test10/bug-5028-bottom.summary b/pengine/test10/bug-5028-bottom.summary index de24e29..5408070 100644 --- a/pengine/test10/bug-5028-bottom.summary +++ b/pengine/test10/bug-5028-bottom.summary @@ -13,7 +13,6 @@ Transition Summary: Executing cluster transition: * Pseudo action: dummy-g_stop_0 * Resource action: dummy02 stop on bl460g6a - * Pseudo action: all_stopped Revised cluster status: Online: [ bl460g6a bl460g6b ] diff --git a/pengine/test10/bug-5028-detach.exp b/pengine/test10/bug-5028-detach.exp index 8c3cae3..d33aa88 100644 --- a/pengine/test10/bug-5028-detach.exp +++ b/pengine/test10/bug-5028-detach.exp @@ -1,7 +1,7 @@ - + diff --git a/pengine/test10/bug-5028.dot b/pengine/test10/bug-5028.dot index 1261d24..7335eec 100644 --- a/pengine/test10/bug-5028.dot +++ b/pengine/test10/bug-5028.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=dashed color="red" fontcolor="orange"] "do_shutdown bl460g6a" [ style=dashed color="red" fontcolor="black"] "dummy-g_running_0" [ style=dashed color="red" fontcolor="orange"] "dummy-g_start_0" -> "dummy-g_running_0" [ style = dashed] @@ -14,7 +13,6 @@ digraph "g" { "dummy01_start_0 bl460g6b" -> "dummy-g_running_0" [ style = dashed] "dummy01_start_0 bl460g6b" -> "dummy01_monitor_7000 bl460g6b" [ style = dashed] "dummy01_start_0 bl460g6b" [ style=dashed color="red" fontcolor="black"] -"dummy01_stop_0 bl460g6a" -> "all_stopped" [ style = dashed] "dummy01_stop_0 bl460g6a" -> "do_shutdown bl460g6a" [ style = dashed] "dummy01_stop_0 bl460g6a" -> "dummy-g_stopped_0" [ style = dashed] "dummy01_stop_0 bl460g6a" -> "dummy01_start_0 bl460g6b" [ style = dashed] diff --git a/pengine/test10/bug-5028.exp b/pengine/test10/bug-5028.exp index a3b6411..055d482 100644 --- a/pengine/test10/bug-5028.exp +++ b/pengine/test10/bug-5028.exp @@ -1,7 +1,7 @@ - + @@ -9,7 +9,7 @@ - + diff --git a/pengine/test10/bug-5059.exp b/pengine/test10/bug-5059.exp index a97b99d..ebbb5e6 100644 --- a/pengine/test10/bug-5059.exp +++ b/pengine/test10/bug-5059.exp @@ -1,522 +1,522 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -524,37 +524,37 @@ - + - + - + - + - + - + - + @@ -563,7 +563,7 @@ - + diff --git a/pengine/test10/bug-5069-op-disabled.exp b/pengine/test10/bug-5069-op-disabled.exp index fffb8c4..068ea9c 100644 --- a/pengine/test10/bug-5069-op-disabled.exp +++ b/pengine/test10/bug-5069-op-disabled.exp @@ -1,7 +1,7 @@ - + diff --git a/pengine/test10/bug-5140-require-all-false.dot b/pengine/test10/bug-5140-require-all-false.dot index 8e7f299..c7f9a29 100644 --- a/pengine/test10/bug-5140-require-all-false.dot +++ b/pengine/test10/bug-5140-require-all-false.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "baseclone_stop_0" -> "baseclone_stopped_0" [ style = bold] "baseclone_stop_0" -> "basegrp:0_stop_0" [ style = bold] "baseclone_stop_0" [ style=bold color="green" fontcolor="orange"] @@ -11,14 +10,11 @@ digraph "g" { "basegrp:0_stop_0" [ style=bold color="green" fontcolor="orange"] "basegrp:0_stopped_0" -> "baseclone_stopped_0" [ style = bold] "basegrp:0_stopped_0" [ style=bold color="green" fontcolor="orange"] -"clvmd_stop_0 hex-2" -> "all_stopped" [ style = bold] "clvmd_stop_0 hex-2" -> "basegrp:0_stopped_0" [ style = bold] "clvmd_stop_0 hex-2" -> "dlm_stop_0 hex-2" [ style = bold] "clvmd_stop_0 hex-2" [ style=bold color="green" fontcolor="black"] -"dlm_stop_0 hex-2" -> "all_stopped" [ style = bold] "dlm_stop_0 hex-2" -> "basegrp:0_stopped_0" [ style = bold] "dlm_stop_0 hex-2" [ style=bold color="green" fontcolor="black"] -"o2cb_stop_0 hex-2" -> "all_stopped" [ style = bold] "o2cb_stop_0 hex-2" -> "basegrp:0_stopped_0" [ style = bold] "o2cb_stop_0 hex-2" -> "clvmd_stop_0 hex-2" [ style = bold] "o2cb_stop_0 hex-2" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/bug-5140-require-all-false.exp b/pengine/test10/bug-5140-require-all-false.exp index 9751b9b..dcd32ea 100644 --- a/pengine/test10/bug-5140-require-all-false.exp +++ b/pengine/test10/bug-5140-require-all-false.exp @@ -1,122 +1,103 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/bug-5140-require-all-false.summary b/pengine/test10/bug-5140-require-all-false.summary index cf5193c..73b45c7 100644 --- a/pengine/test10/bug-5140-require-all-false.summary +++ b/pengine/test10/bug-5140-require-all-false.summary @@ -46,7 +46,6 @@ Executing cluster transition: * Resource action: o2cb stop on hex-2 * Resource action: clvmd stop on hex-2 * Resource action: dlm stop on hex-2 - * Pseudo action: all_stopped * Pseudo action: basegrp:0_stopped_0 * Pseudo action: baseclone_stopped_0 diff --git a/pengine/test10/bug-5143-ms-shuffle.exp b/pengine/test10/bug-5143-ms-shuffle.exp index caa1474..6fb6d5b 100644 --- a/pengine/test10/bug-5143-ms-shuffle.exp +++ b/pengine/test10/bug-5143-ms-shuffle.exp @@ -1,152 +1,152 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -154,25 +154,25 @@ - + - + - + - + diff --git a/pengine/test10/bug-5186-partial-migrate.dot b/pengine/test10/bug-5186-partial-migrate.dot index 65f5616..f11aa82 100644 --- a/pengine/test10/bug-5186-partial-migrate.dot +++ b/pengine/test10/bug-5186-partial-migrate.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "clnDiskd1_stop_0" -> "clnDiskd1_stopped_0" [ style = bold] "clnDiskd1_stop_0" -> "prmDiskd1_stop_0 bl460g1n7" [ style = bold] "clnDiskd1_stop_0" [ style=bold color="green" fontcolor="orange"] @@ -23,17 +22,13 @@ "grpStonith8_stop_0" [ style=bold color="green" fontcolor="orange"] "grpStonith8_stopped_0" -> "grpStonith8_start_0" [ style = bold] "grpStonith8_stopped_0" [ style=bold color="green" fontcolor="orange"] -"prmDiskd1_stop_0 bl460g1n7" -> "all_stopped" [ style = bold] "prmDiskd1_stop_0 bl460g1n7" -> "clnDiskd1_stopped_0" [ style = bold] "prmDiskd1_stop_0 bl460g1n7" [ style=bold color="green" fontcolor="orange"] -"prmDiskd2_stop_0 bl460g1n7" -> "all_stopped" [ style = bold] "prmDiskd2_stop_0 bl460g1n7" -> "clnDiskd2_stopped_0" [ style = bold] "prmDiskd2_stop_0 bl460g1n7" [ style=bold color="green" fontcolor="orange"] "prmDummy_start_0 bl460g1n6" [ style=bold color="green" fontcolor="black"] -"prmDummy_stop_0 bl460g1n7" -> "all_stopped" [ style = bold] "prmDummy_stop_0 bl460g1n7" -> "prmDummy_start_0 bl460g1n6" [ style = bold] "prmDummy_stop_0 bl460g1n7" [ style=bold color="green" fontcolor="orange"] -"prmPing_stop_0 bl460g1n7" -> "all_stopped" [ style = bold] "prmPing_stop_0 bl460g1n7" -> "clnPing_stopped_0" [ style = bold] "prmPing_stop_0 bl460g1n7" [ style=bold color="green" fontcolor="orange"] "prmStonith8-1_monitor_10000 bl460g1n6" [ style=bold color="green" fontcolor="black"] @@ -41,7 +36,6 @@ "prmStonith8-1_start_0 bl460g1n6" -> "prmStonith8-1_monitor_10000 bl460g1n6" [ style = bold] "prmStonith8-1_start_0 bl460g1n6" -> "prmStonith8-2_start_0 bl460g1n6" [ style = bold] "prmStonith8-1_start_0 bl460g1n6" [ style=bold color="green" fontcolor="black"] -"prmStonith8-1_stop_0 bl460g1n7" -> "all_stopped" [ style = bold] "prmStonith8-1_stop_0 bl460g1n7" -> "grpStonith8_stopped_0" [ style = bold] "prmStonith8-1_stop_0 bl460g1n7" -> "prmStonith8-1_start_0 bl460g1n6" [ style = bold] "prmStonith8-1_stop_0 bl460g1n7" [ style=bold color="green" fontcolor="orange"] @@ -49,7 +43,6 @@ "prmStonith8-2_start_0 bl460g1n6" -> "grpStonith8_running_0" [ style = bold] "prmStonith8-2_start_0 bl460g1n6" -> "prmStonith8-2_monitor_3600000 bl460g1n6" [ style = bold] "prmStonith8-2_start_0 bl460g1n6" [ style=bold color="green" fontcolor="black"] -"prmStonith8-2_stop_0 bl460g1n7" -> "all_stopped" [ style = bold] "prmStonith8-2_stop_0 bl460g1n7" -> "grpStonith8_stopped_0" [ style = bold] "prmStonith8-2_stop_0 bl460g1n7" -> "prmStonith8-1_stop_0 bl460g1n7" [ style = bold] "prmStonith8-2_stop_0 bl460g1n7" -> "prmStonith8-2_start_0 bl460g1n6" [ style = bold] @@ -57,10 +50,8 @@ "prmVM2_monitor_10000 bl460g1n8" [ style=bold color="green" fontcolor="black"] "prmVM2_start_0 bl460g1n8" -> "prmVM2_monitor_10000 bl460g1n8" [ style = bold] "prmVM2_start_0 bl460g1n8" [ style=bold color="green" fontcolor="black"] -"prmVM2_stop_0 bl460g1n6" -> "all_stopped" [ style = bold] "prmVM2_stop_0 bl460g1n6" -> "prmVM2_start_0 bl460g1n8" [ style = bold] "prmVM2_stop_0 bl460g1n6" [ style=bold color="green" fontcolor="black"] -"prmVM2_stop_0 bl460g1n7" -> "all_stopped" [ style = bold] "prmVM2_stop_0 bl460g1n7" -> "prmVM2_start_0 bl460g1n8" [ style = bold] "prmVM2_stop_0 bl460g1n7" [ style=bold color="green" fontcolor="orange"] "stonith 'reboot' bl460g1n7" -> "clnDiskd1_stop_0" [ style = bold] @@ -68,13 +59,10 @@ "stonith 'reboot' bl460g1n7" -> "clnPing_stop_0" [ style = bold] "stonith 'reboot' bl460g1n7" -> "prmDiskd1_stop_0 bl460g1n7" [ style = bold] "stonith 'reboot' bl460g1n7" -> "prmDiskd2_stop_0 bl460g1n7" [ style = bold] +"stonith 'reboot' bl460g1n7" -> "prmDummy_start_0 bl460g1n6" [ style = bold] "stonith 'reboot' bl460g1n7" -> "prmDummy_stop_0 bl460g1n7" [ style = bold] "stonith 'reboot' bl460g1n7" -> "prmPing_stop_0 bl460g1n7" [ style = bold] +"stonith 'reboot' bl460g1n7" -> "prmVM2_start_0 bl460g1n8" [ style = bold] "stonith 'reboot' bl460g1n7" -> "prmVM2_stop_0 bl460g1n7" [ style = bold] -"stonith 'reboot' bl460g1n7" -> "stonith_complete" [ style = bold] "stonith 'reboot' bl460g1n7" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "prmDummy_start_0 bl460g1n6" [ style = bold] -"stonith_complete" -> "prmVM2_start_0 bl460g1n8" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/bug-5186-partial-migrate.exp b/pengine/test10/bug-5186-partial-migrate.exp index d9e806f..f88e573 100644 --- a/pengine/test10/bug-5186-partial-migrate.exp +++ b/pengine/test10/bug-5186-partial-migrate.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -29,39 +29,39 @@ - + - + - + - + - + - + - + @@ -82,25 +82,25 @@ - + - + - + - + - + @@ -108,125 +108,125 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -235,28 +235,28 @@ - + - + - + - + - + @@ -268,7 +268,7 @@ - + @@ -277,28 +277,28 @@ - + - + - + - + - + @@ -310,7 +310,7 @@ - + @@ -319,28 +319,28 @@ - + - + - + - + - + @@ -352,54 +352,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/bug-5186-partial-migrate.summary b/pengine/test10/bug-5186-partial-migrate.summary index 4d7f0bf..d6a6954 100644 --- a/pengine/test10/bug-5186-partial-migrate.summary +++ b/pengine/test10/bug-5186-partial-migrate.summary @@ -45,7 +45,6 @@ Executing cluster transition: * Pseudo action: clnDiskd1_stop_0 * Pseudo action: clnDiskd2_stop_0 * Pseudo action: clnPing_stop_0 - * Pseudo action: stonith_complete * Resource action: prmDummy start on bl460g1n6 * Resource action: prmVM2 start on bl460g1n8 * Pseudo action: grpStonith8_stopped_0 @@ -58,7 +57,6 @@ Executing cluster transition: * Pseudo action: clnDiskd2_stopped_0 * Pseudo action: prmPing_stop_0 * Pseudo action: clnPing_stopped_0 - * Pseudo action: all_stopped * Resource action: prmVM2 monitor=10000 on bl460g1n8 * Pseudo action: grpStonith8_running_0 * Resource action: prmStonith8-1 monitor=10000 on bl460g1n6 diff --git a/pengine/test10/bug-cl-5168.exp b/pengine/test10/bug-cl-5168.exp index 729c7a6..1f8ec1c 100644 --- a/pengine/test10/bug-cl-5168.exp +++ b/pengine/test10/bug-cl-5168.exp @@ -1,152 +1,152 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -154,25 +154,25 @@ - + - + - + - + diff --git a/pengine/test10/bug-cl-5170.dot b/pengine/test10/bug-cl-5170.dot index ca63383..680e34d 100644 --- a/pengine/test10/bug-cl-5170.dot +++ b/pengine/test10/bug-cl-5170.dot @@ -1,10 +1,7 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] -"ip_mgmt_stop_0 TCS-2" -> "all_stopped" [ style = bold] "ip_mgmt_stop_0 TCS-2" -> "ip_trf_stop_0 TCS-2" [ style = bold] "ip_mgmt_stop_0 TCS-2" -> "svc_stopped_0" [ style = bold] "ip_mgmt_stop_0 TCS-2" [ style=bold color="green" fontcolor="black"] -"ip_trf_stop_0 TCS-2" -> "all_stopped" [ style = bold] "ip_trf_stop_0 TCS-2" -> "svc_stopped_0" [ style = bold] "ip_trf_stop_0 TCS-2" [ style=bold color="green" fontcolor="black"] "svc_stop_0" -> "ip_mgmt_stop_0 TCS-2" [ style = bold] diff --git a/pengine/test10/bug-cl-5170.exp b/pengine/test10/bug-cl-5170.exp index d8143c0..3e1c8c1 100644 --- a/pengine/test10/bug-cl-5170.exp +++ b/pengine/test10/bug-cl-5170.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -27,45 +27,30 @@ - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/bug-cl-5170.summary b/pengine/test10/bug-cl-5170.summary index 70b589e..76753f5 100644 --- a/pengine/test10/bug-cl-5170.summary +++ b/pengine/test10/bug-cl-5170.summary @@ -18,7 +18,6 @@ Executing cluster transition: * Pseudo action: svc_stop_0 * Resource action: ip_mgmt stop on TCS-2 * Resource action: ip_trf stop on TCS-2 - * Pseudo action: all_stopped * Pseudo action: svc_stopped_0 Revised cluster status: diff --git a/pengine/test10/bug-cl-5212.dot b/pengine/test10/bug-cl-5212.dot index 3538cf7..558881e 100644 --- a/pengine/test10/bug-cl-5212.dot +++ b/pengine/test10/bug-cl-5212.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=dashed color="red" fontcolor="orange"] "clnPingd_stop_0" -> "clnPingd_stopped_0" [ style = bold] "clnPingd_stop_0" -> "prmPingd_stop_0 srv01" [ style = dashed] "clnPingd_stop_0" -> "prmPingd_stop_0 srv02" [ style = dashed] @@ -29,7 +28,6 @@ digraph "g" { "grpStonith3_stopped_0" [ style=dashed color="red" fontcolor="orange"] "msPostgresql_confirmed-post_notify_demoted_0" -> "msPostgresql_pre_notify_stop_0" [ style = dashed] "msPostgresql_confirmed-post_notify_demoted_0" [ style=dashed color="red" fontcolor="orange"] -"msPostgresql_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = dashed] "msPostgresql_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"] "msPostgresql_confirmed-pre_notify_demote_0" -> "msPostgresql_demote_0" [ style = dashed] "msPostgresql_confirmed-pre_notify_demote_0" -> "msPostgresql_post_notify_demoted_0" [ style = dashed] @@ -66,23 +64,18 @@ digraph "g" { "pgsql_post_notify_stopped_0 srv03" [ style=bold color="green" fontcolor="black"] "pgsql_pre_notify_stop_0 srv03" -> "msPostgresql_confirmed-pre_notify_stop_0" [ style = bold] "pgsql_pre_notify_stop_0 srv03" [ style=bold color="green" fontcolor="black"] -"pgsql_stop_0 srv01" -> "all_stopped" [ style = dashed] "pgsql_stop_0 srv01" -> "msPostgresql_stopped_0" [ style = dashed] "pgsql_stop_0 srv01" [ style=dashed color="red" fontcolor="black"] -"pgsql_stop_0 srv02" -> "all_stopped" [ style = dashed] "pgsql_stop_0 srv02" -> "msPostgresql_stopped_0" [ style = dashed] "pgsql_stop_0 srv02" [ style=dashed color="red" fontcolor="black"] -"prmPingd_stop_0 srv01" -> "all_stopped" [ style = dashed] "prmPingd_stop_0 srv01" -> "clnPingd_stopped_0" [ style = dashed] "prmPingd_stop_0 srv01" [ style=dashed color="red" fontcolor="black"] -"prmPingd_stop_0 srv02" -> "all_stopped" [ style = dashed] "prmPingd_stop_0 srv02" -> "clnPingd_stopped_0" [ style = dashed] "prmPingd_stop_0 srv02" [ style=dashed color="red" fontcolor="black"] "prmStonith1-1_monitor_10000 srv03" [ style=dashed color="red" fontcolor="black"] "prmStonith1-1_start_0 srv03" -> "grpStonith1_running_0" [ style = dashed] "prmStonith1-1_start_0 srv03" -> "prmStonith1-1_monitor_10000 srv03" [ style = dashed] "prmStonith1-1_start_0 srv03" [ style=dashed color="red" fontcolor="black"] -"prmStonith1-1_stop_0 srv02" -> "all_stopped" [ style = dashed] "prmStonith1-1_stop_0 srv02" -> "grpStonith1_stopped_0" [ style = dashed] "prmStonith1-1_stop_0 srv02" -> "prmStonith1-1_start_0 srv03" [ style = dashed] "prmStonith1-1_stop_0 srv02" [ style=dashed color="red" fontcolor="black"] @@ -90,11 +83,9 @@ digraph "g" { "prmStonith2-1_start_0 srv03" -> "grpStonith2_running_0" [ style = dashed] "prmStonith2-1_start_0 srv03" -> "prmStonith2-1_monitor_10000 srv03" [ style = dashed] "prmStonith2-1_start_0 srv03" [ style=dashed color="red" fontcolor="black"] -"prmStonith2-1_stop_0 srv01" -> "all_stopped" [ style = dashed] "prmStonith2-1_stop_0 srv01" -> "grpStonith2_stopped_0" [ style = dashed] "prmStonith2-1_stop_0 srv01" -> "prmStonith2-1_start_0 srv03" [ style = dashed] "prmStonith2-1_stop_0 srv01" [ style=dashed color="red" fontcolor="black"] -"prmStonith3-1_stop_0 srv01" -> "all_stopped" [ style = dashed] "prmStonith3-1_stop_0 srv01" -> "grpStonith3_stopped_0" [ style = dashed] "prmStonith3-1_stop_0 srv01" [ style=dashed color="red" fontcolor="black"] } diff --git a/pengine/test10/bug-cl-5212.exp b/pengine/test10/bug-cl-5212.exp index 4ee6d88..f925812 100644 --- a/pengine/test10/bug-cl-5212.exp +++ b/pengine/test10/bug-cl-5212.exp @@ -1,7 +1,7 @@ - + @@ -9,7 +9,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -41,78 +41,78 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -120,43 +120,43 @@ - + - + - + - + - + - + - + diff --git a/pengine/test10/bug-cl-5213.exp b/pengine/test10/bug-cl-5213.exp index 790b12a..2011d6b 100644 --- a/pengine/test10/bug-cl-5213.exp +++ b/pengine/test10/bug-cl-5213.exp @@ -1,7 +1,7 @@ - + diff --git a/pengine/test10/bug-cl-5219.dot b/pengine/test10/bug-cl-5219.dot index 741ef76..0b6cac0 100644 --- a/pengine/test10/bug-cl-5219.dot +++ b/pengine/test10/bug-cl-5219.dot @@ -1,5 +1,3 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] -"child1-service_stop_0 ha2.test.anchor.net.au" -> "all_stopped" [ style = bold] "child1-service_stop_0 ha2.test.anchor.net.au" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/bug-cl-5219.exp b/pengine/test10/bug-cl-5219.exp index 608c849..1545cd9 100644 --- a/pengine/test10/bug-cl-5219.exp +++ b/pengine/test10/bug-cl-5219.exp @@ -1,23 +1,11 @@ - + - - - - - - - - - - - - diff --git a/pengine/test10/bug-cl-5219.summary b/pengine/test10/bug-cl-5219.summary index c9ee54a..ca9789e 100644 --- a/pengine/test10/bug-cl-5219.summary +++ b/pengine/test10/bug-cl-5219.summary @@ -21,7 +21,6 @@ Transition Summary: Executing cluster transition: * Resource action: child1-service stop on ha2.test.anchor.net.au - * Pseudo action: all_stopped Revised cluster status: Online: [ ha1.test.anchor.net.au ha2.test.anchor.net.au ] diff --git a/pengine/test10/bug-cl-5247.dot b/pengine/test10/bug-cl-5247.dot index 41895a1..a978467 100644 --- a/pengine/test10/bug-cl-5247.dot +++ b/pengine/test10/bug-cl-5247.dot @@ -1,7 +1,4 @@ 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] @@ -35,7 +32,6 @@ digraph "g" { "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] @@ -67,7 +63,6 @@ digraph "g" { "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] @@ -86,22 +81,18 @@ digraph "g" { "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" [ 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"] @@ -109,7 +100,6 @@ digraph "g" { "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"] @@ -118,14 +108,13 @@ digraph "g" { "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" -> "prmStonith1-2_start_0 bl460g8n4" [ style = bold] +"stonith 'off' pgsr02" -> "prmStonith2-2_start_0 bl460g8n3" [ style = bold] +"stonith 'off' pgsr02" -> "vip-master_start_0 pgsr01" [ style = bold] "stonith 'off' pgsr02" -> "vip-master_stop_0 pgsr02" [ style = bold] +"stonith 'off' pgsr02" -> "vip-rep_start_0 pgsr01" [ 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" [ style=bold color="green" fontcolor="black"] "vip-master_monitor_10000 pgsr01" [ style=bold color="green" fontcolor="black"] @@ -133,7 +122,6 @@ digraph "g" { "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"] @@ -143,7 +131,6 @@ digraph "g" { "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] diff --git a/pengine/test10/bug-cl-5247.exp b/pengine/test10/bug-cl-5247.exp index 5315360..a657e96 100644 --- a/pengine/test10/bug-cl-5247.exp +++ b/pengine/test10/bug-cl-5247.exp @@ -8,28 +8,28 @@ - + - + - + - + - + @@ -37,60 +37,60 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -103,28 +103,28 @@ - + - + - + - + - + @@ -132,60 +132,60 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -198,129 +198,129 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -329,60 +329,60 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -391,186 +391,186 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -578,124 +578,124 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -704,7 +704,7 @@ - + @@ -716,7 +716,7 @@ - + @@ -725,7 +725,7 @@ - + @@ -738,55 +738,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/bug-cl-5247.summary b/pengine/test10/bug-cl-5247.summary index dbb612c..3642fd1 100644 --- a/pengine/test10/bug-cl-5247.summary +++ b/pengine/test10/bug-cl-5247.summary @@ -47,10 +47,15 @@ Executing cluster transition: * Pseudo action: msPostgresql_confirmed-pre_notify_demote_0 * Pseudo action: msPostgresql_demote_0 * Pseudo action: stonith-pgsr02-off on pgsr02 - * Pseudo action: stonith_complete + * 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: pgsql_post_notify_stop_0 * Pseudo action: pgsql_demote_0 * Pseudo action: msPostgresql_demoted_0 + * Pseudo action: grpStonith1_running_0 + * Pseudo action: grpStonith2_running_0 * Pseudo action: msPostgresql_post_notify_demoted_0 * Resource action: pgsql notify on pgsr01 * Pseudo action: msPostgresql_confirmed-post_notify_demoted_0 @@ -75,13 +80,6 @@ Executing cluster transition: * 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: diff --git a/pengine/test10/bug-lf-1852.exp b/pengine/test10/bug-lf-1852.exp index 070c6db..61540ee 100644 --- a/pengine/test10/bug-lf-1852.exp +++ b/pengine/test10/bug-lf-1852.exp @@ -1,107 +1,107 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -109,28 +109,28 @@ - + - + - + - + - + diff --git a/pengine/test10/bug-lf-1920.exp b/pengine/test10/bug-lf-1920.exp index 27965ed..f4b43fc 100644 --- a/pengine/test10/bug-lf-1920.exp +++ b/pengine/test10/bug-lf-1920.exp @@ -1,7 +1,7 @@ - + diff --git a/pengine/test10/bug-lf-2106.dot b/pengine/test10/bug-lf-2106.dot index 9799892..10f868f 100644 --- a/pengine/test10/bug-lf-2106.dot +++ b/pengine/test10/bug-lf-2106.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "pingd:0_clear_failcount_0 cl-virt-1" [ style=bold color="green" fontcolor="black"] "pingd:0_clear_failcount_0 cl-virt-2" [ style=bold color="green" fontcolor="black"] "pingd:0_monitor_30000 cl-virt-1" [ style=bold color="green" fontcolor="black" ] @@ -10,11 +9,9 @@ digraph "g" { "pingd:0_start_0 cl-virt-2" -> "pingd:0_monitor_30000 cl-virt-2" [ style = bold] "pingd:0_start_0 cl-virt-2" -> "pingdclone_running_0" [ style = bold] "pingd:0_start_0 cl-virt-2" [ style=bold color="green" fontcolor="black"] -"pingd:0_stop_0 cl-virt-1" -> "all_stopped" [ style = bold] "pingd:0_stop_0 cl-virt-1" -> "pingd:0_start_0 cl-virt-1" [ style = bold] "pingd:0_stop_0 cl-virt-1" -> "pingdclone_stopped_0" [ style = bold] "pingd:0_stop_0 cl-virt-1" [ style=bold color="green" fontcolor="black" ] -"pingd:0_stop_0 cl-virt-2" -> "all_stopped" [ style = bold] "pingd:0_stop_0 cl-virt-2" -> "pingd:0_start_0 cl-virt-2" [ style = bold] "pingd:0_stop_0 cl-virt-2" -> "pingdclone_stopped_0" [ style = bold] "pingd:0_stop_0 cl-virt-2" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/bug-lf-2106.exp b/pengine/test10/bug-lf-2106.exp index 18b6673..9c07ed3 100644 --- a/pengine/test10/bug-lf-2106.exp +++ b/pengine/test10/bug-lf-2106.exp @@ -1,30 +1,30 @@ - + - + - + - + - + @@ -37,7 +37,7 @@ - + @@ -52,30 +52,30 @@ - + - + - + - + - + @@ -88,7 +88,7 @@ - + @@ -103,25 +103,25 @@ - + - + - + - + - + @@ -129,46 +129,31 @@ - + - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/bug-lf-2106.summary b/pengine/test10/bug-lf-2106.summary index 0c7c485..dc7d289 100644 --- a/pengine/test10/bug-lf-2106.summary +++ b/pengine/test10/bug-lf-2106.summary @@ -46,7 +46,6 @@ Executing cluster transition: * Resource action: pingd:0 stop on cl-virt-2 * Pseudo action: pingdclone_stopped_0 * Pseudo action: pingdclone_start_0 - * Pseudo action: all_stopped * Resource action: pingd:0 start on cl-virt-1 * Resource action: pingd:0 monitor=30000 on cl-virt-1 * Resource action: pingd:0 start on cl-virt-2 diff --git a/pengine/test10/bug-lf-2153.dot b/pengine/test10/bug-lf-2153.dot index ea03ac5..2d0d59a 100644 --- a/pengine/test10/bug-lf-2153.dot +++ b/pengine/test10/bug-lf-2153.dot @@ -1,10 +1,8 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "cl_tgtd_stop_0" -> "cl_tgtd_stopped_0" [ style = bold] "cl_tgtd_stop_0" -> "res_tgtd:0_stop_0 bob" [ style = bold] "cl_tgtd_stop_0" [ style=bold color="green" fontcolor="orange" ] "cl_tgtd_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"ms_drbd_iscsivg01_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "ms_drbd_iscsivg01_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_iscsivg01_confirmed-pre_notify_stop_0" -> "ms_drbd_iscsivg01_post_notify_stopped_0" [ style = bold] "ms_drbd_iscsivg01_confirmed-pre_notify_stop_0" -> "ms_drbd_iscsivg01_stop_0" [ style = bold] @@ -23,14 +21,12 @@ digraph "g" { "ms_drbd_iscsivg01_stopped_0" [ style=bold color="green" fontcolor="orange" ] "res_drbd_iscsivg01:0_pre_notify_stop_0 bob" -> "ms_drbd_iscsivg01_confirmed-pre_notify_stop_0" [ style = bold] "res_drbd_iscsivg01:0_pre_notify_stop_0 bob" [ style=bold color="green" fontcolor="black" ] -"res_drbd_iscsivg01:0_stop_0 bob" -> "all_stopped" [ style = bold] "res_drbd_iscsivg01:0_stop_0 bob" -> "ms_drbd_iscsivg01_stopped_0" [ style = bold] "res_drbd_iscsivg01:0_stop_0 bob" [ style=bold color="green" fontcolor="black" ] "res_drbd_iscsivg01:1_post_notify_stop_0 alice" -> "ms_drbd_iscsivg01_confirmed-post_notify_stopped_0" [ style = bold] "res_drbd_iscsivg01:1_post_notify_stop_0 alice" [ style=bold color="green" fontcolor="black" ] "res_drbd_iscsivg01:1_pre_notify_stop_0 alice" -> "ms_drbd_iscsivg01_confirmed-pre_notify_stop_0" [ style = bold] "res_drbd_iscsivg01:1_pre_notify_stop_0 alice" [ style=bold color="green" fontcolor="black" ] -"res_tgtd:0_stop_0 bob" -> "all_stopped" [ style = bold] "res_tgtd:0_stop_0 bob" -> "cl_tgtd_stopped_0" [ style = bold] "res_tgtd:0_stop_0 bob" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/bug-lf-2153.exp b/pengine/test10/bug-lf-2153.exp index 6b8713c..c9dec7a 100644 --- a/pengine/test10/bug-lf-2153.exp +++ b/pengine/test10/bug-lf-2153.exp @@ -1,107 +1,107 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -109,84 +109,65 @@ - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/bug-lf-2153.summary b/pengine/test10/bug-lf-2153.summary index 01567b5..d4c28fd 100644 --- a/pengine/test10/bug-lf-2153.summary +++ b/pengine/test10/bug-lf-2153.summary @@ -35,7 +35,6 @@ Executing cluster transition: * Pseudo action: ms_drbd_iscsivg01_post_notify_stopped_0 * Resource action: res_drbd_iscsivg01:1 notify on alice * Pseudo action: ms_drbd_iscsivg01_confirmed-post_notify_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Node bob (9a4cafd3-fcfc-4de9-9440-10bc8822d9af): standby diff --git a/pengine/test10/bug-lf-2160.exp b/pengine/test10/bug-lf-2160.exp index 1a69082..fc36e0d 100644 --- a/pengine/test10/bug-lf-2160.exp +++ b/pengine/test10/bug-lf-2160.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/pengine/test10/bug-lf-2171.dot b/pengine/test10/bug-lf-2171.dot index 0a84af4..2f76d0c 100644 --- a/pengine/test10/bug-lf-2171.dot +++ b/pengine/test10/bug-lf-2171.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "cl_res_Dummy1_stop_0" -> "cl_res_Dummy1_stopped_0" [ style = bold] "cl_res_Dummy1_stop_0" -> "res_Dummy1:0_stop_0 xenserver2" [ style = bold] "cl_res_Dummy1_stop_0" -> "res_Dummy1:1_stop_0 xenserver1" [ style = bold] @@ -17,17 +16,14 @@ digraph "g" { "gr_Dummy_stopped_0" -> "cl_res_Dummy1_stop_0" [ style = bold] "gr_Dummy_stopped_0" -> "gr_Dummy_start_0" [ style = dashed] "gr_Dummy_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"res_Dummy1:0_stop_0 xenserver2" -> "all_stopped" [ style = bold] "res_Dummy1:0_stop_0 xenserver2" -> "cl_res_Dummy1_stopped_0" [ style = bold] "res_Dummy1:0_stop_0 xenserver2" [ style=bold color="green" fontcolor="black" ] -"res_Dummy1:1_stop_0 xenserver1" -> "all_stopped" [ style = bold] "res_Dummy1:1_stop_0 xenserver1" -> "cl_res_Dummy1_stopped_0" [ style = bold] "res_Dummy1:1_stop_0 xenserver1" [ style=bold color="green" fontcolor="black" ] "res_Dummy2_monitor_10000 xenserver1" [ style=dashed color="red" fontcolor="black" ] "res_Dummy2_start_0 xenserver1" -> "gr_Dummy_running_0" [ style = dashed] "res_Dummy2_start_0 xenserver1" -> "res_Dummy2_monitor_10000 xenserver1" [ style = dashed] "res_Dummy2_start_0 xenserver1" [ style=dashed color="red" fontcolor="black" ] -"res_Dummy2_stop_0 xenserver1" -> "all_stopped" [ style = bold] "res_Dummy2_stop_0 xenserver1" -> "gr_Dummy_stopped_0" [ style = bold] "res_Dummy2_stop_0 xenserver1" -> "res_Dummy2_start_0 xenserver1" [ style = dashed] "res_Dummy2_stop_0 xenserver1" [ style=bold color="green" fontcolor="black" ] @@ -35,7 +31,6 @@ digraph "g" { "res_Dummy3_start_0 xenserver1" -> "gr_Dummy_running_0" [ style = dashed] "res_Dummy3_start_0 xenserver1" -> "res_Dummy3_monitor_10000 xenserver1" [ style = dashed] "res_Dummy3_start_0 xenserver1" [ style=dashed color="red" fontcolor="black" ] -"res_Dummy3_stop_0 xenserver1" -> "all_stopped" [ style = bold] "res_Dummy3_stop_0 xenserver1" -> "gr_Dummy_stopped_0" [ style = bold] "res_Dummy3_stop_0 xenserver1" -> "res_Dummy3_start_0 xenserver1" [ style = dashed] "res_Dummy3_stop_0 xenserver1" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/bug-lf-2171.exp b/pengine/test10/bug-lf-2171.exp index 8679088..9cc6704 100644 --- a/pengine/test10/bug-lf-2171.exp +++ b/pengine/test10/bug-lf-2171.exp @@ -1,81 +1,81 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -83,48 +83,27 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/bug-lf-2171.summary b/pengine/test10/bug-lf-2171.summary index 41a7b94..23b1178 100644 --- a/pengine/test10/bug-lf-2171.summary +++ b/pengine/test10/bug-lf-2171.summary @@ -24,7 +24,6 @@ Executing cluster transition: * Resource action: res_Dummy1:1 stop on xenserver1 * Resource action: res_Dummy1:0 stop on xenserver2 * Pseudo action: cl_res_Dummy1_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ xenserver1 xenserver2 ] diff --git a/pengine/test10/bug-lf-2213.exp b/pengine/test10/bug-lf-2213.exp index 5a6a311..4f5266f 100644 --- a/pengine/test10/bug-lf-2213.exp +++ b/pengine/test10/bug-lf-2213.exp @@ -1,105 +1,105 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/bug-lf-2317.exp b/pengine/test10/bug-lf-2317.exp index a50bce3..c9d6817 100644 --- a/pengine/test10/bug-lf-2317.exp +++ b/pengine/test10/bug-lf-2317.exp @@ -1,75 +1,75 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -79,7 +79,7 @@ - + @@ -94,58 +94,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -153,25 +153,25 @@ - + - + - + - + diff --git a/pengine/test10/bug-lf-2358.exp b/pengine/test10/bug-lf-2358.exp index adbcac0..17be4b5 100644 --- a/pengine/test10/bug-lf-2358.exp +++ b/pengine/test10/bug-lf-2358.exp @@ -1,107 +1,107 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -109,28 +109,28 @@ - + - + - + - + - + diff --git a/pengine/test10/bug-lf-2361.exp b/pengine/test10/bug-lf-2361.exp index dd909bd..8f2613d 100644 --- a/pengine/test10/bug-lf-2361.exp +++ b/pengine/test10/bug-lf-2361.exp @@ -1,104 +1,104 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -106,37 +106,37 @@ - + - + - + - + - + - + - + @@ -145,7 +145,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -172,7 +172,7 @@ - + diff --git a/pengine/test10/bug-lf-2422.dot b/pengine/test10/bug-lf-2422.dot index b331e41..420bf28 100644 --- a/pengine/test10/bug-lf-2422.dot +++ b/pengine/test10/bug-lf-2422.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "c-o2stage_stop_0" -> "c-o2stage_stopped_0" [ style = bold] "c-o2stage_stop_0" -> "o2stage:0_stop_0" [ style = bold] "c-o2stage_stop_0" -> "o2stage:1_stop_0" [ style = bold] @@ -15,32 +14,24 @@ digraph "g" { "c-ocfs_stop_0" [ style=bold color="green" fontcolor="orange" ] "c-ocfs_stopped_0" -> "c-o2stage_stop_0" [ style = bold] "c-ocfs_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"cmirror:0_stop_0 qa-suse-4" -> "all_stopped" [ style = bold] "cmirror:0_stop_0 qa-suse-4" -> "o2cb:0_stop_0 qa-suse-4" [ style = bold] "cmirror:0_stop_0 qa-suse-4" -> "o2stage:1_stopped_0" [ style = bold] "cmirror:0_stop_0 qa-suse-4" [ style=bold color="green" fontcolor="black" ] -"cmirror:1_stop_0 qa-suse-1" -> "all_stopped" [ style = bold] "cmirror:1_stop_0 qa-suse-1" -> "o2cb:1_stop_0 qa-suse-1" [ style = bold] "cmirror:1_stop_0 qa-suse-1" -> "o2stage:0_stopped_0" [ style = bold] "cmirror:1_stop_0 qa-suse-1" [ style=bold color="green" fontcolor="black" ] -"cmirror:2_stop_0 qa-suse-3" -> "all_stopped" [ style = bold] "cmirror:2_stop_0 qa-suse-3" -> "o2cb:2_stop_0 qa-suse-3" [ style = bold] "cmirror:2_stop_0 qa-suse-3" -> "o2stage:2_stopped_0" [ style = bold] "cmirror:2_stop_0 qa-suse-3" [ style=bold color="green" fontcolor="black" ] -"cmirror:3_stop_0 qa-suse-2" -> "all_stopped" [ style = bold] "cmirror:3_stop_0 qa-suse-2" -> "o2cb:3_stop_0 qa-suse-2" [ style = bold] "cmirror:3_stop_0 qa-suse-2" -> "o2stage:3_stopped_0" [ style = bold] "cmirror:3_stop_0 qa-suse-2" [ style=bold color="green" fontcolor="black" ] -"o2cb:0_stop_0 qa-suse-4" -> "all_stopped" [ style = bold] "o2cb:0_stop_0 qa-suse-4" -> "o2stage:1_stopped_0" [ style = bold] "o2cb:0_stop_0 qa-suse-4" [ style=bold color="green" fontcolor="black" ] -"o2cb:1_stop_0 qa-suse-1" -> "all_stopped" [ style = bold] "o2cb:1_stop_0 qa-suse-1" -> "o2stage:0_stopped_0" [ style = bold] "o2cb:1_stop_0 qa-suse-1" [ style=bold color="green" fontcolor="black" ] -"o2cb:2_stop_0 qa-suse-3" -> "all_stopped" [ style = bold] "o2cb:2_stop_0 qa-suse-3" -> "o2stage:2_stopped_0" [ style = bold] "o2cb:2_stop_0 qa-suse-3" [ style=bold color="green" fontcolor="black" ] -"o2cb:3_stop_0 qa-suse-2" -> "all_stopped" [ style = bold] "o2cb:3_stop_0 qa-suse-2" -> "o2stage:3_stopped_0" [ style = bold] "o2cb:3_stop_0 qa-suse-2" [ style=bold color="green" fontcolor="black" ] "o2stage:0_stop_0" -> "cmirror:1_stop_0 qa-suse-1" [ style = bold] @@ -67,21 +58,17 @@ digraph "g" { "o2stage:3_stop_0" [ style=bold color="green" fontcolor="orange" ] "o2stage:3_stopped_0" -> "c-o2stage_stopped_0" [ style = bold] "o2stage:3_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"ocfs:0_stop_0 qa-suse-4" -> "all_stopped" [ style = bold] "ocfs:0_stop_0 qa-suse-4" -> "c-ocfs_stopped_0" [ style = bold] "ocfs:0_stop_0 qa-suse-4" -> "o2stage:1_stop_0" [ style = bold] "ocfs:0_stop_0 qa-suse-4" -> "ocfs:1_stop_0 qa-suse-1" [ style = bold] "ocfs:0_stop_0 qa-suse-4" [ style=bold color="green" fontcolor="black" ] -"ocfs:1_stop_0 qa-suse-1" -> "all_stopped" [ style = bold] "ocfs:1_stop_0 qa-suse-1" -> "c-ocfs_stopped_0" [ style = bold] "ocfs:1_stop_0 qa-suse-1" -> "o2stage:0_stop_0" [ style = bold] "ocfs:1_stop_0 qa-suse-1" [ style=bold color="green" fontcolor="black" ] -"ocfs:2_stop_0 qa-suse-3" -> "all_stopped" [ style = bold] "ocfs:2_stop_0 qa-suse-3" -> "c-ocfs_stopped_0" [ style = bold] "ocfs:2_stop_0 qa-suse-3" -> "o2stage:2_stop_0" [ style = bold] "ocfs:2_stop_0 qa-suse-3" -> "ocfs:0_stop_0 qa-suse-4" [ style = bold] "ocfs:2_stop_0 qa-suse-3" [ style=bold color="green" fontcolor="black" ] -"ocfs:3_stop_0 qa-suse-2" -> "all_stopped" [ style = bold] "ocfs:3_stop_0 qa-suse-2" -> "c-ocfs_stopped_0" [ style = bold] "ocfs:3_stop_0 qa-suse-2" -> "o2stage:3_stop_0" [ style = bold] "ocfs:3_stop_0 qa-suse-2" -> "ocfs:2_stop_0 qa-suse-3" [ style = bold] diff --git a/pengine/test10/bug-lf-2422.exp b/pengine/test10/bug-lf-2422.exp index 14eba30..212493e 100644 --- a/pengine/test10/bug-lf-2422.exp +++ b/pengine/test10/bug-lf-2422.exp @@ -10,425 +10,379 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/bug-lf-2422.summary b/pengine/test10/bug-lf-2422.summary index 5e22e67..a629e43 100644 --- a/pengine/test10/bug-lf-2422.summary +++ b/pengine/test10/bug-lf-2422.summary @@ -44,7 +44,6 @@ Executing cluster transition: * Resource action: o2cb:0 stop on qa-suse-4 * Resource action: o2cb:2 stop on qa-suse-3 * Resource action: o2cb:3 stop on qa-suse-2 - * Pseudo action: all_stopped * Pseudo action: o2stage:0_stopped_0 * Pseudo action: o2stage:1_stopped_0 * Pseudo action: o2stage:2_stopped_0 diff --git a/pengine/test10/bug-lf-2435.dot b/pengine/test10/bug-lf-2435.dot index 39a5d19..0407439 100644 --- a/pengine/test10/bug-lf-2435.dot +++ b/pengine/test10/bug-lf-2435.dot @@ -1,10 +1,7 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "dummy2_start_0 c21.chepkov.lan" [ style=bold color="green" fontcolor="black" ] -"dummy2_stop_0 c20.chepkov.lan" -> "all_stopped" [ style = bold] "dummy2_stop_0 c20.chepkov.lan" -> "dummy2_start_0 c21.chepkov.lan" [ style = bold] "dummy2_stop_0 c20.chepkov.lan" [ style=bold color="green" fontcolor="black" ] -"dummy3_stop_0 c21.chepkov.lan" -> "all_stopped" [ style = bold] "dummy3_stop_0 c21.chepkov.lan" -> "dummy2_start_0 c21.chepkov.lan" [ style = bold] "dummy3_stop_0 c21.chepkov.lan" [ style=bold color="green" fontcolor="black" ] "dummy4_monitor_0 c19.chepkov.lan" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/bug-lf-2435.exp b/pengine/test10/bug-lf-2435.exp index 4349312..387d266 100644 --- a/pengine/test10/bug-lf-2435.exp +++ b/pengine/test10/bug-lf-2435.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -53,27 +53,11 @@ - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/bug-lf-2435.summary b/pengine/test10/bug-lf-2435.summary index 3d75500..e34aa35 100644 --- a/pengine/test10/bug-lf-2435.summary +++ b/pengine/test10/bug-lf-2435.summary @@ -18,7 +18,6 @@ Executing cluster transition: * Resource action: dummy4 monitor on c20.chepkov.lan * Resource action: dummy4 monitor on c19.chepkov.lan * Resource action: dummy3 stop on c21.chepkov.lan - * Pseudo action: all_stopped * Resource action: dummy2 start on c21.chepkov.lan Revised cluster status: diff --git a/pengine/test10/bug-lf-2445.dot b/pengine/test10/bug-lf-2445.dot index 78b9856..c4c0b35 100644 --- a/pengine/test10/bug-lf-2445.dot +++ b/pengine/test10/bug-lf-2445.dot @@ -12,7 +12,5 @@ digraph "g" { "P:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] "P:1_stop_0 node1" -> "C_stopped_0" [ style = bold] "P:1_stop_0 node1" -> "P:1_start_0 node2" [ style = bold] -"P:1_stop_0 node1" -> "all_stopped" [ style = bold] "P:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/bug-lf-2445.exp b/pengine/test10/bug-lf-2445.exp index 953b32d..57f0b47 100644 --- a/pengine/test10/bug-lf-2445.exp +++ b/pengine/test10/bug-lf-2445.exp @@ -1,51 +1,51 @@ - + - + - + - + - + - + - + - + - + @@ -53,40 +53,28 @@ - + - + - + - + - - - - - - - - - - - - - + diff --git a/pengine/test10/bug-lf-2445.summary b/pengine/test10/bug-lf-2445.summary index 12f5031..6e59b91 100644 --- a/pengine/test10/bug-lf-2445.summary +++ b/pengine/test10/bug-lf-2445.summary @@ -14,7 +14,6 @@ Executing cluster transition: * Resource action: P:1 stop on node1 * Pseudo action: C_stopped_0 * Pseudo action: C_start_0 - * Pseudo action: all_stopped * Resource action: P:1 start on node2 * Pseudo action: C_running_0 diff --git a/pengine/test10/bug-lf-2453.dot b/pengine/test10/bug-lf-2453.dot index b6fbcbe..f640fae 100644 --- a/pengine/test10/bug-lf-2453.dot +++ b/pengine/test10/bug-lf-2453.dot @@ -23,7 +23,6 @@ digraph "g" { "DummyResource:0_start_0 domu2" [ style=dashed color="red" fontcolor="black" ] "DummyResource:0_stop_0 domu2" -> "CloneResource2_stopped_0" [ style = bold] "DummyResource:0_stop_0 domu2" -> "DummyResource:0_start_0 domu2" [ style = dashed] -"DummyResource:0_stop_0 domu2" -> "all_stopped" [ style = bold] "DummyResource:0_stop_0 domu2" [ style=bold color="green" fontcolor="black" ] "DummyResource:1_monitor_10000 domu1" [ style=dashed color="red" fontcolor="black" ] "DummyResource:1_start_0 domu1" -> "CloneResource2_running_0" [ style = dashed] @@ -31,20 +30,15 @@ digraph "g" { "DummyResource:1_start_0 domu1" [ style=dashed color="red" fontcolor="black" ] "DummyResource:1_stop_0 domu1" -> "CloneResource2_stopped_0" [ style = bold] "DummyResource:1_stop_0 domu1" -> "DummyResource:1_start_0 domu1" [ style = dashed] -"DummyResource:1_stop_0 domu1" -> "all_stopped" [ style = bold] "DummyResource:1_stop_0 domu1" [ style=bold color="green" fontcolor="black" ] "PrimitiveResource1_monitor_10000 domu1" [ style=dashed color="red" fontcolor="black" ] "PrimitiveResource1_start_0 domu1" -> "PrimitiveResource1_monitor_10000 domu1" [ style = dashed] "PrimitiveResource1_start_0 domu1" [ style=dashed color="red" fontcolor="black" ] "PrimitiveResource1_stop_0 domu1" -> "CloneResource2_stop_0" [ style = bold] "PrimitiveResource1_stop_0 domu1" -> "PrimitiveResource1_start_0 domu1" [ style = dashed] -"PrimitiveResource1_stop_0 domu1" -> "all_stopped" [ style = bold] "PrimitiveResource1_stop_0 domu1" [ style=bold color="green" fontcolor="black" ] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "apache:0_stop_0 domu2" -> "CloneResource1_stopped_0" [ style = bold] -"apache:0_stop_0 domu2" -> "all_stopped" [ style = bold] "apache:0_stop_0 domu2" [ style=bold color="green" fontcolor="black" ] "apache:1_stop_0 domu1" -> "CloneResource1_stopped_0" [ style = bold] -"apache:1_stop_0 domu1" -> "all_stopped" [ style = bold] "apache:1_stop_0 domu1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/bug-lf-2453.exp b/pengine/test10/bug-lf-2453.exp index c4dd2b2..c10c8c1 100644 --- a/pengine/test10/bug-lf-2453.exp +++ b/pengine/test10/bug-lf-2453.exp @@ -1,7 +1,7 @@ - + @@ -10,137 +10,113 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/bug-lf-2453.summary b/pengine/test10/bug-lf-2453.summary index f038cbb..602c2c5 100644 --- a/pengine/test10/bug-lf-2453.summary +++ b/pengine/test10/bug-lf-2453.summary @@ -26,7 +26,6 @@ Executing cluster transition: * Resource action: apache:1 stop on domu1 * Resource action: apache:0 stop on domu2 * Pseudo action: CloneResource1_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ domu1 domu2 ] diff --git a/pengine/test10/bug-lf-2474.exp b/pengine/test10/bug-lf-2474.exp index 8eca0af..fe194c9 100644 --- a/pengine/test10/bug-lf-2474.exp +++ b/pengine/test10/bug-lf-2474.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/pengine/test10/bug-lf-2493.exp b/pengine/test10/bug-lf-2493.exp index 19c162a..e87a58d 100644 --- a/pengine/test10/bug-lf-2493.exp +++ b/pengine/test10/bug-lf-2493.exp @@ -1,7 +1,7 @@ - + @@ -10,23 +10,23 @@ - + - + - + - + @@ -35,7 +35,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -71,7 +71,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -98,7 +98,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -134,7 +134,7 @@ - + @@ -143,7 +143,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -170,7 +170,7 @@ - + @@ -179,7 +179,7 @@ - + @@ -188,7 +188,7 @@ - + @@ -197,7 +197,7 @@ - + @@ -206,7 +206,7 @@ - + @@ -215,7 +215,7 @@ - + @@ -224,7 +224,7 @@ - + @@ -233,7 +233,7 @@ - + @@ -242,7 +242,7 @@ - + @@ -251,7 +251,7 @@ - + @@ -260,7 +260,7 @@ - + @@ -269,7 +269,7 @@ - + @@ -278,7 +278,7 @@ - + @@ -287,7 +287,7 @@ - + @@ -296,7 +296,7 @@ - + @@ -305,7 +305,7 @@ - + diff --git a/pengine/test10/bug-lf-2508.dot b/pengine/test10/bug-lf-2508.dot index 6e88af5..ecc5dd0 100644 --- a/pengine/test10/bug-lf-2508.dot +++ b/pengine/test10/bug-lf-2508.dot @@ -9,7 +9,6 @@ digraph "g" { "Dummy02_start_0 srv04" [ style=bold color="green" fontcolor="black" ] "Dummy02_stop_0 srv02" -> "Dummy02_start_0 srv04" [ style = bold] "Dummy02_stop_0 srv02" -> "Group02_stopped_0" [ style = bold] -"Dummy02_stop_0 srv02" -> "all_stopped" [ style = bold] "Dummy02_stop_0 srv02" [ style=bold color="green" fontcolor="orange" ] "Group01_running_0" [ style=bold color="green" fontcolor="orange" ] "Group01_start_0" -> "Dummy01_start_0 srv01" [ style = bold] @@ -24,8 +23,6 @@ digraph "g" { "Group02_stop_0" [ style=bold color="green" fontcolor="orange" ] "Group02_stopped_0" -> "Group02_start_0" [ style = bold] "Group02_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"all_stopped" -> "prmStonith3-3:1_start_0 srv01" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "clnStonith1_stop_0" -> "clnStonith1_stopped_0" [ style = bold] "clnStonith1_stop_0" -> "grpStonith1:1_stop_0" [ style = bold] "clnStonith1_stop_0" [ style=bold color="green" fontcolor="orange" ] @@ -66,32 +63,28 @@ digraph "g" { "grpStonith4:1_stop_0" [ style=bold color="green" fontcolor="orange"] "grpStonith4:1_stopped_0" -> "clnStonith4_stopped_0" [ style = bold] "grpStonith4:1_stopped_0" [ style=bold color="green" fontcolor="orange"] -"prmStonith1-1:1_stop_0 srv02" -> "all_stopped" [ style = bold] "prmStonith1-1:1_stop_0 srv02" -> "grpStonith1:1_stopped_0" [ style = bold] "prmStonith1-1:1_stop_0 srv02" [ style=bold color="green" fontcolor="orange" ] -"prmStonith1-3:1_stop_0 srv02" -> "all_stopped" [ style = bold] "prmStonith1-3:1_stop_0 srv02" -> "grpStonith1:1_stopped_0" [ style = bold] "prmStonith1-3:1_stop_0 srv02" -> "prmStonith1-1:1_stop_0 srv02" [ style = bold] "prmStonith1-3:1_stop_0 srv02" [ style=bold color="green" fontcolor="orange" ] "prmStonith3-1:1_monitor_3600000 srv01" [ style=bold color="green" fontcolor="black" ] -"prmStonith3-1:1_stop_0 srv02" -> "all_stopped" [ style = bold] "prmStonith3-1:1_stop_0 srv02" -> "grpStonith3:0_stopped_0" [ style = bold] "prmStonith3-1:1_stop_0 srv02" [ style=bold color="green" fontcolor="orange"] "prmStonith3-3:1_monitor_3600000 srv01" [ style=bold color="green" fontcolor="black"] "prmStonith3-3:1_start_0 srv01" -> "grpStonith3:1_running_0" [ style = bold] "prmStonith3-3:1_start_0 srv01" -> "prmStonith3-3:1_monitor_3600000 srv01" [ style = bold] "prmStonith3-3:1_start_0 srv01" [ style=bold color="green" fontcolor="black"] -"prmStonith3-3:1_stop_0 srv02" -> "all_stopped" [ style = bold] "prmStonith3-3:1_stop_0 srv02" -> "grpStonith3:0_stopped_0" [ style = bold] "prmStonith3-3:1_stop_0 srv02" -> "prmStonith3-1:1_stop_0 srv02" [ style = bold] "prmStonith3-3:1_stop_0 srv02" [ style=bold color="green" fontcolor="orange"] -"prmStonith4-1:1_stop_0 srv02" -> "all_stopped" [ style = bold] "prmStonith4-1:1_stop_0 srv02" -> "grpStonith4:1_stopped_0" [ style = bold] "prmStonith4-1:1_stop_0 srv02" [ style=bold color="green" fontcolor="orange"] -"prmStonith4-3:1_stop_0 srv02" -> "all_stopped" [ style = bold] "prmStonith4-3:1_stop_0 srv02" -> "grpStonith4:1_stopped_0" [ style = bold] "prmStonith4-3:1_stop_0 srv02" -> "prmStonith4-1:1_stop_0 srv02" [ style = bold] "prmStonith4-3:1_stop_0 srv02" [ style=bold color="green" fontcolor="orange"] +"stonith 'reboot' srv02" -> "Dummy01_start_0 srv01" [ style = bold] +"stonith 'reboot' srv02" -> "Dummy02_start_0 srv04" [ style = bold] "stonith 'reboot' srv02" -> "Dummy02_stop_0 srv02" [ style = bold] "stonith 'reboot' srv02" -> "Group02_stop_0" [ style = bold] "stonith 'reboot' srv02" -> "clnStonith1_stop_0" [ style = bold] @@ -100,13 +93,9 @@ digraph "g" { "stonith 'reboot' srv02" -> "prmStonith1-1:1_stop_0 srv02" [ style = bold] "stonith 'reboot' srv02" -> "prmStonith1-3:1_stop_0 srv02" [ style = bold] "stonith 'reboot' srv02" -> "prmStonith3-1:1_stop_0 srv02" [ style = bold] +"stonith 'reboot' srv02" -> "prmStonith3-3:1_start_0 srv01" [ style = bold] "stonith 'reboot' srv02" -> "prmStonith3-3:1_stop_0 srv02" [ style = bold] "stonith 'reboot' srv02" -> "prmStonith4-1:1_stop_0 srv02" [ style = bold] "stonith 'reboot' srv02" -> "prmStonith4-3:1_stop_0 srv02" [ style = bold] -"stonith 'reboot' srv02" -> "stonith_complete" [ style = bold] "stonith 'reboot' srv02" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "Dummy01_start_0 srv01" [ style = bold] -"stonith_complete" -> "Dummy02_start_0 srv04" [ style = bold] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/bug-lf-2508.exp b/pengine/test10/bug-lf-2508.exp index 925afbc..abeb272 100644 --- a/pengine/test10/bug-lf-2508.exp +++ b/pengine/test10/bug-lf-2508.exp @@ -1,22 +1,22 @@ - + - + - + - + @@ -24,51 +24,51 @@ - + - + - + - + - + - + - + - + - + @@ -80,66 +80,66 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -148,43 +148,43 @@ - + - + - + - + - + - + - + - + @@ -193,16 +193,16 @@ - + - + - + @@ -211,28 +211,28 @@ - + - + - + - + - + @@ -244,37 +244,37 @@ - + - + - + - + - + - + - + @@ -283,16 +283,16 @@ - + - + - + @@ -301,40 +301,40 @@ - + - + - + - + - + - + - + @@ -343,51 +343,51 @@ - + - + - + - + - + - + - + - + - + @@ -399,64 +399,64 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -465,16 +465,16 @@ - + - + - + @@ -483,28 +483,28 @@ - + - + - + - + - + @@ -516,51 +516,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/bug-lf-2508.summary b/pengine/test10/bug-lf-2508.summary index d4e548a..dd9c7ec 100644 --- a/pengine/test10/bug-lf-2508.summary +++ b/pengine/test10/bug-lf-2508.summary @@ -50,13 +50,14 @@ Executing cluster transition: * Pseudo action: Group01_start_0 * Resource action: prmStonith3-1:1 monitor=3600000 on srv01 * Fencing srv02 (reboot) + * Resource action: Dummy01 start on srv01 * Pseudo action: Group02_stop_0 * Pseudo action: Dummy02_stop_0 * Pseudo action: clnStonith1_stop_0 * Pseudo action: clnStonith3_stop_0 * Pseudo action: clnStonith4_stop_0 - * Pseudo action: stonith_complete - * Resource action: Dummy01 start on srv01 + * Pseudo action: Group01_running_0 + * Resource action: Dummy01 monitor=10000 on srv01 * Pseudo action: Group02_stopped_0 * Pseudo action: Group02_start_0 * Resource action: Dummy02 start on srv04 @@ -66,14 +67,11 @@ Executing cluster transition: * Pseudo action: prmStonith3-3:1_stop_0 * Pseudo action: grpStonith4:1_stop_0 * Pseudo action: prmStonith4-3:1_stop_0 - * Pseudo action: Group01_running_0 - * Resource action: Dummy01 monitor=10000 on srv01 * Pseudo action: Group02_running_0 * Resource action: Dummy02 monitor=10000 on srv04 * Pseudo action: prmStonith1-1:1_stop_0 * Pseudo action: prmStonith3-1:1_stop_0 * Pseudo action: prmStonith4-1:1_stop_0 - * Pseudo action: all_stopped * Pseudo action: grpStonith1:1_stopped_0 * Pseudo action: clnStonith1_stopped_0 * Pseudo action: grpStonith3:0_stopped_0 diff --git a/pengine/test10/bug-lf-2544.exp b/pengine/test10/bug-lf-2544.exp index 64cd62a..6e6464d 100644 --- a/pengine/test10/bug-lf-2544.exp +++ b/pengine/test10/bug-lf-2544.exp @@ -1,32 +1,32 @@ - + - + - + - + - + diff --git a/pengine/test10/bug-lf-2551.dot b/pengine/test10/bug-lf-2551.dot index 18bca44..599e5c7 100644 --- a/pengine/test10/bug-lf-2551.dot +++ b/pengine/test10/bug-lf-2551.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "base-clone_stop_0" -> "base-clone_stopped_0" [ style = bold] "base-clone_stop_0" -> "base-group:3_stop_0" [ style = bold] "base-clone_stop_0" [ style=bold color="green" fontcolor="orange" ] @@ -14,15 +13,12 @@ digraph "g" { "base-group:3_stop_0" [ style=bold color="green" fontcolor="orange" ] "base-group:3_stopped_0" -> "base-clone_stopped_0" [ style = bold] "base-group:3_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"clvm:3_stop_0 hex-9" -> "all_stopped" [ style = bold] "clvm:3_stop_0 hex-9" -> "base-group:3_stopped_0" [ style = bold] "clvm:3_stop_0 hex-9" -> "o2cb:3_stop_0 hex-9" [ style = bold] "clvm:3_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] -"cmirrord:3_stop_0 hex-9" -> "all_stopped" [ style = bold] "cmirrord:3_stop_0 hex-9" -> "base-group:3_stopped_0" [ style = bold] "cmirrord:3_stop_0 hex-9" -> "clvm:3_stop_0 hex-9" [ style = bold] "cmirrord:3_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] -"dlm:3_stop_0 hex-9" -> "all_stopped" [ style = bold] "dlm:3_stop_0 hex-9" -> "base-group:3_stopped_0" [ style = bold] "dlm:3_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] "dummy1_monitor_30000 hex-0" [ style=bold color="green" fontcolor="black" ] @@ -31,23 +27,19 @@ digraph "g" { "dummy1_monitor_300000 hex-9" [ style=dashed color="red" fontcolor="black" ] "dummy1_start_0 hex-0" -> "dummy1_monitor_30000 hex-0" [ style = bold] "dummy1_start_0 hex-0" [ style=bold color="green" fontcolor="black" ] -"dummy1_stop_0 hex-9" -> "all_stopped" [ style = bold] "dummy1_stop_0 hex-9" -> "dummy1_monitor_300000 hex-9" [ style = dashed] "dummy1_stop_0 hex-9" -> "dummy1_start_0 hex-0" [ style = bold] "dummy1_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] "fencing-sbd_start_0 hex-0" [ style=bold color="green" fontcolor="black" ] -"fencing-sbd_stop_0 hex-9" -> "all_stopped" [ style = bold] "fencing-sbd_stop_0 hex-9" -> "fencing-sbd_start_0 hex-0" [ style = bold] "fencing-sbd_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] "load_stopped_hex-0 hex-0" [ style=bold color="green" fontcolor="orange" ] "load_stopped_hex-7 hex-7" [ style=bold color="green" fontcolor="orange" ] "load_stopped_hex-8 hex-8" [ style=bold color="green" fontcolor="orange" ] "load_stopped_hex-9 hex-9" [ style=bold color="green" fontcolor="orange" ] -"o2cb:3_stop_0 hex-9" -> "all_stopped" [ style = bold] "o2cb:3_stop_0 hex-9" -> "base-group:3_stopped_0" [ style = bold] "o2cb:3_stop_0 hex-9" -> "dlm:3_stop_0 hex-9" [ style = bold] "o2cb:3_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] -"ocfs2-1:3_stop_0 hex-9" -> "all_stopped" [ style = bold] "ocfs2-1:3_stop_0 hex-9" -> "base-group:3_stopped_0" [ style = bold] "ocfs2-1:3_stop_0 hex-9" -> "vg1:3_stop_0 hex-9" [ style = bold] "ocfs2-1:3_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] @@ -55,10 +47,10 @@ digraph "g" { "stonith 'reboot' hex-9" -> "clvm:3_stop_0 hex-9" [ style = bold] "stonith 'reboot' hex-9" -> "cmirrord:3_stop_0 hex-9" [ style = bold] "stonith 'reboot' hex-9" -> "dlm:3_stop_0 hex-9" [ style = bold] +"stonith 'reboot' hex-9" -> "dummy1_start_0 hex-0" [ style = bold] "stonith 'reboot' hex-9" -> "dummy1_stop_0 hex-9" [ style = bold] "stonith 'reboot' hex-9" -> "o2cb:3_stop_0 hex-9" [ style = bold] "stonith 'reboot' hex-9" -> "ocfs2-1:3_stop_0 hex-9" [ style = bold] -"stonith 'reboot' hex-9" -> "stonith_complete" [ style = bold] "stonith 'reboot' hex-9" -> "vg1:3_stop_0 hex-9" [ style = bold] "stonith 'reboot' hex-9" -> "vm-03_stop_0 hex-9" [ style = bold] "stonith 'reboot' hex-9" -> "vm-06_stop_0 hex-9" [ style = bold] @@ -77,74 +69,54 @@ digraph "g" { "stonith 'reboot' hex-9" -> "vm-57_stop_0 hex-9" [ style = bold] "stonith 'reboot' hex-9" -> "vm-61_stop_0 hex-9" [ style = bold] "stonith 'reboot' hex-9" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "dummy1_start_0 hex-0" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] -"vg1:3_stop_0 hex-9" -> "all_stopped" [ style = bold] "vg1:3_stop_0 hex-9" -> "base-group:3_stopped_0" [ style = bold] "vg1:3_stop_0 hex-9" -> "cmirrord:3_stop_0 hex-9" [ style = bold] "vg1:3_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] -"vm-03_stop_0 hex-9" -> "all_stopped" [ style = bold] "vm-03_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold] "vm-03_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold] "vm-03_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] -"vm-06_stop_0 hex-9" -> "all_stopped" [ style = bold] "vm-06_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold] "vm-06_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold] "vm-06_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] -"vm-09_stop_0 hex-9" -> "all_stopped" [ style = bold] "vm-09_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold] "vm-09_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold] "vm-09_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] -"vm-13_stop_0 hex-9" -> "all_stopped" [ style = bold] "vm-13_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold] "vm-13_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold] "vm-13_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] -"vm-17_stop_0 hex-9" -> "all_stopped" [ style = bold] "vm-17_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold] "vm-17_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold] "vm-17_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] -"vm-21_stop_0 hex-9" -> "all_stopped" [ style = bold] "vm-21_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold] "vm-21_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold] "vm-21_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] -"vm-25_stop_0 hex-9" -> "all_stopped" [ style = bold] "vm-25_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold] "vm-25_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold] "vm-25_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] -"vm-29_stop_0 hex-9" -> "all_stopped" [ style = bold] "vm-29_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold] "vm-29_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold] "vm-29_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] -"vm-33_stop_0 hex-9" -> "all_stopped" [ style = bold] "vm-33_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold] "vm-33_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold] "vm-33_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] -"vm-37_stop_0 hex-9" -> "all_stopped" [ style = bold] "vm-37_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold] "vm-37_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold] "vm-37_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] -"vm-41_stop_0 hex-9" -> "all_stopped" [ style = bold] "vm-41_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold] "vm-41_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold] "vm-41_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] -"vm-45_stop_0 hex-9" -> "all_stopped" [ style = bold] "vm-45_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold] "vm-45_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold] "vm-45_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] -"vm-49_stop_0 hex-9" -> "all_stopped" [ style = bold] "vm-49_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold] "vm-49_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold] "vm-49_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] -"vm-53_stop_0 hex-9" -> "all_stopped" [ style = bold] "vm-53_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold] "vm-53_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold] "vm-53_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] -"vm-57_stop_0 hex-9" -> "all_stopped" [ style = bold] "vm-57_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold] "vm-57_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold] "vm-57_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] -"vm-61_stop_0 hex-9" -> "all_stopped" [ style = bold] "vm-61_stop_0 hex-9" -> "base-clone_stop_0" [ style = bold] "vm-61_stop_0 hex-9" -> "load_stopped_hex-9 hex-9" [ style = bold] "vm-61_stop_0 hex-9" [ style=bold color="green" fontcolor="orange" ] diff --git a/pengine/test10/bug-lf-2551.exp b/pengine/test10/bug-lf-2551.exp index a14ec5e..d624653 100644 --- a/pengine/test10/bug-lf-2551.exp +++ b/pengine/test10/bug-lf-2551.exp @@ -1,20 +1,20 @@ - + - + - + @@ -22,7 +22,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -40,36 +40,36 @@ - + - + - + - + - + - + @@ -81,49 +81,49 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -132,16 +132,16 @@ - + - + - + @@ -150,16 +150,16 @@ - + - + - + @@ -168,16 +168,16 @@ - + - + - + @@ -186,16 +186,16 @@ - + - + - + @@ -204,16 +204,16 @@ - + - + - + @@ -222,28 +222,28 @@ - + - + - + - + - + @@ -252,58 +252,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -315,7 +315,7 @@ - + @@ -327,7 +327,7 @@ - + @@ -339,7 +339,7 @@ - + @@ -351,7 +351,7 @@ - + @@ -363,7 +363,7 @@ - + @@ -375,7 +375,7 @@ - + @@ -387,7 +387,7 @@ - + @@ -399,7 +399,7 @@ - + @@ -411,7 +411,7 @@ - + @@ -423,7 +423,7 @@ - + @@ -435,7 +435,7 @@ - + @@ -447,7 +447,7 @@ - + @@ -459,7 +459,7 @@ - + @@ -471,7 +471,7 @@ - + @@ -483,7 +483,7 @@ - + @@ -495,182 +495,86 @@ - + - + - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/bug-lf-2551.summary b/pengine/test10/bug-lf-2551.summary index a1686ed..919b4e6 100644 --- a/pengine/test10/bug-lf-2551.summary +++ b/pengine/test10/bug-lf-2551.summary @@ -133,7 +133,6 @@ Executing cluster transition: * Pseudo action: vm-53_stop_0 * Pseudo action: vm-57_stop_0 * Pseudo action: vm-61_stop_0 - * Pseudo action: stonith_complete * Pseudo action: load_stopped_hex-9 * Resource action: dummy1 start on hex-0 * Pseudo action: base-clone_stop_0 @@ -145,7 +144,6 @@ Executing cluster transition: * Pseudo action: clvm:3_stop_0 * Pseudo action: o2cb:3_stop_0 * Pseudo action: dlm:3_stop_0 - * Pseudo action: all_stopped * Pseudo action: base-group:3_stopped_0 * Pseudo action: base-clone_stopped_0 diff --git a/pengine/test10/bug-lf-2574.dot b/pengine/test10/bug-lf-2574.dot index 473a990..f2fd434 100644 --- a/pengine/test10/bug-lf-2574.dot +++ b/pengine/test10/bug-lf-2574.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "clnPingd_stop_0" -> "clnPingd_stopped_0" [ style = bold] "clnPingd_stop_0" -> "prmPingd:0_stop_0 srv01" [ style = bold] "clnPingd_stop_0" [ style=bold color="green" fontcolor="orange" ] @@ -7,10 +6,8 @@ digraph "g" { "main_rsc_monitor_10000 srv03" [ style=bold color="green" fontcolor="black" ] "main_rsc_start_0 srv03" -> "main_rsc_monitor_10000 srv03" [ style = bold] "main_rsc_start_0 srv03" [ style=bold color="green" fontcolor="black" ] -"main_rsc_stop_0 srv01" -> "all_stopped" [ style = bold] "main_rsc_stop_0 srv01" -> "main_rsc_start_0 srv03" [ style = bold] "main_rsc_stop_0 srv01" [ style=bold color="green" fontcolor="black" ] -"prmPingd:0_stop_0 srv01" -> "all_stopped" [ style = bold] "prmPingd:0_stop_0 srv01" -> "clnPingd_stopped_0" [ style = bold] "prmPingd:0_stop_0 srv01" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/bug-lf-2574.exp b/pengine/test10/bug-lf-2574.exp index 2b35f48..726e0c0 100644 --- a/pengine/test10/bug-lf-2574.exp +++ b/pengine/test10/bug-lf-2574.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,54 +36,38 @@ - + - + - + - + - + - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/bug-lf-2574.summary b/pengine/test10/bug-lf-2574.summary index 8033616..38c66e3 100644 --- a/pengine/test10/bug-lf-2574.summary +++ b/pengine/test10/bug-lf-2574.summary @@ -20,7 +20,6 @@ Executing cluster transition: * Resource action: main_rsc start on srv03 * Resource action: prmPingd:0 stop on srv01 * Pseudo action: clnPingd_stopped_0 - * Pseudo action: all_stopped * Resource action: main_rsc monitor=10000 on srv03 Revised cluster status: diff --git a/pengine/test10/bug-lf-2581.exp b/pengine/test10/bug-lf-2581.exp index 421e75a..7a951a1 100644 --- a/pengine/test10/bug-lf-2581.exp +++ b/pengine/test10/bug-lf-2581.exp @@ -1,63 +1,63 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -66,36 +66,36 @@ - + - + - + - + - + - + @@ -104,37 +104,37 @@ - + - + - + - + - + - + - + @@ -143,7 +143,7 @@ - + @@ -152,7 +152,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -170,33 +170,33 @@ - + - + - + - + - + @@ -205,28 +205,28 @@ - + - + - + - + - + diff --git a/pengine/test10/bug-lf-2606.dot b/pengine/test10/bug-lf-2606.dot index e9656ef..2382ff3 100644 --- a/pengine/test10/bug-lf-2606.dot +++ b/pengine/test10/bug-lf-2606.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "ms3_demote_0" -> "ms3_demoted_0" [ style = bold] "ms3_demote_0" -> "rsc3:1_demote_0 node2" [ style = bold] "ms3_demote_0" [ style=bold color="green" fontcolor="orange"] @@ -9,28 +8,22 @@ digraph "g" { "ms3_stop_0" -> "rsc3:1_stop_0 node2" [ style = bold] "ms3_stop_0" [ style=bold color="green" fontcolor="orange"] "ms3_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="orange"] "rsc2_monitor_10000 node1" [ style=bold color="green" fontcolor="black"] "rsc2_start_0 node1" -> "rsc2_monitor_10000 node1" [ style = bold] "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"] "rsc3:1_demote_0 node2" -> "ms3_demoted_0" [ style = bold] "rsc3:1_demote_0 node2" -> "rsc3:1_stop_0 node2" [ style = bold] "rsc3:1_demote_0 node2" [ style=bold color="green" fontcolor="orange"] -"rsc3:1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc3:1_stop_0 node2" -> "ms3_stopped_0" [ style = bold] "rsc3:1_stop_0 node2" [ style=bold color="green" fontcolor="orange"] "stonith 'reboot' node2" -> "ms3_stop_0" [ style = bold] "stonith 'reboot' node2" -> "rsc1_stop_0 node2" [ style = bold] +"stonith 'reboot' node2" -> "rsc2_start_0 node1" [ style = bold] "stonith 'reboot' node2" -> "rsc2_stop_0 node2" [ style = bold] "stonith 'reboot' node2" -> "rsc3:1_demote_0 node2" [ style = bold] "stonith 'reboot' node2" -> "rsc3:1_stop_0 node2" [ style = bold] -"stonith 'reboot' node2" -> "stonith_complete" [ style = bold] "stonith 'reboot' node2" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "rsc2_start_0 node1" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/bug-lf-2606.exp b/pengine/test10/bug-lf-2606.exp index b14069e..6f7361d 100644 --- a/pengine/test10/bug-lf-2606.exp +++ b/pengine/test10/bug-lf-2606.exp @@ -1,7 +1,7 @@ - + @@ -13,36 +13,36 @@ - + - + - + - + - + - + @@ -54,7 +54,7 @@ - + @@ -63,16 +63,16 @@ - + - + - + @@ -81,28 +81,28 @@ - + - + - + - + - + @@ -110,22 +110,22 @@ - + - + - + - + @@ -134,45 +134,12 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/bug-lf-2606.summary b/pengine/test10/bug-lf-2606.summary index ef30bac..af9fe84 100644 --- a/pengine/test10/bug-lf-2606.summary +++ b/pengine/test10/bug-lf-2606.summary @@ -25,11 +25,9 @@ Executing cluster transition: * Pseudo action: rsc3:1_demote_0 * Pseudo action: ms3_demoted_0 * Pseudo action: ms3_stop_0 - * Pseudo action: stonith_complete * Resource action: rsc2 start on node1 * Pseudo action: rsc3:1_stop_0 * Pseudo action: ms3_stopped_0 - * Pseudo action: all_stopped * Resource action: rsc2 monitor=10000 on node1 Revised cluster status: diff --git a/pengine/test10/bug-lf-2613.dot b/pengine/test10/bug-lf-2613.dot index 364128c..257fc6e 100644 --- a/pengine/test10/bug-lf-2613.dot +++ b/pengine/test10/bug-lf-2613.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "grpPostgreSQLDB1_running_0" [ style=bold color="green" fontcolor="orange"] "grpPostgreSQLDB1_start_0" -> "grpPostgreSQLDB1_running_0" [ style = bold] "grpPostgreSQLDB1_start_0" -> "prmApPostgreSQLDB1_start_0 sby1" [ style = bold] @@ -29,7 +28,6 @@ digraph "g" { "prmApPostgreSQLDB1_start_0 sby1" -> "grpPostgreSQLDB1_running_0" [ style = bold] "prmApPostgreSQLDB1_start_0 sby1" -> "prmApPostgreSQLDB1_monitor_5000 sby1" [ style = bold] "prmApPostgreSQLDB1_start_0 sby1" [ style=bold color="green" fontcolor="black"] -"prmApPostgreSQLDB1_stop_0 act1" -> "all_stopped" [ style = bold] "prmApPostgreSQLDB1_stop_0 act1" -> "grpPostgreSQLDB1_stopped_0" [ style = bold] "prmApPostgreSQLDB1_stop_0 act1" -> "prmApPostgreSQLDB1_start_0 sby1" [ style = bold] "prmApPostgreSQLDB1_stop_0 act1" -> "prmIpPostgreSQLDB1_stop_0 act1" [ style = bold] @@ -39,7 +37,6 @@ digraph "g" { "prmExPostgreSQLDB1_start_0 sby1" -> "prmExPostgreSQLDB1_monitor_5000 sby1" [ style = bold] "prmExPostgreSQLDB1_start_0 sby1" -> "prmFsPostgreSQLDB1-1_start_0 sby1" [ style = bold] "prmExPostgreSQLDB1_start_0 sby1" [ style=bold color="green" fontcolor="black"] -"prmExPostgreSQLDB1_stop_0 act1" -> "all_stopped" [ style = bold] "prmExPostgreSQLDB1_stop_0 act1" -> "grpPostgreSQLDB1_stopped_0" [ style = bold] "prmExPostgreSQLDB1_stop_0 act1" -> "load_stopped_act1 act1" [ style = bold] "prmExPostgreSQLDB1_stop_0 act1" -> "prmExPostgreSQLDB1_start_0 sby1" [ style = bold] @@ -49,7 +46,6 @@ digraph "g" { "prmFsPostgreSQLDB1-1_start_0 sby1" -> "prmFsPostgreSQLDB1-1_monitor_5000 sby1" [ style = bold] "prmFsPostgreSQLDB1-1_start_0 sby1" -> "prmFsPostgreSQLDB1-2_start_0 sby1" [ style = bold] "prmFsPostgreSQLDB1-1_start_0 sby1" [ style=bold color="green" fontcolor="black"] -"prmFsPostgreSQLDB1-1_stop_0 act1" -> "all_stopped" [ style = bold] "prmFsPostgreSQLDB1-1_stop_0 act1" -> "grpPostgreSQLDB1_stopped_0" [ style = bold] "prmFsPostgreSQLDB1-1_stop_0 act1" -> "prmExPostgreSQLDB1_stop_0 act1" [ style = bold] "prmFsPostgreSQLDB1-1_stop_0 act1" -> "prmFsPostgreSQLDB1-1_start_0 sby1" [ style = bold] @@ -59,7 +55,6 @@ digraph "g" { "prmFsPostgreSQLDB1-2_start_0 sby1" -> "prmFsPostgreSQLDB1-2_monitor_5000 sby1" [ style = bold] "prmFsPostgreSQLDB1-2_start_0 sby1" -> "prmFsPostgreSQLDB1-3_start_0 sby1" [ style = bold] "prmFsPostgreSQLDB1-2_start_0 sby1" [ style=bold color="green" fontcolor="black"] -"prmFsPostgreSQLDB1-2_stop_0 act1" -> "all_stopped" [ style = bold] "prmFsPostgreSQLDB1-2_stop_0 act1" -> "grpPostgreSQLDB1_stopped_0" [ style = bold] "prmFsPostgreSQLDB1-2_stop_0 act1" -> "prmFsPostgreSQLDB1-1_stop_0 act1" [ style = bold] "prmFsPostgreSQLDB1-2_stop_0 act1" -> "prmFsPostgreSQLDB1-2_start_0 sby1" [ style = bold] @@ -69,7 +64,6 @@ digraph "g" { "prmFsPostgreSQLDB1-3_start_0 sby1" -> "prmFsPostgreSQLDB1-3_monitor_5000 sby1" [ style = bold] "prmFsPostgreSQLDB1-3_start_0 sby1" -> "prmIpPostgreSQLDB1_start_0 sby1" [ style = bold] "prmFsPostgreSQLDB1-3_start_0 sby1" [ style=bold color="green" fontcolor="black"] -"prmFsPostgreSQLDB1-3_stop_0 act1" -> "all_stopped" [ style = bold] "prmFsPostgreSQLDB1-3_stop_0 act1" -> "grpPostgreSQLDB1_stopped_0" [ style = bold] "prmFsPostgreSQLDB1-3_stop_0 act1" -> "prmFsPostgreSQLDB1-2_stop_0 act1" [ style = bold] "prmFsPostgreSQLDB1-3_stop_0 act1" -> "prmFsPostgreSQLDB1-3_start_0 sby1" [ style = bold] @@ -79,7 +73,6 @@ digraph "g" { "prmIpPostgreSQLDB1_start_0 sby1" -> "prmApPostgreSQLDB1_start_0 sby1" [ style = bold] "prmIpPostgreSQLDB1_start_0 sby1" -> "prmIpPostgreSQLDB1_monitor_5000 sby1" [ style = bold] "prmIpPostgreSQLDB1_start_0 sby1" [ style=bold color="green" fontcolor="black"] -"prmIpPostgreSQLDB1_stop_0 act1" -> "all_stopped" [ style = bold] "prmIpPostgreSQLDB1_stop_0 act1" -> "grpPostgreSQLDB1_stopped_0" [ style = bold] "prmIpPostgreSQLDB1_stop_0 act1" -> "prmFsPostgreSQLDB1-3_stop_0 act1" [ style = bold] "prmIpPostgreSQLDB1_stop_0 act1" -> "prmIpPostgreSQLDB1_start_0 sby1" [ style = bold] diff --git a/pengine/test10/bug-lf-2613.exp b/pengine/test10/bug-lf-2613.exp index 47d7fc8..c29f127 100644 --- a/pengine/test10/bug-lf-2613.exp +++ b/pengine/test10/bug-lf-2613.exp @@ -1,7 +1,7 @@ - + @@ -10,28 +10,28 @@ - + - + - + - + - + - + - + @@ -39,273 +39,273 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -315,26 +315,26 @@ - + - + - + - + @@ -344,10 +344,10 @@ - + - + @@ -360,13 +360,13 @@ - + - + @@ -374,7 +374,7 @@ - + @@ -382,7 +382,7 @@ - + @@ -390,7 +390,7 @@ - + @@ -398,40 +398,13 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/bug-lf-2613.summary b/pengine/test10/bug-lf-2613.summary index 51078c0..02e3d5a 100644 --- a/pengine/test10/bug-lf-2613.summary +++ b/pengine/test10/bug-lf-2613.summary @@ -45,7 +45,6 @@ Executing cluster transition: * Resource action: prmFsPostgreSQLDB1-1 stop on act1 * Resource action: prmExPostgreSQLDB1 stop on act1 * Pseudo action: load_stopped_act1 - * Pseudo action: all_stopped * Pseudo action: grpPostgreSQLDB1_stopped_0 * Pseudo action: grpPostgreSQLDB1_start_0 * Resource action: prmExPostgreSQLDB1 start on sby1 diff --git a/pengine/test10/bug-lf-2619.dot b/pengine/test10/bug-lf-2619.dot index 4d00a26..78a6ef3 100644 --- a/pengine/test10/bug-lf-2619.dot +++ b/pengine/test10/bug-lf-2619.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "clnPingd_stop_0" -> "clnPingd_stopped_0" [ style = bold] "clnPingd_stop_0" -> "prmPingd:0_stop_0 act1" [ style = bold] "clnPingd_stop_0" [ style=bold color="green" fontcolor="orange"] @@ -34,7 +33,6 @@ digraph "g" { "prmApPostgreSQLDB1_start_0 sby1" -> "grpPostgreSQLDB1_running_0" [ style = bold] "prmApPostgreSQLDB1_start_0 sby1" -> "prmApPostgreSQLDB1_monitor_5000 sby1" [ style = bold] "prmApPostgreSQLDB1_start_0 sby1" [ style=bold color="green" fontcolor="black"] -"prmApPostgreSQLDB1_stop_0 act1" -> "all_stopped" [ style = bold] "prmApPostgreSQLDB1_stop_0 act1" -> "grpPostgreSQLDB1_stopped_0" [ style = bold] "prmApPostgreSQLDB1_stop_0 act1" -> "prmApPostgreSQLDB1_start_0 sby1" [ style = bold] "prmApPostgreSQLDB1_stop_0 act1" -> "prmIpPostgreSQLDB1_stop_0 act1" [ style = bold] @@ -44,7 +42,6 @@ digraph "g" { "prmExPostgreSQLDB1_start_0 sby1" -> "prmExPostgreSQLDB1_monitor_5000 sby1" [ style = bold] "prmExPostgreSQLDB1_start_0 sby1" -> "prmFsPostgreSQLDB1-1_start_0 sby1" [ style = bold] "prmExPostgreSQLDB1_start_0 sby1" [ style=bold color="green" fontcolor="black"] -"prmExPostgreSQLDB1_stop_0 act1" -> "all_stopped" [ style = bold] "prmExPostgreSQLDB1_stop_0 act1" -> "grpPostgreSQLDB1_stopped_0" [ style = bold] "prmExPostgreSQLDB1_stop_0 act1" -> "load_stopped_act1 act1" [ style = bold] "prmExPostgreSQLDB1_stop_0 act1" -> "prmExPostgreSQLDB1_start_0 sby1" [ style = bold] @@ -54,7 +51,6 @@ digraph "g" { "prmFsPostgreSQLDB1-1_start_0 sby1" -> "prmFsPostgreSQLDB1-1_monitor_5000 sby1" [ style = bold] "prmFsPostgreSQLDB1-1_start_0 sby1" -> "prmFsPostgreSQLDB1-2_start_0 sby1" [ style = bold] "prmFsPostgreSQLDB1-1_start_0 sby1" [ style=bold color="green" fontcolor="black"] -"prmFsPostgreSQLDB1-1_stop_0 act1" -> "all_stopped" [ style = bold] "prmFsPostgreSQLDB1-1_stop_0 act1" -> "grpPostgreSQLDB1_stopped_0" [ style = bold] "prmFsPostgreSQLDB1-1_stop_0 act1" -> "prmExPostgreSQLDB1_stop_0 act1" [ style = bold] "prmFsPostgreSQLDB1-1_stop_0 act1" -> "prmFsPostgreSQLDB1-1_start_0 sby1" [ style = bold] @@ -64,7 +60,6 @@ digraph "g" { "prmFsPostgreSQLDB1-2_start_0 sby1" -> "prmFsPostgreSQLDB1-2_monitor_5000 sby1" [ style = bold] "prmFsPostgreSQLDB1-2_start_0 sby1" -> "prmFsPostgreSQLDB1-3_start_0 sby1" [ style = bold] "prmFsPostgreSQLDB1-2_start_0 sby1" [ style=bold color="green" fontcolor="black"] -"prmFsPostgreSQLDB1-2_stop_0 act1" -> "all_stopped" [ style = bold] "prmFsPostgreSQLDB1-2_stop_0 act1" -> "grpPostgreSQLDB1_stopped_0" [ style = bold] "prmFsPostgreSQLDB1-2_stop_0 act1" -> "prmFsPostgreSQLDB1-1_stop_0 act1" [ style = bold] "prmFsPostgreSQLDB1-2_stop_0 act1" -> "prmFsPostgreSQLDB1-2_start_0 sby1" [ style = bold] @@ -74,7 +69,6 @@ digraph "g" { "prmFsPostgreSQLDB1-3_start_0 sby1" -> "prmFsPostgreSQLDB1-3_monitor_5000 sby1" [ style = bold] "prmFsPostgreSQLDB1-3_start_0 sby1" -> "prmIpPostgreSQLDB1_start_0 sby1" [ style = bold] "prmFsPostgreSQLDB1-3_start_0 sby1" [ style=bold color="green" fontcolor="black"] -"prmFsPostgreSQLDB1-3_stop_0 act1" -> "all_stopped" [ style = bold] "prmFsPostgreSQLDB1-3_stop_0 act1" -> "grpPostgreSQLDB1_stopped_0" [ style = bold] "prmFsPostgreSQLDB1-3_stop_0 act1" -> "prmFsPostgreSQLDB1-2_stop_0 act1" [ style = bold] "prmFsPostgreSQLDB1-3_stop_0 act1" -> "prmFsPostgreSQLDB1-3_start_0 sby1" [ style = bold] @@ -84,12 +78,10 @@ digraph "g" { "prmIpPostgreSQLDB1_start_0 sby1" -> "prmApPostgreSQLDB1_start_0 sby1" [ style = bold] "prmIpPostgreSQLDB1_start_0 sby1" -> "prmIpPostgreSQLDB1_monitor_5000 sby1" [ style = bold] "prmIpPostgreSQLDB1_start_0 sby1" [ style=bold color="green" fontcolor="black"] -"prmIpPostgreSQLDB1_stop_0 act1" -> "all_stopped" [ style = bold] "prmIpPostgreSQLDB1_stop_0 act1" -> "grpPostgreSQLDB1_stopped_0" [ style = bold] "prmIpPostgreSQLDB1_stop_0 act1" -> "prmFsPostgreSQLDB1-3_stop_0 act1" [ style = bold] "prmIpPostgreSQLDB1_stop_0 act1" -> "prmIpPostgreSQLDB1_start_0 sby1" [ style = bold] "prmIpPostgreSQLDB1_stop_0 act1" [ style=bold color="green" fontcolor="black"] -"prmPingd:0_stop_0 act1" -> "all_stopped" [ style = bold] "prmPingd:0_stop_0 act1" -> "clnPingd_stopped_0" [ style = bold] "prmPingd:0_stop_0 act1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/bug-lf-2619.exp b/pengine/test10/bug-lf-2619.exp index 57aff38..41ff2d7 100644 --- a/pengine/test10/bug-lf-2619.exp +++ b/pengine/test10/bug-lf-2619.exp @@ -1,37 +1,37 @@ - + - + - + - + - + - + - + - + - + @@ -39,328 +39,328 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -373,13 +373,13 @@ - + - + @@ -388,25 +388,25 @@ - + - + - + - + @@ -414,7 +414,7 @@ - + @@ -422,7 +422,7 @@ - + @@ -430,7 +430,7 @@ - + @@ -438,43 +438,13 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/bug-lf-2619.summary b/pengine/test10/bug-lf-2619.summary index a704be8..5b7c5ca 100644 --- a/pengine/test10/bug-lf-2619.summary +++ b/pengine/test10/bug-lf-2619.summary @@ -67,7 +67,6 @@ Executing cluster transition: * Resource action: prmApPostgreSQLDB1 monitor=5000 on sby1 * Resource action: prmPingd:0 stop on act1 * Pseudo action: clnPingd_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ act1 act2 act3 sby1 sby2 ] diff --git a/pengine/test10/bug-n-385265-2.dot b/pengine/test10/bug-n-385265-2.dot index 87a4b93..a9e75d3 100644 --- a/pengine/test10/bug-n-385265-2.dot +++ b/pengine/test10/bug-n-385265-2.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "group_common_running_0" [ style=bold color="green" fontcolor="orange" ] "group_common_start_0" -> "group_common_running_0" [ style = bold] "group_common_start_0" -> "resource_idvscommon_start_0 ih01" [ style = bold] @@ -15,7 +14,6 @@ digraph "g" { "resource_idvscommon_start_0 ih01" -> "group_common_running_0" [ style = bold] "resource_idvscommon_start_0 ih01" -> "resource_idvscommon_monitor_30000 ih01" [ style = bold] "resource_idvscommon_start_0 ih01" [ style=bold color="green" fontcolor="black" ] -"resource_idvscommon_stop_0 ih02" -> "all_stopped" [ style = bold] "resource_idvscommon_stop_0 ih02" -> "group_common_stopped_0" [ style = bold] "resource_idvscommon_stop_0 ih02" -> "resource_idvscommon_start_0 ih01" [ style = bold] "resource_idvscommon_stop_0 ih02" -> "resource_ip_common_stop_0 ih02" [ style = bold] @@ -25,7 +23,6 @@ digraph "g" { "resource_ip_common_start_0 ih01" -> "resource_idvscommon_start_0 ih01" [ style = bold] "resource_ip_common_start_0 ih01" -> "resource_ip_common_monitor_30000 ih01" [ style = bold] "resource_ip_common_start_0 ih01" [ style=bold color="green" fontcolor="black" ] -"resource_ip_common_stop_0 ih02" -> "all_stopped" [ style = bold] "resource_ip_common_stop_0 ih02" -> "group_common_stopped_0" [ style = bold] "resource_ip_common_stop_0 ih02" -> "resource_ip_common_start_0 ih01" [ style = bold] "resource_ip_common_stop_0 ih02" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/bug-n-385265-2.exp b/pengine/test10/bug-n-385265-2.exp index 2f536dc..eca18cb 100644 --- a/pengine/test10/bug-n-385265-2.exp +++ b/pengine/test10/bug-n-385265-2.exp @@ -1,7 +1,7 @@ - + @@ -10,16 +10,16 @@ - + - + - + @@ -27,50 +27,50 @@ - + - + - + - + - + - + - + - + - + @@ -80,7 +80,7 @@ - + @@ -93,70 +93,55 @@ - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/bug-n-385265-2.summary b/pengine/test10/bug-n-385265-2.summary index 2e0f7c1..576dc39 100644 --- a/pengine/test10/bug-n-385265-2.summary +++ b/pengine/test10/bug-n-385265-2.summary @@ -14,7 +14,6 @@ Executing cluster transition: * Pseudo action: group_common_stop_0 * Resource action: resource_idvscommon stop on ih02 * Resource action: resource_ip_common stop on ih02 - * Pseudo action: all_stopped * Pseudo action: group_common_stopped_0 * Pseudo action: group_common_start_0 * Resource action: resource_ip_common start on ih01 diff --git a/pengine/test10/bug-n-385265.dot b/pengine/test10/bug-n-385265.dot index bc59590..e3d93d2 100644 --- a/pengine/test10/bug-n-385265.dot +++ b/pengine/test10/bug-n-385265.dot @@ -1,10 +1,8 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "group_common_stop_0" -> "group_common_stopped_0" [ style = bold] "group_common_stop_0" -> "resource_idvscommon_stop_0 ih02" [ style = bold] "group_common_stop_0" [ style=bold color="green" fontcolor="orange" ] "group_common_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"resource_idvscommon_stop_0 ih02" -> "all_stopped" [ style = bold] "resource_idvscommon_stop_0 ih02" -> "group_common_stopped_0" [ style = bold] "resource_idvscommon_stop_0 ih02" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/bug-n-385265.exp b/pengine/test10/bug-n-385265.exp index c8bad25..f2a7452 100644 --- a/pengine/test10/bug-n-385265.exp +++ b/pengine/test10/bug-n-385265.exp @@ -1,7 +1,7 @@ - + @@ -10,13 +10,13 @@ - + - + @@ -31,19 +31,7 @@ - - - - - - - - - - - - - + diff --git a/pengine/test10/bug-n-385265.summary b/pengine/test10/bug-n-385265.summary index e5bc4bc..24edd98 100644 --- a/pengine/test10/bug-n-385265.summary +++ b/pengine/test10/bug-n-385265.summary @@ -12,7 +12,6 @@ Transition Summary: Executing cluster transition: * Pseudo action: group_common_stop_0 * Resource action: resource_idvscommon stop on ih02 - * Pseudo action: all_stopped * Pseudo action: group_common_stopped_0 Revised cluster status: diff --git a/pengine/test10/bug-n-387749.dot b/pengine/test10/bug-n-387749.dot index 886f337..4a978ce 100644 --- a/pengine/test10/bug-n-387749.dot +++ b/pengine/test10/bug-n-387749.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "export_home_ocfs2:0_monitor_0 power720-1" -> "export_home_ocfs2_clone_set_start_0" [ style = bold] "export_home_ocfs2:0_monitor_0 power720-1" [ style=bold color="green" fontcolor="black" ] "export_home_ocfs2:0_post_notify_start_0 power720-1" -> "export_home_ocfs2_clone_set_confirmed-post_notify_running_0" [ style = bold] @@ -49,7 +48,6 @@ digraph "g" { "resource_ipaddr1_single_start_0 power720-1" -> "resource_ipaddr1_single_monitor_5000 power720-1" [ style = bold] "resource_ipaddr1_single_start_0 power720-1" -> "resource_nfsserver_single_start_0 power720-1" [ style = bold] "resource_ipaddr1_single_start_0 power720-1" [ style=bold color="green" fontcolor="black" ] -"resource_ipaddr1_single_stop_0 power720-2" -> "all_stopped" [ style = bold] "resource_ipaddr1_single_stop_0 power720-2" -> "group_nfs_stopped_0" [ style = bold] "resource_ipaddr1_single_stop_0 power720-2" -> "resource_ipaddr1_single_start_0 power720-1" [ style = bold] "resource_ipaddr1_single_stop_0 power720-2" [ style=bold color="green" fontcolor="black" ] @@ -59,7 +57,6 @@ digraph "g" { "resource_nfsserver_single_start_0 power720-1" -> "group_nfs_running_0" [ style = bold] "resource_nfsserver_single_start_0 power720-1" -> "resource_nfsserver_single_monitor_15000 power720-1" [ style = bold] "resource_nfsserver_single_start_0 power720-1" [ style=bold color="green" fontcolor="black" ] -"resource_nfsserver_single_stop_0 power720-2" -> "all_stopped" [ style = bold] "resource_nfsserver_single_stop_0 power720-2" -> "group_nfs_stopped_0" [ style = bold] "resource_nfsserver_single_stop_0 power720-2" -> "resource_ipaddr1_single_stop_0 power720-2" [ style = bold] "resource_nfsserver_single_stop_0 power720-2" -> "resource_nfsserver_single_start_0 power720-1" [ style = bold] diff --git a/pengine/test10/bug-n-387749.exp b/pengine/test10/bug-n-387749.exp index 80f91bb..f999b16 100644 --- a/pengine/test10/bug-n-387749.exp +++ b/pengine/test10/bug-n-387749.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,33 +36,33 @@ - + - + - + - + - + @@ -71,7 +71,7 @@ - + @@ -80,55 +80,55 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -136,61 +136,61 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -198,88 +198,88 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -288,75 +288,59 @@ - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/bug-n-387749.summary b/pengine/test10/bug-n-387749.summary index 9959ce7..8dacdb4 100644 --- a/pengine/test10/bug-n-387749.summary +++ b/pengine/test10/bug-n-387749.summary @@ -29,7 +29,6 @@ Executing cluster transition: * Pseudo action: export_home_ocfs2_clone_set_confirmed-pre_notify_start_0 * Pseudo action: export_home_ocfs2_clone_set_start_0 * Resource action: resource_ipaddr1_single stop on power720-2 - * Pseudo action: all_stopped * Resource action: export_home_ocfs2:0 start on power720-1 * Pseudo action: export_home_ocfs2_clone_set_running_0 * Pseudo action: group_nfs_stopped_0 diff --git a/pengine/test10/bug-pm-11.exp b/pengine/test10/bug-pm-11.exp index 505e51e..b4a6931 100644 --- a/pengine/test10/bug-pm-11.exp +++ b/pengine/test10/bug-pm-11.exp @@ -1,47 +1,47 @@ - + - + - + - + - + - + - + - + @@ -50,7 +50,7 @@ - + @@ -59,87 +59,87 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -148,7 +148,7 @@ - + @@ -157,64 +157,64 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/bug-pm-12.dot b/pengine/test10/bug-pm-12.dot index a0d7bb6..01f7d1d 100644 --- a/pengine/test10/bug-pm-12.dot +++ b/pengine/test10/bug-pm-12.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "group:0_running_0" -> "ms-sf_running_0" [ style = bold] "group:0_running_0" [ style=bold color="green" fontcolor="orange" ] "group:0_start_0" -> "group:0_running_0" [ style = bold] @@ -56,7 +55,6 @@ digraph "g" { "ms-sf_stopped_0" [ style=bold color="green" fontcolor="orange" ] "stateful-2:0_start_0 node-b" -> "group:0_running_0" [ style = bold] "stateful-2:0_start_0 node-b" [ style=bold color="green" fontcolor="black" ] -"stateful-2:0_stop_0 node-b" -> "all_stopped" [ style = bold] "stateful-2:0_stop_0 node-b" -> "group:0_stopped_0" [ style = bold] "stateful-2:0_stop_0 node-b" -> "stateful-2:0_start_0 node-b" [ style = bold] "stateful-2:0_stop_0 node-b" [ style=bold color="green" fontcolor="black" ] @@ -68,7 +66,6 @@ digraph "g" { "stateful-2:1_start_0 node-a" -> "group:1_running_0" [ style = bold] "stateful-2:1_start_0 node-a" -> "stateful-2:1_promote_0 node-a" [ style = bold] "stateful-2:1_start_0 node-a" [ style=bold color="green" fontcolor="black" ] -"stateful-2:1_stop_0 node-a" -> "all_stopped" [ style = bold] "stateful-2:1_stop_0 node-a" -> "group:1_stopped_0" [ style = bold] "stateful-2:1_stop_0 node-a" -> "stateful-2:1_start_0 node-a" [ style = bold] "stateful-2:1_stop_0 node-a" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/bug-pm-12.exp b/pengine/test10/bug-pm-12.exp index ced0661..717389f 100644 --- a/pengine/test10/bug-pm-12.exp +++ b/pengine/test10/bug-pm-12.exp @@ -1,277 +1,277 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -279,109 +279,94 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/bug-pm-12.summary b/pengine/test10/bug-pm-12.summary index 1ec6b8d..8ab0c4f 100644 --- a/pengine/test10/bug-pm-12.summary +++ b/pengine/test10/bug-pm-12.summary @@ -25,7 +25,6 @@ Executing cluster transition: * Resource action: stateful-2:0 stop on node-b * Pseudo action: group:1_stop_0 * Resource action: stateful-2:1 stop on node-a - * Pseudo action: all_stopped * Pseudo action: group:0_stopped_0 * Pseudo action: group:1_stopped_0 * Pseudo action: ms-sf_stopped_0 diff --git a/pengine/test10/bug-rh-1097457.dot b/pengine/test10/bug-rh-1097457.dot index 94ffe13..3dc24b6 100644 --- a/pengine/test10/bug-rh-1097457.dot +++ b/pengine/test10/bug-rh-1097457.dot @@ -15,7 +15,6 @@ digraph "g" { "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] @@ -28,7 +27,6 @@ digraph "g" { "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"] @@ -51,7 +49,6 @@ digraph "g" { "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"] @@ -65,7 +62,6 @@ digraph "g" { "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"] @@ -77,11 +73,8 @@ digraph "g" { "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" -> "lamaVM2_start_0 lama3" [ style = bold] -"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] @@ -105,22 +98,19 @@ digraph "g" { "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_start_0 lamaVM2" [ style = bold] "stonith 'reboot' lamaVM2" -> "FAKE4-IP_stop_0 lamaVM2" [ style = bold] +"stonith 'reboot' lamaVM2" -> "FAKE4_start_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_start_0 lamaVM2" [ style = bold] "stonith 'reboot' lamaVM2" -> "FAKE6_stop_0 lamaVM2" [ style = bold] +"stonith 'reboot' lamaVM2" -> "FSlun3_start_0 lama2" [ style = bold] "stonith 'reboot' lamaVM2" -> "FSlun3_stop_0 lamaVM2" [ style = bold] +"stonith 'reboot' lamaVM2" -> "VM2_start_0 lama3" [ style = bold] "stonith 'reboot' lamaVM2" -> "lamaVM2-G4_stop_0" [ style = bold] -"stonith 'reboot' lamaVM2" -> "stonith_complete" [ style = bold] +"stonith 'reboot' lamaVM2" -> "lamaVM2_start_0 lama3" [ 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" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/bug-rh-1097457.exp b/pengine/test10/bug-rh-1097457.exp index f1451b5..677c24b 100644 --- a/pengine/test10/bug-rh-1097457.exp +++ b/pengine/test10/bug-rh-1097457.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,30 +19,30 @@ - + - + - + - + - + @@ -55,66 +55,66 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -123,7 +123,7 @@ - + @@ -139,13 +139,13 @@ - + - + @@ -154,7 +154,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -226,7 +226,7 @@ - + @@ -235,7 +235,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -253,119 +253,119 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -374,7 +374,7 @@ - + @@ -390,65 +390,65 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -457,7 +457,7 @@ - + @@ -473,50 +473,50 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -529,89 +529,89 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -630,13 +630,13 @@ - + - + @@ -645,49 +645,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/bug-rh-1097457.summary b/pengine/test10/bug-rh-1097457.summary index 0e7d2e0..dd3c185 100644 --- a/pengine/test10/bug-rh-1097457.summary +++ b/pengine/test10/bug-rh-1097457.summary @@ -64,32 +64,30 @@ Executing cluster transition: * Resource action: lamaVM2 stop on lama3 * Resource action: VM2 stop on lama3 * Pseudo action: stonith-lamaVM2-reboot on lamaVM2 - * Pseudo action: stonith_complete * Resource action: VM2 start on lama3 * Resource action: VM2 monitor=10000 on lama3 * Pseudo action: lamaVM2-G4_stop_0 * Pseudo action: FAKE4-IP_stop_0 * Pseudo action: FAKE6-clone_stop_0 + * Resource action: lamaVM2 start on lama3 + * Resource action: lamaVM2 monitor=30000 on lama3 + * Resource action: FSlun3 monitor=10000 on lamaVM2 * Pseudo action: FAKE4_stop_0 * Pseudo action: FAKE6_stop_0 * Pseudo action: FAKE6-clone_stopped_0 * Pseudo action: FAKE6-clone_start_0 * Pseudo action: lamaVM2-G4_stopped_0 + * Resource action: FAKE6 start on lamaVM2 + * Resource action: FAKE6 monitor=30000 on lamaVM2 + * Pseudo action: FAKE6-clone_running_0 * Pseudo action: FSlun3_stop_0 - * Pseudo action: all_stopped * Resource action: FSlun3 start on lama2 * Pseudo action: lamaVM2-G4_start_0 - * Resource action: lamaVM2 start on lama3 - * Resource action: lamaVM2 monitor=30000 on lama3 - * Resource action: FSlun3 monitor=10000 on lama2 - * Resource action: FSlun3 monitor=10000 on lamaVM2 * Resource action: FAKE4 start on lamaVM2 * Resource action: FAKE4 monitor=30000 on lamaVM2 * Resource action: FAKE4-IP start on lamaVM2 * Resource action: FAKE4-IP monitor=30000 on lamaVM2 - * Resource action: FAKE6 start on lamaVM2 - * Resource action: FAKE6 monitor=30000 on lamaVM2 - * Pseudo action: FAKE6-clone_running_0 + * Resource action: FSlun3 monitor=10000 on lama2 * Pseudo action: lamaVM2-G4_running_0 Revised cluster status: diff --git a/pengine/test10/bug-rh-880249.dot b/pengine/test10/bug-rh-880249.dot index d4739d1..edc801a 100644 --- a/pengine/test10/bug-rh-880249.dot +++ b/pengine/test10/bug-rh-880249.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "dummystateful_demote_0 18node1" -> "dummystateful_stop_0 18node1" [ style = bold] "dummystateful_demote_0 18node1" -> "dummystateful_stop_0 18node2" [ style = bold] "dummystateful_demote_0 18node1" -> "dummystateful_stop_0 18node3" [ style = bold] @@ -13,13 +12,10 @@ digraph "g" { "dummystateful_demote_0 18node3" -> "dummystateful_stop_0 18node3" [ style = bold] "dummystateful_demote_0 18node3" [ style=bold color="green" fontcolor="black"] "dummystateful_start_0 18node3" [ style=bold color="green" fontcolor="black"] -"dummystateful_stop_0 18node1" -> "all_stopped" [ style = bold] "dummystateful_stop_0 18node1" -> "dummystateful_start_0 18node3" [ style = bold] "dummystateful_stop_0 18node1" [ style=bold color="green" fontcolor="black"] -"dummystateful_stop_0 18node2" -> "all_stopped" [ style = bold] "dummystateful_stop_0 18node2" -> "dummystateful_start_0 18node3" [ style = bold] "dummystateful_stop_0 18node2" [ style=bold color="green" fontcolor="black"] -"dummystateful_stop_0 18node3" -> "all_stopped" [ style = bold] "dummystateful_stop_0 18node3" -> "dummystateful_start_0 18node3" [ style = bold] "dummystateful_stop_0 18node3" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/bug-rh-880249.exp b/pengine/test10/bug-rh-880249.exp index c66bd8c..7f12b98 100644 --- a/pengine/test10/bug-rh-880249.exp +++ b/pengine/test10/bug-rh-880249.exp @@ -1,83 +1,83 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -86,7 +86,7 @@ - + @@ -95,30 +95,11 @@ - + - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/bug-rh-880249.summary b/pengine/test10/bug-rh-880249.summary index 766d326..be5666e 100644 --- a/pengine/test10/bug-rh-880249.summary +++ b/pengine/test10/bug-rh-880249.summary @@ -16,7 +16,6 @@ Executing cluster transition: * Resource action: dummystateful stop on 18node3 * Resource action: dummystateful stop on 18node1 * Resource action: dummystateful stop on 18node2 - * Pseudo action: all_stopped * Resource action: dummystateful start on 18node3 Revised cluster status: diff --git a/pengine/test10/bug-suse-707150.exp b/pengine/test10/bug-suse-707150.exp index 8254cf6..4876a41 100644 --- a/pengine/test10/bug-suse-707150.exp +++ b/pengine/test10/bug-suse-707150.exp @@ -1,137 +1,137 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -140,19 +140,19 @@ - + - + - + @@ -160,7 +160,7 @@ - + @@ -168,7 +168,7 @@ - + @@ -176,7 +176,7 @@ - + diff --git a/pengine/test10/bundle-nested-colocation.dot b/pengine/test10/bundle-nested-colocation.dot index 46cc569..f588e0a 100644 --- a/pengine/test10/bundle-nested-colocation.dot +++ b/pengine/test10/bundle-nested-colocation.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "rabbitmq-bundle-0_monitor_0 overcloud-controller-0" -> "rabbitmq-bundle-0_start_0 overcloud-controller-0" [ style = bold] "rabbitmq-bundle-0_monitor_0 overcloud-controller-0" [ style=bold color="green" fontcolor="black"] "rabbitmq-bundle-0_monitor_0 overcloud-controller-1" -> "rabbitmq-bundle-0_start_0 overcloud-controller-0" [ style = bold] @@ -88,7 +87,6 @@ digraph "g" { "rabbitmq-bundle-docker-0_start_0 overcloud-rabbit-0" -> "rabbitmq-bundle_running_0" [ style = bold] "rabbitmq-bundle-docker-0_start_0 overcloud-rabbit-0" -> "rabbitmq:0_start_0 rabbitmq-bundle-0" [ style = bold] "rabbitmq-bundle-docker-0_start_0 overcloud-rabbit-0" [ style=bold color="green" fontcolor="black"] -"rabbitmq-bundle-docker-0_stop_0 overcloud-rabbit-0" -> "all_stopped" [ style = bold] "rabbitmq-bundle-docker-0_stop_0 overcloud-rabbit-0" -> "rabbitmq-bundle-docker-0_start_0 overcloud-rabbit-0" [ style = bold] "rabbitmq-bundle-docker-0_stop_0 overcloud-rabbit-0" -> "rabbitmq-bundle_stopped_0" [ style = bold] "rabbitmq-bundle-docker-0_stop_0 overcloud-rabbit-0" [ style=bold color="green" fontcolor="black"] @@ -104,7 +102,6 @@ digraph "g" { "rabbitmq-bundle-docker-1_start_0 overcloud-rabbit-1" -> "rabbitmq-bundle_running_0" [ style = bold] "rabbitmq-bundle-docker-1_start_0 overcloud-rabbit-1" -> "rabbitmq:1_start_0 rabbitmq-bundle-1" [ style = bold] "rabbitmq-bundle-docker-1_start_0 overcloud-rabbit-1" [ style=bold color="green" fontcolor="black"] -"rabbitmq-bundle-docker-1_stop_0 overcloud-rabbit-1" -> "all_stopped" [ style = bold] "rabbitmq-bundle-docker-1_stop_0 overcloud-rabbit-1" -> "rabbitmq-bundle-docker-1_start_0 overcloud-rabbit-1" [ style = bold] "rabbitmq-bundle-docker-1_stop_0 overcloud-rabbit-1" -> "rabbitmq-bundle_stopped_0" [ style = bold] "rabbitmq-bundle-docker-1_stop_0 overcloud-rabbit-1" [ style=bold color="green" fontcolor="black"] @@ -120,7 +117,6 @@ digraph "g" { "rabbitmq-bundle-docker-2_start_0 overcloud-rabbit-2" -> "rabbitmq-bundle_running_0" [ style = bold] "rabbitmq-bundle-docker-2_start_0 overcloud-rabbit-2" -> "rabbitmq:2_start_0 rabbitmq-bundle-2" [ style = bold] "rabbitmq-bundle-docker-2_start_0 overcloud-rabbit-2" [ style=bold color="green" fontcolor="black"] -"rabbitmq-bundle-docker-2_stop_0 overcloud-rabbit-2" -> "all_stopped" [ style = bold] "rabbitmq-bundle-docker-2_stop_0 overcloud-rabbit-2" -> "rabbitmq-bundle-docker-2_start_0 overcloud-rabbit-2" [ style = bold] "rabbitmq-bundle-docker-2_stop_0 overcloud-rabbit-2" -> "rabbitmq-bundle_stopped_0" [ style = bold] "rabbitmq-bundle-docker-2_stop_0 overcloud-rabbit-2" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/bundle-nested-colocation.exp b/pengine/test10/bundle-nested-colocation.exp index 29c2eda..80b0760 100644 --- a/pengine/test10/bundle-nested-colocation.exp +++ b/pengine/test10/bundle-nested-colocation.exp @@ -1,253 +1,253 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -255,75 +255,75 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -336,158 +336,158 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -500,158 +500,158 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -664,153 +664,153 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -818,49 +818,31 @@ - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/bundle-nested-colocation.summary b/pengine/test10/bundle-nested-colocation.summary index 7464d15..a2bca2d 100644 --- a/pengine/test10/bundle-nested-colocation.summary +++ b/pengine/test10/bundle-nested-colocation.summary @@ -60,7 +60,6 @@ Executing cluster transition: * Resource action: rabbitmq-bundle-2 monitor on overcloud-controller-1 * Resource action: rabbitmq-bundle-2 monitor on overcloud-controller-0 * Pseudo action: rabbitmq-bundle_stopped_0 - * Pseudo action: all_stopped * Resource action: rabbitmq-bundle-0 start on overcloud-controller-0 * Resource action: rabbitmq-bundle-1 start on overcloud-controller-1 * Resource action: rabbitmq-bundle-2 start on overcloud-controller-2 diff --git a/pengine/test10/bundle-order-fencing.dot b/pengine/test10/bundle-order-fencing.dot index 1e2721b..f0a7f70 100644 --- a/pengine/test10/bundle-order-fencing.dot +++ b/pengine/test10/bundle-order-fencing.dot @@ -3,7 +3,6 @@ digraph "g" { "Cancel redis_monitor_45000 redis-bundle-1" [ style=bold color="green" fontcolor="black"] "Cancel redis_monitor_60000 redis-bundle-1" -> "redis_promote_0 redis-bundle-1" [ style = bold] "Cancel redis_monitor_60000 redis-bundle-1" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "galera-bundle-0_monitor_0 controller-1" -> "galera-bundle-0_start_0 controller-2" [ style = dashed] "galera-bundle-0_monitor_0 controller-1" [ style=bold color="green" fontcolor="black"] "galera-bundle-0_monitor_0 controller-2" -> "galera-bundle-0_start_0 controller-2" [ style = dashed] @@ -14,13 +13,11 @@ digraph "g" { "galera-bundle-0_start_0 controller-2" -> "galera_monitor_30000 galera-bundle-0" [ style = dashed] "galera-bundle-0_start_0 controller-2" -> "galera_start_0 galera-bundle-0" [ style = dashed] "galera-bundle-0_start_0 controller-2" [ style=dashed color="red" fontcolor="black"] -"galera-bundle-0_stop_0 controller-0" -> "all_stopped" [ style = bold] "galera-bundle-0_stop_0 controller-0" -> "galera-bundle-0_start_0 controller-2" [ style = dashed] "galera-bundle-0_stop_0 controller-0" -> "galera-bundle-docker-0_stop_0 controller-0" [ style = bold] "galera-bundle-0_stop_0 controller-0" [ style=bold color="green" fontcolor="orange"] "galera-bundle-1_monitor_0 controller-2" [ style=bold color="green" fontcolor="black"] "galera-bundle-2_monitor_0 controller-1" [ style=bold color="green" fontcolor="black"] -"galera-bundle-docker-0_stop_0 controller-0" -> "all_stopped" [ style = bold] "galera-bundle-docker-0_stop_0 controller-0" -> "galera-bundle_stopped_0" [ style = bold] "galera-bundle-docker-0_stop_0 controller-0" [ style=bold color="green" fontcolor="orange"] "galera-bundle-master_demote_0" -> "galera-bundle-master_demoted_0" [ style = bold] @@ -44,17 +41,13 @@ digraph "g" { "galera-bundle_demote_0" -> "galera-bundle-master_demote_0" [ style = bold] "galera-bundle_demote_0" -> "galera-bundle_demoted_0" [ style = bold] "galera-bundle_demote_0" [ style=bold color="green" fontcolor="orange"] -"galera-bundle_demoted_0" -> "galera-bundle_start_0" [ style = bold] "galera-bundle_demoted_0" -> "galera-bundle_stop_0" [ style = bold] "galera-bundle_demoted_0" [ style=bold color="green" fontcolor="orange"] "galera-bundle_running_0" [ style=bold color="green" fontcolor="orange"] -"galera-bundle_start_0" -> "galera-bundle-master_start_0" [ style = bold] -"galera-bundle_start_0" [ style=bold color="green" fontcolor="orange"] "galera-bundle_stop_0" -> "galera-bundle-docker-0_stop_0 controller-0" [ style = bold] "galera-bundle_stop_0" -> "galera-bundle-master_stop_0" [ style = bold] "galera-bundle_stop_0" -> "galera_stop_0 galera-bundle-0" [ style = bold] "galera-bundle_stop_0" [ style=bold color="green" fontcolor="orange"] -"galera-bundle_stopped_0" -> "galera-bundle_start_0" [ style = bold] "galera-bundle_stopped_0" [ style=bold color="green" fontcolor="orange"] "galera_demote_0 galera-bundle-0" -> "galera-bundle-master_demoted_0" [ style = bold] "galera_demote_0 galera-bundle-0" -> "galera_monitor_20000 galera-bundle-0" [ style = dashed] @@ -67,11 +60,9 @@ digraph "g" { "galera_start_0 galera-bundle-0" -> "galera_monitor_20000 galera-bundle-0" [ style = dashed] "galera_start_0 galera-bundle-0" -> "galera_monitor_30000 galera-bundle-0" [ style = dashed] "galera_start_0 galera-bundle-0" [ style=dashed color="red" fontcolor="black"] -"galera_stop_0 galera-bundle-0" -> "all_stopped" [ style = bold] "galera_stop_0 galera-bundle-0" -> "galera-bundle-master_stopped_0" [ style = bold] "galera_stop_0 galera-bundle-0" -> "galera_start_0 galera-bundle-0" [ style = dashed] "galera_stop_0 galera-bundle-0" [ style=bold color="green" fontcolor="orange"] -"haproxy-bundle-docker-0_stop_0 controller-0" -> "all_stopped" [ style = bold] "haproxy-bundle-docker-0_stop_0 controller-0" -> "haproxy-bundle_stopped_0" [ style = bold] "haproxy-bundle-docker-0_stop_0 controller-0" [ style=bold color="green" fontcolor="orange"] "haproxy-bundle_stop_0" -> "haproxy-bundle-docker-0_stop_0 controller-0" [ style = bold] @@ -83,19 +74,16 @@ digraph "g" { "ip-10.0.0.109_monitor_10000 controller-1" [ style=bold color="green" fontcolor="black"] "ip-10.0.0.109_start_0 controller-1" -> "ip-10.0.0.109_monitor_10000 controller-1" [ style = bold] "ip-10.0.0.109_start_0 controller-1" [ style=bold color="green" fontcolor="black"] -"ip-10.0.0.109_stop_0 controller-0" -> "all_stopped" [ style = bold] "ip-10.0.0.109_stop_0 controller-0" -> "ip-10.0.0.109_start_0 controller-1" [ style = bold] "ip-10.0.0.109_stop_0 controller-0" [ style=bold color="green" fontcolor="orange"] "ip-172.17.4.11_monitor_10000 controller-1" [ style=bold color="green" fontcolor="black"] "ip-172.17.4.11_start_0 controller-1" -> "ip-172.17.4.11_monitor_10000 controller-1" [ style = bold] "ip-172.17.4.11_start_0 controller-1" [ style=bold color="green" fontcolor="black"] -"ip-172.17.4.11_stop_0 controller-0" -> "all_stopped" [ style = bold] "ip-172.17.4.11_stop_0 controller-0" -> "ip-172.17.4.11_start_0 controller-1" [ style = bold] "ip-172.17.4.11_stop_0 controller-0" [ style=bold color="green" fontcolor="orange"] "ip-192.168.24.7_monitor_10000 controller-2" [ style=bold color="green" fontcolor="black"] "ip-192.168.24.7_start_0 controller-2" -> "ip-192.168.24.7_monitor_10000 controller-2" [ style = bold] "ip-192.168.24.7_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"ip-192.168.24.7_stop_0 controller-0" -> "all_stopped" [ style = bold] "ip-192.168.24.7_stop_0 controller-0" -> "ip-192.168.24.7_start_0 controller-2" [ style = bold] "ip-192.168.24.7_stop_0 controller-0" [ style=bold color="green" fontcolor="orange"] "rabbitmq-bundle-0_monitor_0 controller-1" -> "rabbitmq-bundle-0_start_0 controller-1" [ style = dashed] @@ -107,7 +95,6 @@ digraph "g" { "rabbitmq-bundle-0_start_0 controller-1" -> "rabbitmq_monitor_10000 rabbitmq-bundle-0" [ style = dashed] "rabbitmq-bundle-0_start_0 controller-1" -> "rabbitmq_start_0 rabbitmq-bundle-0" [ style = dashed] "rabbitmq-bundle-0_start_0 controller-1" [ style=dashed color="red" fontcolor="black"] -"rabbitmq-bundle-0_stop_0 controller-0" -> "all_stopped" [ style = bold] "rabbitmq-bundle-0_stop_0 controller-0" -> "rabbitmq-bundle-0_start_0 controller-1" [ style = dashed] "rabbitmq-bundle-0_stop_0 controller-0" -> "rabbitmq-bundle-docker-0_stop_0 controller-0" [ style = bold] "rabbitmq-bundle-0_stop_0 controller-0" [ style=bold color="green" fontcolor="orange"] @@ -115,7 +102,6 @@ digraph "g" { "rabbitmq-bundle-2_monitor_0 controller-1" [ style=bold color="green" fontcolor="black"] "rabbitmq-bundle-clone_confirmed-post_notify_running_0" -> "rabbitmq-bundle_running_0" [ style = bold] "rabbitmq-bundle-clone_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange"] -"rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "rabbitmq-bundle-clone_pre_notify_start_0" [ style = bold] "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "rabbitmq-bundle_stopped_0" [ style = bold] "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"] @@ -148,7 +134,6 @@ digraph "g" { "rabbitmq-bundle-clone_stopped_0" -> "rabbitmq-bundle-clone_post_notify_stopped_0" [ style = bold] "rabbitmq-bundle-clone_stopped_0" -> "rabbitmq-bundle-clone_start_0" [ style = bold] "rabbitmq-bundle-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rabbitmq-bundle-docker-0_stop_0 controller-0" -> "all_stopped" [ style = bold] "rabbitmq-bundle-docker-0_stop_0 controller-0" -> "rabbitmq-bundle_stopped_0" [ style = bold] "rabbitmq-bundle-docker-0_stop_0 controller-0" [ style=bold color="green" fontcolor="orange"] "rabbitmq-bundle_running_0" [ style=bold color="green" fontcolor="orange"] @@ -159,7 +144,6 @@ digraph "g" { "rabbitmq-bundle_stop_0" -> "rabbitmq_stop_0 rabbitmq-bundle-0" [ style = bold] "rabbitmq-bundle_stop_0" [ style=bold color="green" fontcolor="orange"] "rabbitmq-bundle_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rabbitmq_confirmed-post_notify_stonith_0" -> "all_stopped" [ style = bold] "rabbitmq_confirmed-post_notify_stonith_0" [ style=bold color="green" fontcolor="orange"] "rabbitmq_monitor_10000 rabbitmq-bundle-0" [ style=dashed color="red" fontcolor="black"] "rabbitmq_post_notify_stonith_0 rabbitmq-bundle-1" -> "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" [ style = bold] @@ -179,7 +163,6 @@ digraph "g" { "rabbitmq_start_0 rabbitmq-bundle-0" -> "rabbitmq-bundle-clone_running_0" [ style = dashed] "rabbitmq_start_0 rabbitmq-bundle-0" -> "rabbitmq_monitor_10000 rabbitmq-bundle-0" [ style = dashed] "rabbitmq_start_0 rabbitmq-bundle-0" [ style=dashed color="red" fontcolor="black"] -"rabbitmq_stop_0 rabbitmq-bundle-0" -> "all_stopped" [ style = bold] "rabbitmq_stop_0 rabbitmq-bundle-0" -> "rabbitmq-bundle-clone_stopped_0" [ style = bold] "rabbitmq_stop_0 rabbitmq-bundle-0" -> "rabbitmq_start_0 rabbitmq-bundle-0" [ style = dashed] "rabbitmq_stop_0 rabbitmq-bundle-0" [ style=bold color="green" fontcolor="orange"] @@ -193,13 +176,11 @@ digraph "g" { "redis-bundle-0_start_0 controller-1" -> "redis_monitor_60000 redis-bundle-0" [ style = dashed] "redis-bundle-0_start_0 controller-1" -> "redis_start_0 redis-bundle-0" [ style = dashed] "redis-bundle-0_start_0 controller-1" [ style=dashed color="red" fontcolor="black"] -"redis-bundle-0_stop_0 controller-0" -> "all_stopped" [ style = bold] "redis-bundle-0_stop_0 controller-0" -> "redis-bundle-0_start_0 controller-1" [ style = dashed] "redis-bundle-0_stop_0 controller-0" -> "redis-bundle-docker-0_stop_0 controller-0" [ style = bold] "redis-bundle-0_stop_0 controller-0" [ style=bold color="green" fontcolor="orange"] "redis-bundle-1_monitor_0 controller-2" [ style=bold color="green" fontcolor="black"] "redis-bundle-2_monitor_0 controller-1" [ style=bold color="green" fontcolor="black"] -"redis-bundle-docker-0_stop_0 controller-0" -> "all_stopped" [ style = bold] "redis-bundle-docker-0_stop_0 controller-0" -> "redis-bundle_stopped_0" [ style = bold] "redis-bundle-docker-0_stop_0 controller-0" [ style=bold color="green" fontcolor="orange"] "redis-bundle-master_confirmed-post_notify_demoted_0" -> "redis-bundle-master_pre_notify_promote_0" [ style = bold] @@ -214,7 +195,6 @@ digraph "g" { "redis-bundle-master_confirmed-post_notify_running_0" -> "redis-bundle-master_pre_notify_promote_0" [ style = bold] "redis-bundle-master_confirmed-post_notify_running_0" -> "redis-bundle_running_0" [ style = bold] "redis-bundle-master_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange"] -"redis-bundle-master_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "redis-bundle-master_confirmed-post_notify_stopped_0" -> "redis-bundle-master_pre_notify_promote_0" [ style = bold] "redis-bundle-master_confirmed-post_notify_stopped_0" -> "redis-bundle-master_pre_notify_start_0" [ style = bold] "redis-bundle-master_confirmed-post_notify_stopped_0" -> "redis-bundle_stopped_0" [ style = bold] @@ -289,7 +269,6 @@ digraph "g" { "redis-bundle_demote_0" -> "redis-bundle_demoted_0" [ style = bold] "redis-bundle_demote_0" [ style=bold color="green" fontcolor="orange"] "redis-bundle_demoted_0" -> "redis-bundle_promote_0" [ style = bold] -"redis-bundle_demoted_0" -> "redis-bundle_start_0" [ style = bold] "redis-bundle_demoted_0" -> "redis-bundle_stop_0" [ style = bold] "redis-bundle_demoted_0" [ style=bold color="green" fontcolor="orange"] "redis-bundle_promote_0" -> "redis-bundle-master_promote_0" [ style = bold] @@ -297,16 +276,12 @@ digraph "g" { "redis-bundle_promoted_0" [ style=bold color="green" fontcolor="orange"] "redis-bundle_running_0" -> "redis-bundle_promote_0" [ style = bold] "redis-bundle_running_0" [ style=bold color="green" fontcolor="orange"] -"redis-bundle_start_0" -> "redis-bundle-master_start_0" [ style = bold] -"redis-bundle_start_0" [ style=bold color="green" fontcolor="orange"] "redis-bundle_stop_0" -> "redis-bundle-docker-0_stop_0 controller-0" [ style = bold] "redis-bundle_stop_0" -> "redis-bundle-master_stop_0" [ style = bold] "redis-bundle_stop_0" -> "redis_stop_0 redis-bundle-0" [ style = bold] "redis-bundle_stop_0" [ style=bold color="green" fontcolor="orange"] "redis-bundle_stopped_0" -> "redis-bundle_promote_0" [ style = bold] -"redis-bundle_stopped_0" -> "redis-bundle_start_0" [ style = bold] "redis-bundle_stopped_0" [ style=bold color="green" fontcolor="orange"] -"redis_confirmed-post_notify_stonith_0" -> "all_stopped" [ style = bold] "redis_confirmed-post_notify_stonith_0" -> "redis_monitor_20000 redis-bundle-1" [ style = bold] "redis_confirmed-post_notify_stonith_0" [ style=bold color="green" fontcolor="orange"] "redis_demote_0 redis-bundle-0" -> "redis-bundle-master_demoted_0" [ style = bold] @@ -354,52 +329,64 @@ digraph "g" { "redis_start_0 redis-bundle-0" -> "redis_monitor_45000 redis-bundle-0" [ style = dashed] "redis_start_0 redis-bundle-0" -> "redis_monitor_60000 redis-bundle-0" [ style = dashed] "redis_start_0 redis-bundle-0" [ style=dashed color="red" fontcolor="black"] -"redis_stop_0 redis-bundle-0" -> "all_stopped" [ style = bold] "redis_stop_0 redis-bundle-0" -> "redis-bundle-master_stopped_0" [ style = bold] "redis_stop_0 redis-bundle-0" -> "redis_start_0 redis-bundle-0" [ style = dashed] "redis_stop_0 redis-bundle-0" [ style=bold color="green" fontcolor="orange"] "stonith 'off' galera-bundle-0" -> "galera-bundle-master_stop_0" [ style = bold] -"stonith 'off' galera-bundle-0" -> "stonith_complete" [ style = bold] +"stonith 'off' galera-bundle-0" -> "galera_start_0 galera-bundle-0" [ style = dashed] +"stonith 'off' galera-bundle-0" -> "ip-10.0.0.109_start_0 controller-1" [ style = bold] +"stonith 'off' galera-bundle-0" -> "ip-172.17.4.11_start_0 controller-1" [ style = bold] +"stonith 'off' galera-bundle-0" -> "ip-192.168.24.7_start_0 controller-2" [ style = bold] +"stonith 'off' galera-bundle-0" -> "rabbitmq_start_0 rabbitmq-bundle-0" [ style = dashed] +"stonith 'off' galera-bundle-0" -> "redis_promote_0 redis-bundle-1" [ style = bold] +"stonith 'off' galera-bundle-0" -> "redis_start_0 redis-bundle-0" [ style = dashed] "stonith 'off' galera-bundle-0" [ style=bold color="green" fontcolor="orange"] +"stonith 'off' rabbitmq-bundle-0" -> "galera_start_0 galera-bundle-0" [ style = dashed] +"stonith 'off' rabbitmq-bundle-0" -> "ip-10.0.0.109_start_0 controller-1" [ style = bold] +"stonith 'off' rabbitmq-bundle-0" -> "ip-172.17.4.11_start_0 controller-1" [ style = bold] +"stonith 'off' rabbitmq-bundle-0" -> "ip-192.168.24.7_start_0 controller-2" [ style = bold] "stonith 'off' rabbitmq-bundle-0" -> "rabbitmq-bundle-clone_stop_0" [ style = bold] "stonith 'off' rabbitmq-bundle-0" -> "rabbitmq_post_notify_stonith_0" [ style = bold] -"stonith 'off' rabbitmq-bundle-0" -> "stonith_complete" [ style = bold] +"stonith 'off' rabbitmq-bundle-0" -> "rabbitmq_start_0 rabbitmq-bundle-0" [ style = dashed] +"stonith 'off' rabbitmq-bundle-0" -> "redis_promote_0 redis-bundle-1" [ style = bold] +"stonith 'off' rabbitmq-bundle-0" -> "redis_start_0 redis-bundle-0" [ style = dashed] "stonith 'off' rabbitmq-bundle-0" [ style=bold color="green" fontcolor="orange"] +"stonith 'off' redis-bundle-0" -> "galera_start_0 galera-bundle-0" [ style = dashed] +"stonith 'off' redis-bundle-0" -> "ip-10.0.0.109_start_0 controller-1" [ style = bold] +"stonith 'off' redis-bundle-0" -> "ip-172.17.4.11_start_0 controller-1" [ style = bold] +"stonith 'off' redis-bundle-0" -> "ip-192.168.24.7_start_0 controller-2" [ style = bold] +"stonith 'off' redis-bundle-0" -> "rabbitmq_start_0 rabbitmq-bundle-0" [ style = dashed] "stonith 'off' redis-bundle-0" -> "redis-bundle-master_stop_0" [ style = bold] "stonith 'off' redis-bundle-0" -> "redis_post_notify_stonith_0" [ style = bold] -"stonith 'off' redis-bundle-0" -> "stonith_complete" [ style = bold] +"stonith 'off' redis-bundle-0" -> "redis_promote_0 redis-bundle-1" [ style = bold] +"stonith 'off' redis-bundle-0" -> "redis_start_0 redis-bundle-0" [ style = dashed] "stonith 'off' redis-bundle-0" [ style=bold color="green" fontcolor="orange"] "stonith 'reboot' controller-0" -> "galera-bundle-docker-0_stop_0 controller-0" [ style = bold] +"stonith 'reboot' controller-0" -> "galera_start_0 galera-bundle-0" [ style = dashed] "stonith 'reboot' controller-0" -> "haproxy-bundle-docker-0_stop_0 controller-0" [ style = bold] +"stonith 'reboot' controller-0" -> "ip-10.0.0.109_start_0 controller-1" [ style = bold] "stonith 'reboot' controller-0" -> "ip-10.0.0.109_stop_0 controller-0" [ style = bold] +"stonith 'reboot' controller-0" -> "ip-172.17.4.11_start_0 controller-1" [ style = bold] "stonith 'reboot' controller-0" -> "ip-172.17.4.11_stop_0 controller-0" [ style = bold] +"stonith 'reboot' controller-0" -> "ip-192.168.24.7_start_0 controller-2" [ style = bold] "stonith 'reboot' controller-0" -> "ip-192.168.24.7_stop_0 controller-0" [ style = bold] "stonith 'reboot' controller-0" -> "rabbitmq-bundle-docker-0_stop_0 controller-0" [ style = bold] +"stonith 'reboot' controller-0" -> "rabbitmq_start_0 rabbitmq-bundle-0" [ style = dashed] "stonith 'reboot' controller-0" -> "redis-bundle-docker-0_stop_0 controller-0" [ style = bold] +"stonith 'reboot' controller-0" -> "redis_promote_0 redis-bundle-1" [ style = bold] +"stonith 'reboot' controller-0" -> "redis_start_0 redis-bundle-0" [ style = dashed] "stonith 'reboot' controller-0" -> "stonith 'off' galera-bundle-0" [ style = bold] "stonith 'reboot' controller-0" -> "stonith 'off' rabbitmq-bundle-0" [ style = bold] "stonith 'reboot' controller-0" -> "stonith 'off' redis-bundle-0" [ style = bold] -"stonith 'reboot' controller-0" -> "stonith_complete" [ style = bold] "stonith 'reboot' controller-0" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-5254000dcb3f_monitor_60000 controller-2" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-5254000dcb3f_start_0 controller-2" -> "stonith-fence_ipmilan-5254000dcb3f_monitor_60000 controller-2" [ style = bold] "stonith-fence_ipmilan-5254000dcb3f_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"stonith-fence_ipmilan-5254000dcb3f_stop_0 controller-0" -> "all_stopped" [ style = bold] "stonith-fence_ipmilan-5254000dcb3f_stop_0 controller-0" -> "stonith-fence_ipmilan-5254000dcb3f_start_0 controller-2" [ style = bold] "stonith-fence_ipmilan-5254000dcb3f_stop_0 controller-0" [ style=bold color="green" fontcolor="orange"] "stonith-fence_ipmilan-5254003e8e97_monitor_60000 controller-1" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-5254003e8e97_start_0 controller-1" -> "stonith-fence_ipmilan-5254003e8e97_monitor_60000 controller-1" [ style = bold] "stonith-fence_ipmilan-5254003e8e97_start_0 controller-1" [ style=bold color="green" fontcolor="black"] -"stonith-fence_ipmilan-5254003e8e97_stop_0 controller-0" -> "all_stopped" [ style = bold] "stonith-fence_ipmilan-5254003e8e97_stop_0 controller-0" -> "stonith-fence_ipmilan-5254003e8e97_start_0 controller-1" [ style = bold] "stonith-fence_ipmilan-5254003e8e97_stop_0 controller-0" [ style=bold color="green" fontcolor="orange"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "galera_start_0 galera-bundle-0" [ style = dashed] -"stonith_complete" -> "ip-10.0.0.109_start_0 controller-1" [ style = bold] -"stonith_complete" -> "ip-172.17.4.11_start_0 controller-1" [ style = bold] -"stonith_complete" -> "ip-192.168.24.7_start_0 controller-2" [ style = bold] -"stonith_complete" -> "rabbitmq_start_0 rabbitmq-bundle-0" [ style = dashed] -"stonith_complete" -> "redis_promote_0 redis-bundle-1" [ style = bold] -"stonith_complete" -> "redis_start_0 redis-bundle-0" [ style = dashed] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/bundle-order-fencing.exp b/pengine/test10/bundle-order-fencing.exp index 84bffaa..7be9a94 100644 --- a/pengine/test10/bundle-order-fencing.exp +++ b/pengine/test10/bundle-order-fencing.exp @@ -1,161 +1,161 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -163,121 +163,121 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -286,16 +286,16 @@ - + - + - + @@ -303,7 +303,7 @@ - + @@ -312,7 +312,7 @@ - + @@ -321,7 +321,7 @@ - + @@ -330,7 +330,7 @@ - + @@ -339,127 +339,124 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + - + @@ -468,16 +465,16 @@ - + - + - + @@ -485,7 +482,7 @@ - + @@ -494,7 +491,7 @@ - + @@ -503,7 +500,7 @@ - + @@ -512,7 +509,7 @@ - + @@ -521,189 +518,198 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + + + + + + + - + @@ -727,139 +733,139 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -867,328 +873,325 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + - + - + - + @@ -1197,16 +1200,16 @@ - + - + - + @@ -1214,7 +1217,7 @@ - + @@ -1223,7 +1226,7 @@ - + @@ -1232,7 +1235,7 @@ - + @@ -1241,7 +1244,7 @@ - + @@ -1250,36 +1253,45 @@ - + - + - + - + + + + + + + - + + + + - + @@ -1288,42 +1300,51 @@ - + - + - + - + - + + + + + + + + + + - + - + @@ -1332,42 +1353,51 @@ - + - + - + - + - + + + + + + + + + + - + - + @@ -1376,13 +1406,13 @@ - + - + @@ -1391,39 +1421,39 @@ - + - + - + - + - + - + @@ -1431,33 +1461,33 @@ - + - + - + - + - + @@ -1465,7 +1495,7 @@ - + @@ -1480,7 +1510,7 @@ - + @@ -1495,7 +1525,7 @@ - + @@ -1508,344 +1538,224 @@ - + - - - - - - - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - + - - - - - - - - - - + - + - + - + - + - + - - - - + - + - + - + - + - + - + - + - + - - - - + - - - - - - - - - - + - + - + - + - + - + - - - - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/bundle-order-fencing.summary b/pengine/test10/bundle-order-fencing.summary index a3dc3d4..5555625 100644 --- a/pengine/test10/bundle-order-fencing.summary +++ b/pengine/test10/bundle-order-fencing.summary @@ -97,7 +97,6 @@ Executing cluster transition: * Pseudo action: stonith-redis-bundle-0-off on redis-bundle-0 * Pseudo action: stonith-rabbitmq-bundle-0-off on rabbitmq-bundle-0 * Pseudo action: stonith-galera-bundle-0-off on galera-bundle-0 - * Pseudo action: stonith_complete * Pseudo action: haproxy-bundle_stopped_0 * Pseudo action: rabbitmq_post_notify_stop_0 * Pseudo action: rabbitmq-bundle-clone_stop_0 @@ -124,6 +123,7 @@ Executing cluster transition: * Pseudo action: rabbitmq-bundle-clone_post_notify_stopped_0 * Pseudo action: galera_stop_0 * Pseudo action: galera-bundle-master_stopped_0 + * Pseudo action: galera-bundle-master_start_0 * Resource action: redis notify on redis-bundle-1 * Resource action: redis notify on redis-bundle-2 * Pseudo action: redis-bundle-master_confirmed-post_notify_demoted_0 @@ -134,25 +134,23 @@ Executing cluster transition: * Pseudo action: redis-bundle_demoted_0 * Pseudo action: redis-bundle_stop_0 * Pseudo action: galera-bundle_stopped_0 - * Pseudo action: galera-bundle_start_0 * Resource action: rabbitmq notify on rabbitmq-bundle-1 * Resource action: rabbitmq notify on rabbitmq-bundle-2 * Pseudo action: rabbitmq-bundle-clone_confirmed-post_notify_stopped_0 * Pseudo action: rabbitmq-bundle-clone_pre_notify_start_0 - * Pseudo action: galera-bundle-master_start_0 + * Pseudo action: galera-bundle-master_running_0 * Resource action: redis notify on redis-bundle-1 * Resource action: redis notify on redis-bundle-2 * Pseudo action: redis-bundle-master_confirmed-pre_notify_stop_0 * Pseudo action: redis-bundle-master_stop_0 * Pseudo action: redis-bundle-docker-0_stop_0 + * Pseudo action: galera-bundle_running_0 * Pseudo action: rabbitmq-bundle_stopped_0 * Pseudo action: rabbitmq_notified_0 * Pseudo action: rabbitmq-bundle-clone_confirmed-pre_notify_start_0 * Pseudo action: rabbitmq-bundle-clone_start_0 - * Pseudo action: galera-bundle-master_running_0 * Pseudo action: redis_stop_0 * Pseudo action: redis-bundle-master_stopped_0 - * Pseudo action: galera-bundle_running_0 * Pseudo action: rabbitmq-bundle-clone_running_0 * Pseudo action: redis-bundle-master_post_notify_stopped_0 * Pseudo action: rabbitmq-bundle-clone_post_notify_running_0 @@ -161,13 +159,11 @@ Executing cluster transition: * Pseudo action: redis-bundle-master_confirmed-post_notify_stopped_0 * Pseudo action: redis-bundle-master_pre_notify_start_0 * Pseudo action: redis-bundle_stopped_0 - * Pseudo action: redis-bundle_start_0 * Pseudo action: rabbitmq-bundle-clone_confirmed-post_notify_running_0 * Pseudo action: redis_notified_0 * Pseudo action: redis-bundle-master_confirmed-pre_notify_start_0 * Pseudo action: redis-bundle-master_start_0 * Pseudo action: rabbitmq-bundle_running_0 - * Pseudo action: all_stopped * Pseudo action: redis-bundle-master_running_0 * Pseudo action: redis-bundle-master_post_notify_running_0 * Pseudo action: redis-bundle-master_confirmed-post_notify_running_0 diff --git a/pengine/test10/bundle-order-partial-start-2.dot b/pengine/test10/bundle-order-partial-start-2.dot index 08c768d..71646d1 100644 --- a/pengine/test10/bundle-order-partial-start-2.dot +++ b/pengine/test10/bundle-order-partial-start-2.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "galera-bundle-0_monitor_60000 undercloud" [ style=bold color="green" fontcolor="black"] "galera-bundle-0_start_0 undercloud" -> "galera-bundle-0_monitor_60000 undercloud" [ style = bold] "galera-bundle-0_start_0 undercloud" -> "galera:0_monitor_0 galera-bundle-0" [ style = bold] @@ -7,7 +6,6 @@ digraph "g" { "galera-bundle-0_start_0 undercloud" -> "galera:0_monitor_30000 galera-bundle-0" [ style = bold] "galera-bundle-0_start_0 undercloud" -> "galera:0_start_0 galera-bundle-0" [ style = bold] "galera-bundle-0_start_0 undercloud" [ style=bold color="green" fontcolor="black"] -"galera-bundle-0_stop_0 undercloud" -> "all_stopped" [ style = bold] "galera-bundle-0_stop_0 undercloud" -> "galera-bundle-0_start_0 undercloud" [ style = bold] "galera-bundle-0_stop_0 undercloud" -> "galera-bundle-docker-0_stop_0 undercloud" [ style = bold] "galera-bundle-0_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] @@ -17,7 +15,6 @@ digraph "g" { "galera-bundle-docker-0_start_0 undercloud" -> "galera-bundle_running_0" [ style = bold] "galera-bundle-docker-0_start_0 undercloud" -> "galera:0_start_0 galera-bundle-0" [ style = bold] "galera-bundle-docker-0_start_0 undercloud" [ style=bold color="green" fontcolor="black"] -"galera-bundle-docker-0_stop_0 undercloud" -> "all_stopped" [ style = bold] "galera-bundle-docker-0_stop_0 undercloud" -> "galera-bundle-docker-0_start_0 undercloud" [ style = bold] "galera-bundle-docker-0_stop_0 undercloud" -> "galera-bundle_stopped_0" [ style = bold] "galera-bundle-docker-0_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/bundle-order-partial-start-2.exp b/pengine/test10/bundle-order-partial-start-2.exp index 168ec7a..4bf359a 100644 --- a/pengine/test10/bundle-order-partial-start-2.exp +++ b/pengine/test10/bundle-order-partial-start-2.exp @@ -1,49 +1,49 @@ - + - + - + - + - + - + - + - + @@ -52,49 +52,49 @@ - + - + - + - + - + - + - + - + - + @@ -102,160 +102,160 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -268,29 +268,29 @@ - + - + - + - + - + @@ -309,113 +309,113 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -423,63 +423,63 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -488,19 +488,19 @@ - + - + - + @@ -508,19 +508,19 @@ - + - + - + @@ -528,19 +528,19 @@ - + - + - + @@ -548,73 +548,58 @@ - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - diff --git a/pengine/test10/bundle-order-partial-start-2.summary b/pengine/test10/bundle-order-partial-start-2.summary index 2e88bee..21aff0e 100644 --- a/pengine/test10/bundle-order-partial-start-2.summary +++ b/pengine/test10/bundle-order-partial-start-2.summary @@ -47,7 +47,6 @@ Executing cluster transition: * Resource action: haproxy-bundle-docker-0 start on undercloud * Pseudo action: haproxy-bundle_running_0 * Pseudo action: galera-bundle_stopped_0 - * Pseudo action: all_stopped * Resource action: rabbitmq:0 start on rabbitmq-bundle-0 * Pseudo action: rabbitmq-bundle-clone_running_0 * Resource action: redis promote on redis-bundle-0 diff --git a/pengine/test10/bundle-order-partial-start.exp b/pengine/test10/bundle-order-partial-start.exp index 5e80822..ae16ea7 100644 --- a/pengine/test10/bundle-order-partial-start.exp +++ b/pengine/test10/bundle-order-partial-start.exp @@ -1,49 +1,49 @@ - + - + - + - + - + - + - + - + @@ -52,49 +52,49 @@ - + - + - + - + - + - + - + - + - + @@ -102,150 +102,150 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -254,149 +254,149 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -404,63 +404,63 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -469,19 +469,19 @@ - + - + - + @@ -489,19 +489,19 @@ - + - + - + @@ -509,52 +509,52 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/bundle-order-partial-stop.dot b/pengine/test10/bundle-order-partial-stop.dot index 6bad4ab..2bd8157 100644 --- a/pengine/test10/bundle-order-partial-stop.dot +++ b/pengine/test10/bundle-order-partial-stop.dot @@ -3,13 +3,10 @@ digraph "g" { "Cancel galera_monitor_10000 galera-bundle-0" [ style=bold color="green" fontcolor="black"] "Cancel redis_monitor_20000 redis-bundle-0" -> "redis_demote_0 redis-bundle-0" [ style = bold] "Cancel redis_monitor_20000 redis-bundle-0" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "do_shutdown undercloud" [ style=bold color="green" fontcolor="black"] -"galera-bundle-0_stop_0 undercloud" -> "all_stopped" [ style = bold] "galera-bundle-0_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "galera-bundle-0_stop_0 undercloud" -> "galera-bundle-docker-0_stop_0 undercloud" [ style = bold] "galera-bundle-0_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] -"galera-bundle-docker-0_stop_0 undercloud" -> "all_stopped" [ style = bold] "galera-bundle-docker-0_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "galera-bundle-docker-0_stop_0 undercloud" -> "galera-bundle_stopped_0" [ style = bold] "galera-bundle-docker-0_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] @@ -53,12 +50,10 @@ digraph "g" { "galera_start_0 galera-bundle-0" -> "galera_monitor_20000 galera-bundle-0" [ style = dashed] "galera_start_0 galera-bundle-0" -> "galera_monitor_30000 galera-bundle-0" [ style = dashed] "galera_start_0 galera-bundle-0" [ style=dashed color="red" fontcolor="black"] -"galera_stop_0 galera-bundle-0" -> "all_stopped" [ style = bold] "galera_stop_0 galera-bundle-0" -> "galera-bundle-0_stop_0 undercloud" [ style = bold] "galera_stop_0 galera-bundle-0" -> "galera-bundle-master_stopped_0" [ style = bold] "galera_stop_0 galera-bundle-0" -> "galera_start_0 galera-bundle-0" [ style = dashed] "galera_stop_0 galera-bundle-0" [ style=bold color="green" fontcolor="black"] -"haproxy-bundle-docker-0_stop_0 undercloud" -> "all_stopped" [ style = bold] "haproxy-bundle-docker-0_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "haproxy-bundle-docker-0_stop_0 undercloud" -> "haproxy-bundle_stopped_0" [ style = bold] "haproxy-bundle-docker-0_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] @@ -72,48 +67,39 @@ digraph "g" { "haproxy-bundle_stopped_0" -> "ip-192.168.122.254_stop_0 undercloud" [ style = bold] "haproxy-bundle_stopped_0" [ style=bold color="green" fontcolor="orange"] "ip-192.168.122.247_start_0 " [ style=dashed color="red" fontcolor="black"] -"ip-192.168.122.247_stop_0 undercloud" -> "all_stopped" [ style = bold] "ip-192.168.122.247_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "ip-192.168.122.247_stop_0 undercloud" -> "ip-192.168.122.247_start_0 " [ style = dashed] "ip-192.168.122.247_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] "ip-192.168.122.248_start_0 " [ style=dashed color="red" fontcolor="black"] -"ip-192.168.122.248_stop_0 undercloud" -> "all_stopped" [ style = bold] "ip-192.168.122.248_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "ip-192.168.122.248_stop_0 undercloud" -> "ip-192.168.122.248_start_0 " [ style = dashed] "ip-192.168.122.248_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] "ip-192.168.122.249_start_0 " [ style=dashed color="red" fontcolor="black"] -"ip-192.168.122.249_stop_0 undercloud" -> "all_stopped" [ style = bold] "ip-192.168.122.249_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "ip-192.168.122.249_stop_0 undercloud" -> "ip-192.168.122.249_start_0 " [ style = dashed] "ip-192.168.122.249_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] "ip-192.168.122.250_start_0 " [ style=dashed color="red" fontcolor="black"] -"ip-192.168.122.250_stop_0 undercloud" -> "all_stopped" [ style = bold] "ip-192.168.122.250_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "ip-192.168.122.250_stop_0 undercloud" -> "ip-192.168.122.250_start_0 " [ style = dashed] "ip-192.168.122.250_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] "ip-192.168.122.253_start_0 " [ style=dashed color="red" fontcolor="black"] -"ip-192.168.122.253_stop_0 undercloud" -> "all_stopped" [ style = bold] "ip-192.168.122.253_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "ip-192.168.122.253_stop_0 undercloud" -> "ip-192.168.122.253_start_0 " [ style = dashed] "ip-192.168.122.253_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] "ip-192.168.122.254_start_0 " [ style=dashed color="red" fontcolor="black"] -"ip-192.168.122.254_stop_0 undercloud" -> "all_stopped" [ style = bold] "ip-192.168.122.254_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "ip-192.168.122.254_stop_0 undercloud" -> "ip-192.168.122.254_start_0 " [ style = dashed] "ip-192.168.122.254_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] -"openstack-cinder-volume-docker-0_stop_0 undercloud" -> "all_stopped" [ style = bold] "openstack-cinder-volume-docker-0_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "openstack-cinder-volume-docker-0_stop_0 undercloud" -> "openstack-cinder-volume_stopped_0" [ style = bold] "openstack-cinder-volume-docker-0_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] "openstack-cinder-volume_stop_0" -> "openstack-cinder-volume-docker-0_stop_0 undercloud" [ style = bold] "openstack-cinder-volume_stop_0" [ style=bold color="green" fontcolor="orange"] "openstack-cinder-volume_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rabbitmq-bundle-0_stop_0 undercloud" -> "all_stopped" [ style = bold] "rabbitmq-bundle-0_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "rabbitmq-bundle-0_stop_0 undercloud" -> "rabbitmq-bundle-docker-0_stop_0 undercloud" [ style = bold] "rabbitmq-bundle-0_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] "rabbitmq-bundle-clone_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"] -"rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "rabbitmq-bundle-clone_pre_notify_start_0" [ style = dashed] "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "rabbitmq-bundle_stopped_0" [ style = bold] "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"] @@ -143,7 +129,6 @@ digraph "g" { "rabbitmq-bundle-clone_stopped_0" -> "rabbitmq-bundle-clone_post_notify_stopped_0" [ style = bold] "rabbitmq-bundle-clone_stopped_0" -> "rabbitmq-bundle-clone_start_0" [ style = dashed] "rabbitmq-bundle-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rabbitmq-bundle-docker-0_stop_0 undercloud" -> "all_stopped" [ style = bold] "rabbitmq-bundle-docker-0_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "rabbitmq-bundle-docker-0_stop_0 undercloud" -> "rabbitmq-bundle_stopped_0" [ style = bold] "rabbitmq-bundle-docker-0_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] @@ -158,16 +143,13 @@ digraph "g" { "rabbitmq_start_0 rabbitmq-bundle-0" -> "rabbitmq-bundle-clone_running_0" [ style = dashed] "rabbitmq_start_0 rabbitmq-bundle-0" -> "rabbitmq_monitor_10000 rabbitmq-bundle-0" [ style = dashed] "rabbitmq_start_0 rabbitmq-bundle-0" [ style=dashed color="red" fontcolor="black"] -"rabbitmq_stop_0 rabbitmq-bundle-0" -> "all_stopped" [ style = bold] "rabbitmq_stop_0 rabbitmq-bundle-0" -> "rabbitmq-bundle-0_stop_0 undercloud" [ style = bold] "rabbitmq_stop_0 rabbitmq-bundle-0" -> "rabbitmq-bundle-clone_stopped_0" [ style = bold] "rabbitmq_stop_0 rabbitmq-bundle-0" -> "rabbitmq_start_0 rabbitmq-bundle-0" [ style = dashed] "rabbitmq_stop_0 rabbitmq-bundle-0" [ style=bold color="green" fontcolor="black"] -"redis-bundle-0_stop_0 undercloud" -> "all_stopped" [ style = bold] "redis-bundle-0_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "redis-bundle-0_stop_0 undercloud" -> "redis-bundle-docker-0_stop_0 undercloud" [ style = bold] "redis-bundle-0_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] -"redis-bundle-docker-0_stop_0 undercloud" -> "all_stopped" [ style = bold] "redis-bundle-docker-0_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "redis-bundle-docker-0_stop_0 undercloud" -> "redis-bundle_stopped_0" [ style = bold] "redis-bundle-docker-0_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] @@ -178,7 +160,6 @@ digraph "g" { "redis-bundle-master_confirmed-post_notify_demoted_0" -> "redis_monitor_60000 redis-bundle-0" [ style = dashed] "redis-bundle-master_confirmed-post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"] "redis-bundle-master_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"] -"redis-bundle-master_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "redis-bundle-master_confirmed-post_notify_stopped_0" -> "redis-bundle-master_pre_notify_start_0" [ style = dashed] "redis-bundle-master_confirmed-post_notify_stopped_0" -> "redis-bundle_stopped_0" [ style = bold] "redis-bundle-master_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"] @@ -253,7 +234,6 @@ digraph "g" { "redis_start_0 redis-bundle-0" -> "redis_monitor_45000 redis-bundle-0" [ style = dashed] "redis_start_0 redis-bundle-0" -> "redis_monitor_60000 redis-bundle-0" [ style = dashed] "redis_start_0 redis-bundle-0" [ style=dashed color="red" fontcolor="black"] -"redis_stop_0 redis-bundle-0" -> "all_stopped" [ style = bold] "redis_stop_0 redis-bundle-0" -> "redis-bundle-0_stop_0 undercloud" [ style = bold] "redis_stop_0 redis-bundle-0" -> "redis-bundle-master_stopped_0" [ style = bold] "redis_stop_0 redis-bundle-0" -> "redis_start_0 redis-bundle-0" [ style = dashed] diff --git a/pengine/test10/bundle-order-partial-stop.exp b/pengine/test10/bundle-order-partial-stop.exp index 626fc44..983d7b7 100644 --- a/pengine/test10/bundle-order-partial-stop.exp +++ b/pengine/test10/bundle-order-partial-stop.exp @@ -1,78 +1,78 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -80,53 +80,53 @@ - + - + - + - + - + - + - + - + - + - + @@ -136,32 +136,32 @@ - + - + - + - + - + - + @@ -171,7 +171,7 @@ - + @@ -186,80 +186,80 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -269,74 +269,74 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -346,7 +346,7 @@ - + @@ -361,52 +361,52 @@ - + - + - + - + - + - + - + - + - + - + @@ -414,140 +414,140 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -557,120 +557,120 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -679,64 +679,64 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -744,46 +744,46 @@ - + - + - + - + - + - + - + - + @@ -791,52 +791,52 @@ - + - + - + - + - + - + - + - + - + - + @@ -844,118 +844,52 @@ - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/bundle-order-partial-stop.summary b/pengine/test10/bundle-order-partial-stop.summary index 29cf490..5d37904 100644 --- a/pengine/test10/bundle-order-partial-stop.summary +++ b/pengine/test10/bundle-order-partial-stop.summary @@ -103,7 +103,6 @@ Executing cluster transition: * Resource action: ip-192.168.122.247 stop on undercloud * Resource action: ip-192.168.122.248 stop on undercloud * Cluster action: do_shutdown on undercloud - * Pseudo action: all_stopped Revised cluster status: Online: [ undercloud ] diff --git a/pengine/test10/bundle-order-startup-clone-2.exp b/pengine/test10/bundle-order-startup-clone-2.exp index 22bfa37..2acd663 100644 --- a/pengine/test10/bundle-order-startup-clone-2.exp +++ b/pengine/test10/bundle-order-startup-clone-2.exp @@ -1,49 +1,49 @@ - + - + - + - + - + - + - + - + @@ -52,49 +52,49 @@ - + - + - + - + - + - + - + - + @@ -103,49 +103,49 @@ - + - + - + - + - + - + - + - + @@ -154,55 +154,55 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -210,315 +210,315 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -527,7 +527,7 @@ - + @@ -536,7 +536,7 @@ - + @@ -545,122 +545,122 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -669,7 +669,7 @@ - + @@ -678,7 +678,7 @@ - + @@ -687,122 +687,122 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -811,7 +811,7 @@ - + @@ -820,7 +820,7 @@ - + @@ -829,122 +829,122 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -953,7 +953,7 @@ - + @@ -962,7 +962,7 @@ - + @@ -971,48 +971,48 @@ - + - + - + - + - + - + - + - + - + - + @@ -1021,7 +1021,7 @@ - + @@ -1030,7 +1030,7 @@ - + @@ -1039,48 +1039,48 @@ - + - + - + - + - + - + - + - + - + - + @@ -1089,7 +1089,7 @@ - + @@ -1098,7 +1098,7 @@ - + @@ -1107,487 +1107,487 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1595,111 +1595,111 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1708,7 +1708,7 @@ - + @@ -1717,7 +1717,7 @@ - + @@ -1726,122 +1726,122 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1850,7 +1850,7 @@ - + @@ -1859,7 +1859,7 @@ - + @@ -1868,122 +1868,122 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1992,7 +1992,7 @@ - + @@ -2001,7 +2001,7 @@ - + @@ -2010,126 +2010,126 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2137,25 +2137,25 @@ - + - + - + - + - + @@ -2163,34 +2163,34 @@ - + - + - + - + - + - + - + diff --git a/pengine/test10/bundle-order-startup-clone.exp b/pengine/test10/bundle-order-startup-clone.exp index 42ee902..50ad366 100644 --- a/pengine/test10/bundle-order-startup-clone.exp +++ b/pengine/test10/bundle-order-startup-clone.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,42 +55,42 @@ - + - + - + - + - + - + - + - + @@ -99,7 +99,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -117,119 +117,119 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -237,81 +237,81 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -320,7 +320,7 @@ - + @@ -329,7 +329,7 @@ - + @@ -338,96 +338,96 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -435,19 +435,19 @@ - + - + - + diff --git a/pengine/test10/bundle-order-startup.exp b/pengine/test10/bundle-order-startup.exp index 1f83781..9169d17 100644 --- a/pengine/test10/bundle-order-startup.exp +++ b/pengine/test10/bundle-order-startup.exp @@ -1,100 +1,100 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -102,69 +102,69 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -173,159 +173,159 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -334,161 +334,161 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -496,69 +496,69 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -567,75 +567,75 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -644,33 +644,33 @@ - + - + - + - + - + @@ -679,33 +679,33 @@ - + - + - + - + - + @@ -714,33 +714,33 @@ - + - + - + - + - + @@ -749,33 +749,33 @@ - + - + - + - + - + @@ -784,33 +784,33 @@ - + - + - + - + - + @@ -819,36 +819,36 @@ - + - + - + - + - + - + @@ -857,36 +857,36 @@ - + - + - + - + - + - + @@ -895,19 +895,19 @@ - + - + - + @@ -915,115 +915,115 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/bundle-order-stop-clone.dot b/pengine/test10/bundle-order-stop-clone.dot index 48bb614..eb046ad 100644 --- a/pengine/test10/bundle-order-stop-clone.dot +++ b/pengine/test10/bundle-order-stop-clone.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "galera-bundle-0_monitor_0 metal-2" -> "galera-bundle-0_start_0 metal-1" [ style = dashed] "galera-bundle-0_monitor_0 metal-2" [ style=bold color="green" fontcolor="black"] "galera-bundle-0_monitor_0 metal-3" -> "galera-bundle-0_start_0 metal-1" [ style = dashed] @@ -10,7 +9,6 @@ digraph "g" { "galera-bundle-0_start_0 metal-1" -> "galera:0_monitor_30000 galera-bundle-0" [ style = dashed] "galera-bundle-0_start_0 metal-1" -> "galera:0_start_0 galera-bundle-0" [ style = dashed] "galera-bundle-0_start_0 metal-1" [ style=dashed color="red" fontcolor="black"] -"galera-bundle-0_stop_0 metal-1" -> "all_stopped" [ style = bold] "galera-bundle-0_stop_0 metal-1" -> "galera-bundle-0_start_0 metal-1" [ style = dashed] "galera-bundle-0_stop_0 metal-1" -> "galera-bundle-docker-0_stop_0 metal-1" [ style = bold] "galera-bundle-0_stop_0 metal-1" [ style=bold color="green" fontcolor="black"] @@ -18,7 +16,6 @@ digraph "g" { "galera-bundle-1_monitor_0 metal-3" [ style=bold color="green" fontcolor="black"] "galera-bundle-2_monitor_0 metal-1" [ style=bold color="green" fontcolor="black"] "galera-bundle-2_monitor_0 metal-2" [ style=bold color="green" fontcolor="black"] -"galera-bundle-docker-0_stop_0 metal-1" -> "all_stopped" [ style = bold] "galera-bundle-docker-0_stop_0 metal-1" -> "galera-bundle_stopped_0" [ style = bold] "galera-bundle-docker-0_stop_0 metal-1" [ style=bold color="green" fontcolor="black"] "galera-bundle-master_running_0" -> "galera-bundle_running_0" [ style = bold] @@ -48,7 +45,6 @@ digraph "g" { "galera:0_start_0 galera-bundle-0" -> "galera:0_monitor_20000 galera-bundle-0" [ style = dashed] "galera:0_start_0 galera-bundle-0" -> "galera:0_monitor_30000 galera-bundle-0" [ style = dashed] "galera:0_start_0 galera-bundle-0" [ style=dashed color="red" fontcolor="black"] -"galera:0_stop_0 galera-bundle-0" -> "all_stopped" [ style = bold] "galera:0_stop_0 galera-bundle-0" -> "galera-bundle-0_stop_0 metal-1" [ style = bold] "galera:0_stop_0 galera-bundle-0" -> "galera-bundle-master_stopped_0" [ style = bold] "galera:0_stop_0 galera-bundle-0" -> "galera:0_start_0 galera-bundle-0" [ style = dashed] @@ -59,7 +55,6 @@ digraph "g" { "redis-bundle-1_monitor_0 metal-3" [ style=bold color="green" fontcolor="black"] "redis-bundle-2_monitor_0 metal-1" [ style=bold color="green" fontcolor="black"] "redis-bundle-2_monitor_0 metal-2" [ style=bold color="green" fontcolor="black"] -"storage-clone_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "storage-clone_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"] "storage-clone_confirmed-pre_notify_stop_0" -> "storage-clone_post_notify_stopped_0" [ style = bold] "storage-clone_confirmed-pre_notify_stop_0" -> "storage-clone_stop_0" [ style = bold] @@ -80,7 +75,6 @@ digraph "g" { "storage-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] "storage:0_pre_notify_stop_0 metal-1" -> "storage-clone_confirmed-pre_notify_stop_0" [ style = bold] "storage:0_pre_notify_stop_0 metal-1" [ style=bold color="green" fontcolor="black"] -"storage:0_stop_0 metal-1" -> "all_stopped" [ style = bold] "storage:0_stop_0 metal-1" -> "storage-clone_stopped_0" [ style = bold] "storage:0_stop_0 metal-1" [ style=bold color="green" fontcolor="black"] "storage:1_post_notify_stop_0 metal-2" -> "storage-clone_confirmed-post_notify_stopped_0" [ style = bold] diff --git a/pengine/test10/bundle-order-stop-clone.exp b/pengine/test10/bundle-order-stop-clone.exp index 6ef5dac..ad85714 100644 --- a/pengine/test10/bundle-order-stop-clone.exp +++ b/pengine/test10/bundle-order-stop-clone.exp @@ -1,139 +1,139 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -141,123 +141,123 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -267,13 +267,13 @@ - + - + @@ -282,7 +282,7 @@ - + @@ -291,7 +291,7 @@ - + @@ -300,7 +300,7 @@ - + @@ -309,7 +309,7 @@ - + @@ -318,7 +318,7 @@ - + @@ -327,7 +327,7 @@ - + @@ -336,7 +336,7 @@ - + @@ -345,7 +345,7 @@ - + @@ -354,7 +354,7 @@ - + @@ -363,7 +363,7 @@ - + @@ -372,7 +372,7 @@ - + @@ -381,22 +381,22 @@ - + - + - + - + @@ -404,49 +404,25 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/bundle-order-stop-clone.summary b/pengine/test10/bundle-order-stop-clone.summary index d988c06..5749f32 100644 --- a/pengine/test10/bundle-order-stop-clone.summary +++ b/pengine/test10/bundle-order-stop-clone.summary @@ -62,7 +62,6 @@ Executing cluster transition: * Resource action: storage:1 notify on metal-2 * Resource action: storage:2 notify on metal-3 * Pseudo action: storage-clone_confirmed-post_notify_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ metal-1 metal-2 metal-3 ] diff --git a/pengine/test10/bundle-order-stop-on-remote.dot b/pengine/test10/bundle-order-stop-on-remote.dot index f0b6336..c5d2d37 100644 --- a/pengine/test10/bundle-order-stop-on-remote.dot +++ b/pengine/test10/bundle-order-stop-on-remote.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "database-0_monitor_20000 controller-0" [ style=bold color="green" fontcolor="black"] "database-0_start_0 controller-0" -> "database-0_monitor_20000 controller-0" [ style = bold] "database-0_start_0 controller-0" -> "galera-bundle-docker-0_monitor_60000 database-0" [ style = bold] @@ -36,7 +35,6 @@ digraph "g" { "galera-bundle-docker-0_start_0 database-0" -> "galera_promote_0 galera-bundle-0" [ style = bold] "galera-bundle-docker-0_start_0 database-0" -> "galera_start_0 galera-bundle-0" [ style = bold] "galera-bundle-docker-0_start_0 database-0" [ style=bold color="green" fontcolor="black"] -"galera-bundle-docker-0_stop_0 database-0" -> "all_stopped" [ style = bold] "galera-bundle-docker-0_stop_0 database-0" -> "galera-bundle-docker-0_start_0 database-0" [ style = bold] "galera-bundle-docker-0_stop_0 database-0" -> "galera-bundle_stopped_0" [ style = bold] "galera-bundle-docker-0_stop_0 database-0" -> "stonith 'reboot' galera-bundle-0" [ style = bold] @@ -49,7 +47,6 @@ digraph "g" { "galera-bundle-docker-2_start_0 database-2" -> "galera_promote_0 galera-bundle-2" [ style = bold] "galera-bundle-docker-2_start_0 database-2" -> "galera_start_0 galera-bundle-2" [ style = bold] "galera-bundle-docker-2_start_0 database-2" [ style=bold color="green" fontcolor="black"] -"galera-bundle-docker-2_stop_0 database-2" -> "all_stopped" [ style = bold] "galera-bundle-docker-2_stop_0 database-2" -> "galera-bundle-docker-2_start_0 database-2" [ style = bold] "galera-bundle-docker-2_stop_0 database-2" -> "galera-bundle_stopped_0" [ style = bold] "galera-bundle-docker-2_stop_0 database-2" -> "stonith 'reboot' galera-bundle-2" [ style = bold] @@ -133,11 +130,9 @@ digraph "g" { "galera_start_0 galera-bundle-2" -> "galera_monitor_10000 galera-bundle-2" [ style = bold] "galera_start_0 galera-bundle-2" -> "galera_promote_0 galera-bundle-2" [ style = bold] "galera_start_0 galera-bundle-2" [ style=bold color="green" fontcolor="black"] -"galera_stop_0 galera-bundle-0" -> "all_stopped" [ style = bold] "galera_stop_0 galera-bundle-0" -> "galera-bundle-master_stopped_0" [ style = bold] "galera_stop_0 galera-bundle-0" -> "galera_start_0 galera-bundle-0" [ style = bold] "galera_stop_0 galera-bundle-0" [ style=bold color="green" fontcolor="orange"] -"galera_stop_0 galera-bundle-2" -> "all_stopped" [ style = bold] "galera_stop_0 galera-bundle-2" -> "galera-bundle-master_stopped_0" [ style = bold] "galera_stop_0 galera-bundle-2" -> "galera_start_0 galera-bundle-2" [ style = bold] "galera_stop_0 galera-bundle-2" -> "galera_stop_0 galera-bundle-0" [ style = bold] @@ -269,11 +264,39 @@ digraph "g" { "redis_promote_0 redis-bundle-0" -> "redis-bundle-master_promoted_0" [ style = bold] "redis_promote_0 redis-bundle-0" -> "redis_monitor_20000 redis-bundle-0" [ style = bold] "redis_promote_0 redis-bundle-0" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' galera-bundle-0" -> "galera-bundle-docker-0_start_0 database-0" [ style = bold] +"stonith 'reboot' galera-bundle-0" -> "galera-bundle-docker-2_start_0 database-2" [ style = bold] "stonith 'reboot' galera-bundle-0" -> "galera-bundle-master_stop_0" [ style = bold] -"stonith 'reboot' galera-bundle-0" -> "stonith_complete" [ style = bold] +"stonith 'reboot' galera-bundle-0" -> "galera_promote_0 galera-bundle-0" [ style = bold] +"stonith 'reboot' galera-bundle-0" -> "galera_promote_0 galera-bundle-2" [ style = bold] +"stonith 'reboot' galera-bundle-0" -> "galera_start_0 galera-bundle-0" [ style = bold] +"stonith 'reboot' galera-bundle-0" -> "galera_start_0 galera-bundle-2" [ style = bold] +"stonith 'reboot' galera-bundle-0" -> "haproxy-bundle-docker-1_start_0 controller-1" [ style = bold] +"stonith 'reboot' galera-bundle-0" -> "ip-10.0.0.104_start_0 controller-1" [ style = bold] +"stonith 'reboot' galera-bundle-0" -> "ip-172.17.1.11_start_0 controller-0" [ style = bold] +"stonith 'reboot' galera-bundle-0" -> "ip-172.17.3.13_start_0 controller-1" [ style = bold] +"stonith 'reboot' galera-bundle-0" -> "ip-192.168.24.11_start_0 controller-0" [ style = bold] +"stonith 'reboot' galera-bundle-0" -> "openstack-cinder-volume_start_0 controller-0" [ style = bold] +"stonith 'reboot' galera-bundle-0" -> "redis-bundle-docker-1_start_0 controller-1" [ style = bold] +"stonith 'reboot' galera-bundle-0" -> "redis:1_start_0 redis-bundle-1" [ style = bold] +"stonith 'reboot' galera-bundle-0" -> "redis_promote_0 redis-bundle-0" [ style = bold] "stonith 'reboot' galera-bundle-0" [ style=bold color="green" fontcolor="orange"] +"stonith 'reboot' galera-bundle-2" -> "galera-bundle-docker-0_start_0 database-0" [ style = bold] +"stonith 'reboot' galera-bundle-2" -> "galera-bundle-docker-2_start_0 database-2" [ style = bold] "stonith 'reboot' galera-bundle-2" -> "galera-bundle-master_stop_0" [ style = bold] -"stonith 'reboot' galera-bundle-2" -> "stonith_complete" [ style = bold] +"stonith 'reboot' galera-bundle-2" -> "galera_promote_0 galera-bundle-0" [ style = bold] +"stonith 'reboot' galera-bundle-2" -> "galera_promote_0 galera-bundle-2" [ style = bold] +"stonith 'reboot' galera-bundle-2" -> "galera_start_0 galera-bundle-0" [ style = bold] +"stonith 'reboot' galera-bundle-2" -> "galera_start_0 galera-bundle-2" [ style = bold] +"stonith 'reboot' galera-bundle-2" -> "haproxy-bundle-docker-1_start_0 controller-1" [ style = bold] +"stonith 'reboot' galera-bundle-2" -> "ip-10.0.0.104_start_0 controller-1" [ style = bold] +"stonith 'reboot' galera-bundle-2" -> "ip-172.17.1.11_start_0 controller-0" [ style = bold] +"stonith 'reboot' galera-bundle-2" -> "ip-172.17.3.13_start_0 controller-1" [ style = bold] +"stonith 'reboot' galera-bundle-2" -> "ip-192.168.24.11_start_0 controller-0" [ style = bold] +"stonith 'reboot' galera-bundle-2" -> "openstack-cinder-volume_start_0 controller-0" [ style = bold] +"stonith 'reboot' galera-bundle-2" -> "redis-bundle-docker-1_start_0 controller-1" [ style = bold] +"stonith 'reboot' galera-bundle-2" -> "redis:1_start_0 redis-bundle-1" [ style = bold] +"stonith 'reboot' galera-bundle-2" -> "redis_promote_0 redis-bundle-0" [ style = bold] "stonith 'reboot' galera-bundle-2" [ style=bold color="green" fontcolor="orange"] "stonith-fence_ipmilan-525400498d34_monitor_60000 controller-1" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-525400498d34_start_0 controller-1" -> "stonith-fence_ipmilan-525400498d34_monitor_60000 controller-1" [ style = bold] @@ -287,21 +310,4 @@ digraph "g" { "stonith-fence_ipmilan-525400c709f7_monitor_60000 controller-1" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-525400c709f7_start_0 controller-1" -> "stonith-fence_ipmilan-525400c709f7_monitor_60000 controller-1" [ style = bold] "stonith-fence_ipmilan-525400c709f7_start_0 controller-1" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "galera-bundle-docker-0_start_0 database-0" [ style = bold] -"stonith_complete" -> "galera-bundle-docker-2_start_0 database-2" [ style = bold] -"stonith_complete" -> "galera_promote_0 galera-bundle-0" [ style = bold] -"stonith_complete" -> "galera_promote_0 galera-bundle-2" [ style = bold] -"stonith_complete" -> "galera_start_0 galera-bundle-0" [ style = bold] -"stonith_complete" -> "galera_start_0 galera-bundle-2" [ style = bold] -"stonith_complete" -> "haproxy-bundle-docker-1_start_0 controller-1" [ style = bold] -"stonith_complete" -> "ip-10.0.0.104_start_0 controller-1" [ style = bold] -"stonith_complete" -> "ip-172.17.1.11_start_0 controller-0" [ style = bold] -"stonith_complete" -> "ip-172.17.3.13_start_0 controller-1" [ style = bold] -"stonith_complete" -> "ip-192.168.24.11_start_0 controller-0" [ style = bold] -"stonith_complete" -> "openstack-cinder-volume_start_0 controller-0" [ style = bold] -"stonith_complete" -> "redis-bundle-docker-1_start_0 controller-1" [ style = bold] -"stonith_complete" -> "redis:1_start_0 redis-bundle-1" [ style = bold] -"stonith_complete" -> "redis_promote_0 redis-bundle-0" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/bundle-order-stop-on-remote.exp b/pengine/test10/bundle-order-stop-on-remote.exp index 6559dfd..3d79809 100644 --- a/pengine/test10/bundle-order-stop-on-remote.exp +++ b/pengine/test10/bundle-order-stop-on-remote.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,20 +23,20 @@ - + - + - + @@ -45,947 +45,971 @@ - + - + - + - + - + - + - + - + - + - + - + + + + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -993,280 +1017,301 @@ - + - + - + - + - + - + - + - + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + - + - + - + + + + - + - + - + - + + + + - + - + - + - + + + + - + - + - + - + + + + - + - + - + - + - + + + + - + - + - + @@ -1275,20 +1320,20 @@ - + - + - + @@ -1297,20 +1342,20 @@ - + - + - + @@ -1319,20 +1364,20 @@ - + - + - + @@ -1341,7 +1386,7 @@ - + @@ -1350,13 +1395,13 @@ - + - + @@ -1365,242 +1410,203 @@ - - - - - - - - - - - - - - - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + - + diff --git a/pengine/test10/bundle-order-stop-on-remote.summary b/pengine/test10/bundle-order-stop-on-remote.summary index 8a04599..eeae51f 100644 --- a/pengine/test10/bundle-order-stop-on-remote.summary +++ b/pengine/test10/bundle-order-stop-on-remote.summary @@ -101,7 +101,6 @@ Executing cluster transition: * Resource action: galera-bundle-docker-2 stop on database-2 * Pseudo action: stonith-galera-bundle-2-reboot on galera-bundle-2 * Pseudo action: stonith-galera-bundle-0-reboot on galera-bundle-0 - * Pseudo action: stonith_complete * Pseudo action: galera-bundle-master_stop_0 * Resource action: redis-bundle-docker-1 start on controller-1 * Resource action: redis-bundle-1 monitor on controller-1 @@ -129,7 +128,6 @@ Executing cluster transition: * Resource action: haproxy-bundle-docker-1 monitor=60000 on controller-1 * Pseudo action: galera-bundle_stopped_0 * Pseudo action: galera-bundle_start_0 - * Pseudo action: all_stopped * Pseudo action: galera-bundle-master_start_0 * Resource action: galera-bundle-docker-0 start on database-0 * Resource action: galera-bundle-0 monitor on controller-1 diff --git a/pengine/test10/bundle-order-stop.dot b/pengine/test10/bundle-order-stop.dot index 6bad4ab..2bd8157 100644 --- a/pengine/test10/bundle-order-stop.dot +++ b/pengine/test10/bundle-order-stop.dot @@ -3,13 +3,10 @@ digraph "g" { "Cancel galera_monitor_10000 galera-bundle-0" [ style=bold color="green" fontcolor="black"] "Cancel redis_monitor_20000 redis-bundle-0" -> "redis_demote_0 redis-bundle-0" [ style = bold] "Cancel redis_monitor_20000 redis-bundle-0" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "do_shutdown undercloud" [ style=bold color="green" fontcolor="black"] -"galera-bundle-0_stop_0 undercloud" -> "all_stopped" [ style = bold] "galera-bundle-0_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "galera-bundle-0_stop_0 undercloud" -> "galera-bundle-docker-0_stop_0 undercloud" [ style = bold] "galera-bundle-0_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] -"galera-bundle-docker-0_stop_0 undercloud" -> "all_stopped" [ style = bold] "galera-bundle-docker-0_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "galera-bundle-docker-0_stop_0 undercloud" -> "galera-bundle_stopped_0" [ style = bold] "galera-bundle-docker-0_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] @@ -53,12 +50,10 @@ digraph "g" { "galera_start_0 galera-bundle-0" -> "galera_monitor_20000 galera-bundle-0" [ style = dashed] "galera_start_0 galera-bundle-0" -> "galera_monitor_30000 galera-bundle-0" [ style = dashed] "galera_start_0 galera-bundle-0" [ style=dashed color="red" fontcolor="black"] -"galera_stop_0 galera-bundle-0" -> "all_stopped" [ style = bold] "galera_stop_0 galera-bundle-0" -> "galera-bundle-0_stop_0 undercloud" [ style = bold] "galera_stop_0 galera-bundle-0" -> "galera-bundle-master_stopped_0" [ style = bold] "galera_stop_0 galera-bundle-0" -> "galera_start_0 galera-bundle-0" [ style = dashed] "galera_stop_0 galera-bundle-0" [ style=bold color="green" fontcolor="black"] -"haproxy-bundle-docker-0_stop_0 undercloud" -> "all_stopped" [ style = bold] "haproxy-bundle-docker-0_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "haproxy-bundle-docker-0_stop_0 undercloud" -> "haproxy-bundle_stopped_0" [ style = bold] "haproxy-bundle-docker-0_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] @@ -72,48 +67,39 @@ digraph "g" { "haproxy-bundle_stopped_0" -> "ip-192.168.122.254_stop_0 undercloud" [ style = bold] "haproxy-bundle_stopped_0" [ style=bold color="green" fontcolor="orange"] "ip-192.168.122.247_start_0 " [ style=dashed color="red" fontcolor="black"] -"ip-192.168.122.247_stop_0 undercloud" -> "all_stopped" [ style = bold] "ip-192.168.122.247_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "ip-192.168.122.247_stop_0 undercloud" -> "ip-192.168.122.247_start_0 " [ style = dashed] "ip-192.168.122.247_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] "ip-192.168.122.248_start_0 " [ style=dashed color="red" fontcolor="black"] -"ip-192.168.122.248_stop_0 undercloud" -> "all_stopped" [ style = bold] "ip-192.168.122.248_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "ip-192.168.122.248_stop_0 undercloud" -> "ip-192.168.122.248_start_0 " [ style = dashed] "ip-192.168.122.248_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] "ip-192.168.122.249_start_0 " [ style=dashed color="red" fontcolor="black"] -"ip-192.168.122.249_stop_0 undercloud" -> "all_stopped" [ style = bold] "ip-192.168.122.249_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "ip-192.168.122.249_stop_0 undercloud" -> "ip-192.168.122.249_start_0 " [ style = dashed] "ip-192.168.122.249_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] "ip-192.168.122.250_start_0 " [ style=dashed color="red" fontcolor="black"] -"ip-192.168.122.250_stop_0 undercloud" -> "all_stopped" [ style = bold] "ip-192.168.122.250_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "ip-192.168.122.250_stop_0 undercloud" -> "ip-192.168.122.250_start_0 " [ style = dashed] "ip-192.168.122.250_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] "ip-192.168.122.253_start_0 " [ style=dashed color="red" fontcolor="black"] -"ip-192.168.122.253_stop_0 undercloud" -> "all_stopped" [ style = bold] "ip-192.168.122.253_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "ip-192.168.122.253_stop_0 undercloud" -> "ip-192.168.122.253_start_0 " [ style = dashed] "ip-192.168.122.253_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] "ip-192.168.122.254_start_0 " [ style=dashed color="red" fontcolor="black"] -"ip-192.168.122.254_stop_0 undercloud" -> "all_stopped" [ style = bold] "ip-192.168.122.254_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "ip-192.168.122.254_stop_0 undercloud" -> "ip-192.168.122.254_start_0 " [ style = dashed] "ip-192.168.122.254_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] -"openstack-cinder-volume-docker-0_stop_0 undercloud" -> "all_stopped" [ style = bold] "openstack-cinder-volume-docker-0_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "openstack-cinder-volume-docker-0_stop_0 undercloud" -> "openstack-cinder-volume_stopped_0" [ style = bold] "openstack-cinder-volume-docker-0_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] "openstack-cinder-volume_stop_0" -> "openstack-cinder-volume-docker-0_stop_0 undercloud" [ style = bold] "openstack-cinder-volume_stop_0" [ style=bold color="green" fontcolor="orange"] "openstack-cinder-volume_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rabbitmq-bundle-0_stop_0 undercloud" -> "all_stopped" [ style = bold] "rabbitmq-bundle-0_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "rabbitmq-bundle-0_stop_0 undercloud" -> "rabbitmq-bundle-docker-0_stop_0 undercloud" [ style = bold] "rabbitmq-bundle-0_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] "rabbitmq-bundle-clone_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"] -"rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "rabbitmq-bundle-clone_pre_notify_start_0" [ style = dashed] "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "rabbitmq-bundle_stopped_0" [ style = bold] "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"] @@ -143,7 +129,6 @@ digraph "g" { "rabbitmq-bundle-clone_stopped_0" -> "rabbitmq-bundle-clone_post_notify_stopped_0" [ style = bold] "rabbitmq-bundle-clone_stopped_0" -> "rabbitmq-bundle-clone_start_0" [ style = dashed] "rabbitmq-bundle-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rabbitmq-bundle-docker-0_stop_0 undercloud" -> "all_stopped" [ style = bold] "rabbitmq-bundle-docker-0_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "rabbitmq-bundle-docker-0_stop_0 undercloud" -> "rabbitmq-bundle_stopped_0" [ style = bold] "rabbitmq-bundle-docker-0_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] @@ -158,16 +143,13 @@ digraph "g" { "rabbitmq_start_0 rabbitmq-bundle-0" -> "rabbitmq-bundle-clone_running_0" [ style = dashed] "rabbitmq_start_0 rabbitmq-bundle-0" -> "rabbitmq_monitor_10000 rabbitmq-bundle-0" [ style = dashed] "rabbitmq_start_0 rabbitmq-bundle-0" [ style=dashed color="red" fontcolor="black"] -"rabbitmq_stop_0 rabbitmq-bundle-0" -> "all_stopped" [ style = bold] "rabbitmq_stop_0 rabbitmq-bundle-0" -> "rabbitmq-bundle-0_stop_0 undercloud" [ style = bold] "rabbitmq_stop_0 rabbitmq-bundle-0" -> "rabbitmq-bundle-clone_stopped_0" [ style = bold] "rabbitmq_stop_0 rabbitmq-bundle-0" -> "rabbitmq_start_0 rabbitmq-bundle-0" [ style = dashed] "rabbitmq_stop_0 rabbitmq-bundle-0" [ style=bold color="green" fontcolor="black"] -"redis-bundle-0_stop_0 undercloud" -> "all_stopped" [ style = bold] "redis-bundle-0_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "redis-bundle-0_stop_0 undercloud" -> "redis-bundle-docker-0_stop_0 undercloud" [ style = bold] "redis-bundle-0_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] -"redis-bundle-docker-0_stop_0 undercloud" -> "all_stopped" [ style = bold] "redis-bundle-docker-0_stop_0 undercloud" -> "do_shutdown undercloud" [ style = bold] "redis-bundle-docker-0_stop_0 undercloud" -> "redis-bundle_stopped_0" [ style = bold] "redis-bundle-docker-0_stop_0 undercloud" [ style=bold color="green" fontcolor="black"] @@ -178,7 +160,6 @@ digraph "g" { "redis-bundle-master_confirmed-post_notify_demoted_0" -> "redis_monitor_60000 redis-bundle-0" [ style = dashed] "redis-bundle-master_confirmed-post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"] "redis-bundle-master_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"] -"redis-bundle-master_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "redis-bundle-master_confirmed-post_notify_stopped_0" -> "redis-bundle-master_pre_notify_start_0" [ style = dashed] "redis-bundle-master_confirmed-post_notify_stopped_0" -> "redis-bundle_stopped_0" [ style = bold] "redis-bundle-master_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"] @@ -253,7 +234,6 @@ digraph "g" { "redis_start_0 redis-bundle-0" -> "redis_monitor_45000 redis-bundle-0" [ style = dashed] "redis_start_0 redis-bundle-0" -> "redis_monitor_60000 redis-bundle-0" [ style = dashed] "redis_start_0 redis-bundle-0" [ style=dashed color="red" fontcolor="black"] -"redis_stop_0 redis-bundle-0" -> "all_stopped" [ style = bold] "redis_stop_0 redis-bundle-0" -> "redis-bundle-0_stop_0 undercloud" [ style = bold] "redis_stop_0 redis-bundle-0" -> "redis-bundle-master_stopped_0" [ style = bold] "redis_stop_0 redis-bundle-0" -> "redis_start_0 redis-bundle-0" [ style = dashed] diff --git a/pengine/test10/bundle-order-stop.exp b/pengine/test10/bundle-order-stop.exp index 626fc44..983d7b7 100644 --- a/pengine/test10/bundle-order-stop.exp +++ b/pengine/test10/bundle-order-stop.exp @@ -1,78 +1,78 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -80,53 +80,53 @@ - + - + - + - + - + - + - + - + - + - + @@ -136,32 +136,32 @@ - + - + - + - + - + - + @@ -171,7 +171,7 @@ - + @@ -186,80 +186,80 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -269,74 +269,74 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -346,7 +346,7 @@ - + @@ -361,52 +361,52 @@ - + - + - + - + - + - + - + - + - + - + @@ -414,140 +414,140 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -557,120 +557,120 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -679,64 +679,64 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -744,46 +744,46 @@ - + - + - + - + - + - + - + - + @@ -791,52 +791,52 @@ - + - + - + - + - + - + - + - + - + - + @@ -844,118 +844,52 @@ - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/bundle-order-stop.summary b/pengine/test10/bundle-order-stop.summary index 29cf490..5d37904 100644 --- a/pengine/test10/bundle-order-stop.summary +++ b/pengine/test10/bundle-order-stop.summary @@ -103,7 +103,6 @@ Executing cluster transition: * Resource action: ip-192.168.122.247 stop on undercloud * Resource action: ip-192.168.122.248 stop on undercloud * Cluster action: do_shutdown on undercloud - * Pseudo action: all_stopped Revised cluster status: Online: [ undercloud ] diff --git a/pengine/test10/bundle-probe-remotes.exp b/pengine/test10/bundle-probe-remotes.exp index 601b689..568dcfe 100644 --- a/pengine/test10/bundle-probe-remotes.exp +++ b/pengine/test10/bundle-probe-remotes.exp @@ -1,39 +1,39 @@ - + - + - + - + - + - + - + @@ -42,7 +42,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -60,39 +60,39 @@ - + - + - + - + - + - + - + @@ -101,7 +101,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -119,39 +119,39 @@ - + - + - + - + - + - + - + @@ -160,7 +160,7 @@ - + @@ -169,7 +169,7 @@ - + @@ -178,480 +178,480 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -660,7 +660,7 @@ - + @@ -669,7 +669,7 @@ - + @@ -678,179 +678,179 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -859,7 +859,7 @@ - + @@ -868,7 +868,7 @@ - + @@ -877,179 +877,179 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1058,7 +1058,7 @@ - + @@ -1067,7 +1067,7 @@ - + @@ -1076,185 +1076,185 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1263,7 +1263,7 @@ - + @@ -1272,7 +1272,7 @@ - + @@ -1281,185 +1281,185 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1468,7 +1468,7 @@ - + @@ -1477,7 +1477,7 @@ - + @@ -1486,185 +1486,185 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1673,7 +1673,7 @@ - + @@ -1682,7 +1682,7 @@ - + @@ -1691,111 +1691,111 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/bundle-replicas-change.dot b/pengine/test10/bundle-replicas-change.dot index f7a32fd..23264d9 100644 --- a/pengine/test10/bundle-replicas-change.dot +++ b/pengine/test10/bundle-replicas-change.dot @@ -1,6 +1,5 @@ digraph "g" { "Cancel httpd-bundle-0_monitor_30000 rh74-test" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "httpd-bundle-0_monitor_60000 rh74-test" [ style=bold color="green" fontcolor="black"] "httpd-bundle-0_start_0 rh74-test" -> "httpd-bundle-0_monitor_60000 rh74-test" [ style = bold] "httpd-bundle-0_start_0 rh74-test" -> "httpd:0_monitor_0 httpd-bundle-0" [ style = bold] @@ -10,7 +9,6 @@ digraph "g" { "httpd-bundle-0_start_0 rh74-test" -> "httpd_monitor_10000 httpd-bundle-0" [ style = dashed] "httpd-bundle-0_start_0 rh74-test" [ style=bold color="green" fontcolor="black"] "httpd-bundle-0_stop_0 rh74-test" -> "Cancel httpd-bundle-0_monitor_30000 rh74-test" [ style = bold] -"httpd-bundle-0_stop_0 rh74-test" -> "all_stopped" [ style = bold] "httpd-bundle-0_stop_0 rh74-test" -> "httpd-bundle-0_start_0 rh74-test" [ style = bold] "httpd-bundle-0_stop_0 rh74-test" -> "httpd-bundle-docker-0_stop_0 rh74-test" [ style = bold] "httpd-bundle-0_stop_0 rh74-test" [ style=bold color="green" fontcolor="black"] @@ -41,7 +39,6 @@ digraph "g" { "httpd-bundle-docker-0_start_0 rh74-test" -> "httpd-bundle_running_0" [ style = bold] "httpd-bundle-docker-0_start_0 rh74-test" -> "httpd:0_start_0 httpd-bundle-0" [ style = bold] "httpd-bundle-docker-0_start_0 rh74-test" [ style=bold color="green" fontcolor="black"] -"httpd-bundle-docker-0_stop_0 rh74-test" -> "all_stopped" [ style = bold] "httpd-bundle-docker-0_stop_0 rh74-test" -> "httpd-bundle-docker-0_start_0 rh74-test" [ style = bold] "httpd-bundle-docker-0_stop_0 rh74-test" -> "httpd-bundle_stopped_0" [ style = bold] "httpd-bundle-docker-0_stop_0 rh74-test" [ style=bold color="green" fontcolor="black"] @@ -104,7 +101,6 @@ digraph "g" { "httpd:2_start_0 httpd-bundle-2" [ style=bold color="green" fontcolor="black"] "httpd_delete_0 httpd-bundle-0" [ style=bold color="green" fontcolor="black"] "httpd_monitor_10000 httpd-bundle-0" [ style=dashed color="red" fontcolor="black"] -"httpd_stop_0 httpd-bundle-0" -> "all_stopped" [ style = bold] "httpd_stop_0 httpd-bundle-0" -> "httpd-bundle-0_stop_0 rh74-test" [ style = bold] "httpd_stop_0 httpd-bundle-0" -> "httpd_delete_0 httpd-bundle-0" [ style = bold] "httpd_stop_0 httpd-bundle-0" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/bundle-replicas-change.exp b/pengine/test10/bundle-replicas-change.exp index e7e6821..8d1c67f 100644 --- a/pengine/test10/bundle-replicas-change.exp +++ b/pengine/test10/bundle-replicas-change.exp @@ -1,199 +1,199 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -206,42 +206,42 @@ - + - + - + - + - + - + - + @@ -251,7 +251,7 @@ - + @@ -264,39 +264,39 @@ - + - + - + - + - + - + @@ -305,39 +305,39 @@ - + - + - + - + - + - + - + @@ -346,75 +346,75 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -423,39 +423,39 @@ - + - + - + - + - + - + - + @@ -464,49 +464,49 @@ - + - + - + - + - + - + - + - + @@ -515,35 +515,35 @@ - + - + - + - + - + - + @@ -551,49 +551,31 @@ - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/bundle-replicas-change.summary b/pengine/test10/bundle-replicas-change.summary index 01e80f3..9c5adec 100644 --- a/pengine/test10/bundle-replicas-change.summary +++ b/pengine/test10/bundle-replicas-change.summary @@ -51,7 +51,6 @@ Executing cluster transition: * Resource action: httpd-bundle-2 start on rh74-test * Resource action: httpd delete on httpd-bundle-0 * Pseudo action: httpd-bundle_stopped_0 - * Pseudo action: all_stopped * Resource action: httpd:0 monitor on httpd-bundle-0 * Pseudo action: httpd-bundle-clone_start_0 * Resource action: httpd-bundle-0 monitor=60000 on rh74-test diff --git a/pengine/test10/clone-anon-dup.dot b/pengine/test10/clone-anon-dup.dot index 041b9db..788ca58 100644 --- a/pengine/test10/clone-anon-dup.dot +++ b/pengine/test10/clone-anon-dup.dot @@ -1,6 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] -"apache2:0_stop_0 wc02" -> "all_stopped" [ style = bold] "apache2:0_stop_0 wc02" -> "group_webservice:2_stopped_0" [ style = bold] "apache2:0_stop_0 wc02" [ style=bold color="green" fontcolor="black"] "clone_webservice_stop_0" -> "clone_webservice_stopped_0" [ style = bold] diff --git a/pengine/test10/clone-anon-dup.exp b/pengine/test10/clone-anon-dup.exp index 1af059f..2ba7ede 100644 --- a/pengine/test10/clone-anon-dup.exp +++ b/pengine/test10/clone-anon-dup.exp @@ -1,26 +1,26 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -47,78 +47,65 @@ - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - diff --git a/pengine/test10/clone-anon-dup.summary b/pengine/test10/clone-anon-dup.summary index 843972d..bae441d 100644 --- a/pengine/test10/clone-anon-dup.summary +++ b/pengine/test10/clone-anon-dup.summary @@ -21,7 +21,6 @@ Executing cluster transition: * Resource action: stonith-1 start on wc01 * Pseudo action: group_webservice:2_stop_0 * Resource action: apache2:0 stop on wc02 - * Pseudo action: all_stopped * Pseudo action: group_webservice:2_stopped_0 * Pseudo action: clone_webservice_stopped_0 diff --git a/pengine/test10/clone-anon-failcount.dot b/pengine/test10/clone-anon-failcount.dot index 4a3315f..40d7f22 100644 --- a/pengine/test10/clone-anon-failcount.dot +++ b/pengine/test10/clone-anon-failcount.dot @@ -23,7 +23,6 @@ digraph "g" { "UmDummy01_stop_0 srv01" -> "UMgroup01_stopped_0" [ style = bold] "UmDummy01_stop_0 srv01" -> "UmDummy01_start_0 srv04" [ style = bold] "UmDummy01_stop_0 srv01" -> "UmIPaddr_stop_0 srv01" [ style = bold] -"UmDummy01_stop_0 srv01" -> "all_stopped" [ style = bold] "UmDummy01_stop_0 srv01" [ style=bold color="green" fontcolor="black" ] "UmDummy02_monitor_10000 srv04" [ style=bold color="green" fontcolor="black" ] "UmDummy02_start_0 srv04" -> "UMgroup01_running_0" [ style = bold] @@ -32,7 +31,6 @@ digraph "g" { "UmDummy02_stop_0 srv01" -> "UMgroup01_stopped_0" [ style = bold] "UmDummy02_stop_0 srv01" -> "UmDummy01_stop_0 srv01" [ style = bold] "UmDummy02_stop_0 srv01" -> "UmDummy02_start_0 srv04" [ style = bold] -"UmDummy02_stop_0 srv01" -> "all_stopped" [ style = bold] "UmDummy02_stop_0 srv01" [ style=bold color="green" fontcolor="black" ] "UmIPaddr_monitor_10000 srv04" [ style=bold color="green" fontcolor="black" ] "UmIPaddr_start_0 srv04" -> "UMgroup01_running_0" [ style = bold] @@ -42,17 +40,13 @@ digraph "g" { "UmIPaddr_stop_0 srv01" -> "UMgroup01_stopped_0" [ style = bold] "UmIPaddr_stop_0 srv01" -> "UmIPaddr_start_0 srv04" [ style = bold] "UmIPaddr_stop_0 srv01" -> "UmVIPcheck_stop_0 srv01" [ style = bold] -"UmIPaddr_stop_0 srv01" -> "all_stopped" [ style = bold] "UmIPaddr_stop_0 srv01" [ style=bold color="green" fontcolor="black" ] "UmVIPcheck_start_0 srv04" -> "UMgroup01_running_0" [ style = bold] "UmVIPcheck_start_0 srv04" -> "UmIPaddr_start_0 srv04" [ style = bold] "UmVIPcheck_start_0 srv04" [ style=bold color="green" fontcolor="black" ] "UmVIPcheck_stop_0 srv01" -> "UMgroup01_stopped_0" [ style = bold] "UmVIPcheck_stop_0 srv01" -> "UmVIPcheck_start_0 srv04" [ style = bold] -"UmVIPcheck_stop_0 srv01" -> "all_stopped" [ style = bold] "UmVIPcheck_stop_0 srv01" [ style=bold color="green" fontcolor="black" ] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] -"clnUMdummy01:0_stop_0 srv01" -> "all_stopped" [ style = bold] "clnUMdummy01:0_stop_0 srv01" -> "clnUmResource:1_stopped_0" [ style = bold] "clnUMdummy01:0_stop_0 srv01" [ style=bold color="green" fontcolor="black" ] "clnUMdummy01:1_monitor_10000 srv04" [ style=bold color="green" fontcolor="black" ] @@ -60,11 +54,9 @@ digraph "g" { "clnUMdummy01:1_start_0 srv04" -> "clnUMdummy02:1_start_0 srv04" [ style = bold] "clnUMdummy01:1_start_0 srv04" -> "clnUmResource:0_running_0" [ style = bold] "clnUMdummy01:1_start_0 srv04" [ style=bold color="green" fontcolor="black" ] -"clnUMdummy01:1_stop_0 srv04" -> "all_stopped" [ style = bold] "clnUMdummy01:1_stop_0 srv04" -> "clnUMdummy01:1_start_0 srv04" [ style = bold] "clnUMdummy01:1_stop_0 srv04" -> "clnUmResource:0_stopped_0" [ style = bold] "clnUMdummy01:1_stop_0 srv04" [ style=bold color="green" fontcolor="black" ] -"clnUMdummy02:0_stop_0 srv01" -> "all_stopped" [ style = bold] "clnUMdummy02:0_stop_0 srv01" -> "clnUMdummy01:0_stop_0 srv01" [ style = bold] "clnUMdummy02:0_stop_0 srv01" -> "clnUmResource:1_stopped_0" [ style = bold] "clnUMdummy02:0_stop_0 srv01" [ style=bold color="green" fontcolor="black" ] @@ -72,7 +64,6 @@ digraph "g" { "clnUMdummy02:1_start_0 srv04" -> "clnUMdummy02:1_monitor_10000 srv04" [ style = bold] "clnUMdummy02:1_start_0 srv04" -> "clnUmResource:0_running_0" [ style = bold] "clnUMdummy02:1_start_0 srv04" [ style=bold color="green" fontcolor="black" ] -"clnUMdummy02:1_stop_0 srv04" -> "all_stopped" [ style = bold] "clnUMdummy02:1_stop_0 srv04" -> "clnUMdummy01:1_stop_0 srv04" [ style = bold] "clnUMdummy02:1_stop_0 srv04" -> "clnUMdummy02:1_start_0 srv04" [ style = bold] "clnUMdummy02:1_stop_0 srv04" -> "clnUmResource:0_stopped_0" [ style = bold] diff --git a/pengine/test10/clone-anon-failcount.exp b/pengine/test10/clone-anon-failcount.exp index 24a8393..a7eef96 100644 --- a/pengine/test10/clone-anon-failcount.exp +++ b/pengine/test10/clone-anon-failcount.exp @@ -1,31 +1,31 @@ - + - + - + - + - + - + - + @@ -33,219 +33,219 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -254,61 +254,61 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -318,7 +318,7 @@ - + @@ -331,10 +331,10 @@ - + - + @@ -347,39 +347,39 @@ - + - + - + - + - + - + - + @@ -392,156 +392,123 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/clone-anon-failcount.summary b/pengine/test10/clone-anon-failcount.summary index 098b772..69b1e2d 100644 --- a/pengine/test10/clone-anon-failcount.summary +++ b/pengine/test10/clone-anon-failcount.summary @@ -60,7 +60,6 @@ Executing cluster transition: * Resource action: clnUMdummy02:0 stop on srv01 * Resource action: clnUMdummy01:1 stop on srv04 * Resource action: clnUMdummy01:0 stop on srv01 - * Pseudo action: all_stopped * Pseudo action: clnUmResource:0_stopped_0 * Pseudo action: clnUmResource:1_stopped_0 * Pseudo action: clnUMgroup01_stopped_0 diff --git a/pengine/test10/clone-anon-probe-1.exp b/pengine/test10/clone-anon-probe-1.exp index e5610b4..864f939 100644 --- a/pengine/test10/clone-anon-probe-1.exp +++ b/pengine/test10/clone-anon-probe-1.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,20 +23,20 @@ - + - + - + @@ -45,34 +45,34 @@ - + - + - + - + - + - + - + diff --git a/pengine/test10/clone-anon-probe-2.exp b/pengine/test10/clone-anon-probe-2.exp index af914d3..8ef658d 100644 --- a/pengine/test10/clone-anon-probe-2.exp +++ b/pengine/test10/clone-anon-probe-2.exp @@ -1,35 +1,35 @@ - + - + - + - + - + - + diff --git a/pengine/test10/clone-colocate-instance-1.exp b/pengine/test10/clone-colocate-instance-1.exp index 92460c3..171cfae 100644 --- a/pengine/test10/clone-colocate-instance-1.exp +++ b/pengine/test10/clone-colocate-instance-1.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,23 +35,23 @@ - + - + - + - + @@ -60,7 +60,7 @@ - + @@ -69,20 +69,20 @@ - + - + - + @@ -91,20 +91,20 @@ - + - + - + @@ -113,34 +113,34 @@ - + - + - + - + - + - + - + diff --git a/pengine/test10/clone-colocate-instance-2.exp b/pengine/test10/clone-colocate-instance-2.exp index 85bb239..2e9d7fe 100644 --- a/pengine/test10/clone-colocate-instance-2.exp +++ b/pengine/test10/clone-colocate-instance-2.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,23 +35,23 @@ - + - + - + - + @@ -60,7 +60,7 @@ - + @@ -69,20 +69,20 @@ - + - + - + @@ -91,20 +91,20 @@ - + - + - + @@ -113,34 +113,34 @@ - + - + - + - + - + - + - + diff --git a/pengine/test10/clone-fail-block-colocation.dot b/pengine/test10/clone-fail-block-colocation.dot index 6356bd2..8e07390 100644 --- a/pengine/test10/clone-fail-block-colocation.dot +++ b/pengine/test10/clone-fail-block-colocation.dot @@ -1,11 +1,9 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "d_bird_subnet_state_monitor_10000 DEM-2" [ style=bold color="green" fontcolor="black"] "d_bird_subnet_state_start_0 DEM-2" -> "d_bird_subnet_state_monitor_10000 DEM-2" [ style = bold] "d_bird_subnet_state_start_0 DEM-2" -> "ip_mgmt_start_0 DEM-2" [ style = bold] "d_bird_subnet_state_start_0 DEM-2" -> "svc_running_0" [ style = bold] "d_bird_subnet_state_start_0 DEM-2" [ style=bold color="green" fontcolor="black"] -"d_bird_subnet_state_stop_0 DEM-1" -> "all_stopped" [ style = bold] "d_bird_subnet_state_stop_0 DEM-1" -> "d_bird_subnet_state_start_0 DEM-2" [ style = bold] "d_bird_subnet_state_stop_0 DEM-1" -> "ipv6_dem_tas_dns_stop_0 DEM-1" [ style = bold] "d_bird_subnet_state_stop_0 DEM-1" -> "svc_stopped_0" [ style = bold] @@ -15,7 +13,6 @@ digraph "g" { "ip_mgmt_start_0 DEM-2" -> "ip_trf_tas_start_0 DEM-2" [ style = bold] "ip_mgmt_start_0 DEM-2" -> "svc_running_0" [ style = bold] "ip_mgmt_start_0 DEM-2" [ style=bold color="green" fontcolor="black"] -"ip_mgmt_stop_0 DEM-1" -> "all_stopped" [ style = bold] "ip_mgmt_stop_0 DEM-1" -> "d_bird_subnet_state_stop_0 DEM-1" [ style = bold] "ip_mgmt_stop_0 DEM-1" -> "ip_mgmt_start_0 DEM-2" [ style = bold] "ip_mgmt_stop_0 DEM-1" -> "svc_stopped_0" [ style = bold] @@ -24,7 +21,6 @@ digraph "g" { "ip_trf_tas_start_0 DEM-2" -> "ip_trf_tas_monitor_10000 DEM-2" [ style = bold] "ip_trf_tas_start_0 DEM-2" -> "svc_running_0" [ style = bold] "ip_trf_tas_start_0 DEM-2" [ style=bold color="green" fontcolor="black"] -"ip_trf_tas_stop_0 DEM-1" -> "all_stopped" [ style = bold] "ip_trf_tas_stop_0 DEM-1" -> "ip_mgmt_stop_0 DEM-1" [ style = bold] "ip_trf_tas_stop_0 DEM-1" -> "ip_trf_tas_start_0 DEM-2" [ style = bold] "ip_trf_tas_stop_0 DEM-1" -> "svc_stopped_0" [ style = bold] @@ -34,7 +30,6 @@ digraph "g" { "ipv6_dem_tas_dns_start_0 DEM-2" -> "ipv6_dem_tas_dns_monitor_10000 DEM-2" [ style = bold] "ipv6_dem_tas_dns_start_0 DEM-2" -> "svc_running_0" [ style = bold] "ipv6_dem_tas_dns_start_0 DEM-2" [ style=bold color="green" fontcolor="black"] -"ipv6_dem_tas_dns_stop_0 DEM-1" -> "all_stopped" [ style = bold] "ipv6_dem_tas_dns_stop_0 DEM-1" -> "ipv6_dem_tas_dns_start_0 DEM-2" [ style = bold] "ipv6_dem_tas_dns_stop_0 DEM-1" -> "svc_stopped_0" [ style = bold] "ipv6_dem_tas_dns_stop_0 DEM-1" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/clone-fail-block-colocation.exp b/pengine/test10/clone-fail-block-colocation.exp index ee0d031..0f6c347 100644 --- a/pengine/test10/clone-fail-block-colocation.exp +++ b/pengine/test10/clone-fail-block-colocation.exp @@ -1,31 +1,31 @@ - + - + - + - + - + - + - + @@ -33,244 +33,223 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/clone-fail-block-colocation.summary b/pengine/test10/clone-fail-block-colocation.summary index 7f3f765..6df79a5 100644 --- a/pengine/test10/clone-fail-block-colocation.summary +++ b/pengine/test10/clone-fail-block-colocation.summary @@ -27,7 +27,6 @@ Executing cluster transition: * Resource action: ip_mgmt stop on DEM-1 * Resource action: d_bird_subnet_state stop on DEM-1 * Resource action: ipv6_dem_tas_dns stop on DEM-1 - * Pseudo action: all_stopped * Pseudo action: svc_stopped_0 * Pseudo action: svc_start_0 * Resource action: ipv6_dem_tas_dns start on DEM-2 diff --git a/pengine/test10/clone-interleave-1.exp b/pengine/test10/clone-interleave-1.exp index 3afe4f0..255022c 100644 --- a/pengine/test10/clone-interleave-1.exp +++ b/pengine/test10/clone-interleave-1.exp @@ -1,80 +1,80 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -82,125 +82,125 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/clone-interleave-2.dot b/pengine/test10/clone-interleave-2.dot index 88686ed..6d54383 100644 --- a/pengine/test10/clone-interleave-2.dot +++ b/pengine/test10/clone-interleave-2.dot @@ -1,11 +1,8 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] -"child-2:2_stop_0 pcmk-1" -> "all_stopped" [ style = bold] "child-2:2_stop_0 pcmk-1" -> "clone-2_stopped_0" [ style = bold] "child-2:2_stop_0 pcmk-1" [ style=bold color="green" fontcolor="black"] "child-3:2_start_0 pcmk-1" -> "clone-3_running_0" [ style = dashed] "child-3:2_start_0 pcmk-1" [ style=dashed color="red" fontcolor="black"] -"child-3:2_stop_0 pcmk-1" -> "all_stopped" [ style = bold] "child-3:2_stop_0 pcmk-1" -> "child-2:2_stop_0 pcmk-1" [ style = bold] "child-3:2_stop_0 pcmk-1" -> "child-3:2_start_0 pcmk-1" [ style = dashed] "child-3:2_stop_0 pcmk-1" -> "clone-3_stopped_0" [ style = bold] @@ -26,7 +23,6 @@ digraph "g" { "clone-3_stopped_0" -> "clone-3_start_0" [ style = bold] "clone-3_stopped_0" [ style=bold color="green" fontcolor="orange"] "dummy_start_0 pcmk-1" [ style=bold color="green" fontcolor="black"] -"dummy_stop_0 pcmk-1" -> "all_stopped" [ style = bold] "dummy_stop_0 pcmk-1" -> "clone-3_stop_0" [ style = bold] "dummy_stop_0 pcmk-1" -> "dummy_start_0 pcmk-1" [ style = bold] "dummy_stop_0 pcmk-1" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/clone-interleave-2.exp b/pengine/test10/clone-interleave-2.exp index e198665..4a6b512 100644 --- a/pengine/test10/clone-interleave-2.exp +++ b/pengine/test10/clone-interleave-2.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,126 +26,108 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/clone-interleave-2.summary b/pengine/test10/clone-interleave-2.summary index e4c9aa4..598cfbd 100644 --- a/pengine/test10/clone-interleave-2.summary +++ b/pengine/test10/clone-interleave-2.summary @@ -26,7 +26,6 @@ Executing cluster transition: * Resource action: dummy start on pcmk-1 * Resource action: child-2:2 stop on pcmk-1 * Pseudo action: clone-2_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ pcmk-1 pcmk-2 pcmk-3 ] diff --git a/pengine/test10/clone-interleave-3.dot b/pengine/test10/clone-interleave-3.dot index 9a927ad..9243a4b 100644 --- a/pengine/test10/clone-interleave-3.dot +++ b/pengine/test10/clone-interleave-3.dot @@ -1,15 +1,12 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "child-2:2_start_0 pcmk-1" -> "child-3:2_start_0 pcmk-1" [ style = bold] "child-2:2_start_0 pcmk-1" -> "clone-2_running_0" [ style = bold] "child-2:2_start_0 pcmk-1" [ style=bold color="green" fontcolor="black"] -"child-2:2_stop_0 pcmk-1" -> "all_stopped" [ style = bold] "child-2:2_stop_0 pcmk-1" -> "child-2:2_start_0 pcmk-1" [ style = bold] "child-2:2_stop_0 pcmk-1" -> "clone-2_stopped_0" [ style = bold] "child-2:2_stop_0 pcmk-1" [ style=bold color="green" fontcolor="black"] "child-3:2_start_0 pcmk-1" -> "clone-3_running_0" [ style = bold] "child-3:2_start_0 pcmk-1" [ style=bold color="green" fontcolor="black"] -"child-3:2_stop_0 pcmk-1" -> "all_stopped" [ style = bold] "child-3:2_stop_0 pcmk-1" -> "child-2:2_stop_0 pcmk-1" [ style = bold] "child-3:2_stop_0 pcmk-1" -> "child-3:2_start_0 pcmk-1" [ style = bold] "child-3:2_stop_0 pcmk-1" -> "clone-3_stopped_0" [ style = bold] @@ -36,7 +33,6 @@ digraph "g" { "clone-3_stopped_0" -> "clone-3_start_0" [ style = bold] "clone-3_stopped_0" [ style=bold color="green" fontcolor="orange"] "dummy_start_0 pcmk-1" [ style=bold color="green" fontcolor="black"] -"dummy_stop_0 pcmk-1" -> "all_stopped" [ style = bold] "dummy_stop_0 pcmk-1" -> "clone-3_stop_0" [ style = bold] "dummy_stop_0 pcmk-1" -> "dummy_start_0 pcmk-1" [ style = bold] "dummy_stop_0 pcmk-1" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/clone-interleave-3.exp b/pengine/test10/clone-interleave-3.exp index a16537d..1cb7e29 100644 --- a/pengine/test10/clone-interleave-3.exp +++ b/pengine/test10/clone-interleave-3.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -49,16 +49,16 @@ - + - + - + @@ -67,153 +67,135 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/clone-interleave-3.summary b/pengine/test10/clone-interleave-3.summary index a40dc1d..13b6557 100644 --- a/pengine/test10/clone-interleave-3.summary +++ b/pengine/test10/clone-interleave-3.summary @@ -25,7 +25,6 @@ Executing cluster transition: * Resource action: child-2:2 stop on pcmk-1 * Pseudo action: clone-2_stopped_0 * Pseudo action: clone-2_start_0 - * Pseudo action: all_stopped * Resource action: child-2:2 start on pcmk-1 * Pseudo action: clone-2_running_0 * Pseudo action: clone-3_start_0 diff --git a/pengine/test10/clone-max-zero.dot b/pengine/test10/clone-max-zero.dot index 33cec0a..2e18ce4 100644 --- a/pengine/test10/clone-max-zero.dot +++ b/pengine/test10/clone-max-zero.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "c-ocfs2-1_stop_0" -> "c-ocfs2-1_stopped_0" [ style = bold] "c-ocfs2-1_stop_0" -> "ocfs2-1:0_stop_0 c001n11" [ style = bold] "c-ocfs2-1_stop_0" -> "ocfs2-1:1_stop_0 c001n12" [ style = bold] @@ -11,10 +10,8 @@ digraph "g" { "dlm-clone_stop_0" -> "dlm:1_stop_0 c001n12" [ style = bold] "dlm-clone_stop_0" [ style=bold color="green" fontcolor="orange" ] "dlm-clone_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"dlm:0_stop_0 c001n11" -> "all_stopped" [ style = bold] "dlm:0_stop_0 c001n11" -> "dlm-clone_stopped_0" [ style = bold] "dlm:0_stop_0 c001n11" [ style=bold color="green" fontcolor="black"] -"dlm:1_stop_0 c001n12" -> "all_stopped" [ style = bold] "dlm:1_stop_0 c001n12" -> "dlm-clone_stopped_0" [ style = bold] "dlm:1_stop_0 c001n12" [ style=bold color="green" fontcolor="black"] "o2cb-clone_stop_0" -> "o2cb-clone_stopped_0" [ style = bold] @@ -23,19 +20,15 @@ digraph "g" { "o2cb-clone_stop_0" [ style=bold color="green" fontcolor="orange" ] "o2cb-clone_stopped_0" -> "dlm-clone_stop_0" [ style = bold] "o2cb-clone_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"o2cb:0_stop_0 c001n11" -> "all_stopped" [ style = bold] "o2cb:0_stop_0 c001n11" -> "dlm:0_stop_0 c001n11" [ style = bold] "o2cb:0_stop_0 c001n11" -> "o2cb-clone_stopped_0" [ style = bold] "o2cb:0_stop_0 c001n11" [ style=bold color="green" fontcolor="black" ] -"o2cb:1_stop_0 c001n12" -> "all_stopped" [ style = bold] "o2cb:1_stop_0 c001n12" -> "dlm:1_stop_0 c001n12" [ style = bold] "o2cb:1_stop_0 c001n12" -> "o2cb-clone_stopped_0" [ style = bold] "o2cb:1_stop_0 c001n12" [ style=bold color="green" fontcolor="black" ] -"ocfs2-1:0_stop_0 c001n11" -> "all_stopped" [ style = bold] "ocfs2-1:0_stop_0 c001n11" -> "c-ocfs2-1_stopped_0" [ style = bold] "ocfs2-1:0_stop_0 c001n11" -> "o2cb:0_stop_0 c001n11" [ style = bold] "ocfs2-1:0_stop_0 c001n11" [ style=bold color="green" fontcolor="black" ] -"ocfs2-1:1_stop_0 c001n12" -> "all_stopped" [ style = bold] "ocfs2-1:1_stop_0 c001n12" -> "c-ocfs2-1_stopped_0" [ style = bold] "ocfs2-1:1_stop_0 c001n12" -> "o2cb:1_stop_0 c001n12" [ style = bold] "ocfs2-1:1_stop_0 c001n12" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/clone-max-zero.exp b/pengine/test10/clone-max-zero.exp index d3113c0..53f4109 100644 --- a/pengine/test10/clone-max-zero.exp +++ b/pengine/test10/clone-max-zero.exp @@ -1,206 +1,178 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/clone-max-zero.summary b/pengine/test10/clone-max-zero.summary index 33c4e89..7af0f1f 100644 --- a/pengine/test10/clone-max-zero.summary +++ b/pengine/test10/clone-max-zero.summary @@ -34,7 +34,6 @@ Executing cluster transition: * Resource action: dlm:1 stop on c001n12 * Resource action: dlm:0 stop on c001n11 * Pseudo action: dlm-clone_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ c001n11 c001n12 ] diff --git a/pengine/test10/clone-no-shuffle.dot b/pengine/test10/clone-no-shuffle.dot index 883e779..9ac9e13 100644 --- a/pengine/test10/clone-no-shuffle.dot +++ b/pengine/test10/clone-no-shuffle.dot @@ -1,5 +1,4 @@ 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" ] @@ -9,7 +8,6 @@ digraph "g" { "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] @@ -25,7 +23,6 @@ digraph "g" { "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] @@ -77,7 +74,6 @@ digraph "g" { "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" [ 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 1d5d70a..615709c 100644 --- a/pengine/test10/clone-no-shuffle.exp +++ b/pengine/test10/clone-no-shuffle.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,117 +35,117 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -154,52 +154,52 @@ - + - + - + - + - + - + - + - + - + - + @@ -207,214 +207,214 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -423,30 +423,11 @@ - + - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/clone-no-shuffle.summary b/pengine/test10/clone-no-shuffle.summary index 50dd872..03ce888 100644 --- a/pengine/test10/clone-no-shuffle.summary +++ b/pengine/test10/clone-no-shuffle.summary @@ -39,7 +39,6 @@ Executing cluster transition: * 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 diff --git a/pengine/test10/clone-order-16instances.exp b/pengine/test10/clone-order-16instances.exp index 96ec770..cf8c8d1 100644 --- a/pengine/test10/clone-order-16instances.exp +++ b/pengine/test10/clone-order-16instances.exp @@ -1,464 +1,464 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/clone-order-instance.exp b/pengine/test10/clone-order-instance.exp index 4fb8f6a..124592b 100644 --- a/pengine/test10/clone-order-instance.exp +++ b/pengine/test10/clone-order-instance.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,20 +35,20 @@ - + - + - + @@ -57,23 +57,23 @@ - + - + - + - + @@ -82,34 +82,34 @@ - + - + - + - + - + - + - + diff --git a/pengine/test10/clone-order-primitive.exp b/pengine/test10/clone-order-primitive.exp index 2ad3e91..b54c970 100644 --- a/pengine/test10/clone-order-primitive.exp +++ b/pengine/test10/clone-order-primitive.exp @@ -1,63 +1,63 @@ - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/clone-require-all-1.exp b/pengine/test10/clone-require-all-1.exp index 1ce125e..d77d1f3 100644 --- a/pengine/test10/clone-require-all-1.exp +++ b/pengine/test10/clone-require-all-1.exp @@ -1,77 +1,77 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/clone-require-all-2.dot b/pengine/test10/clone-require-all-2.dot index 4f830ce..0786486 100644 --- a/pengine/test10/clone-require-all-2.dot +++ b/pengine/test10/clone-require-all-2.dot @@ -13,11 +13,9 @@ "A_start_0 " [ style=dashed color="red" fontcolor="black"] "A_stop_0 rhel7-auto1" -> "A-clone_stopped_0" [ style = bold] "A_stop_0 rhel7-auto1" -> "A_start_0 " [ style = dashed] -"A_stop_0 rhel7-auto1" -> "all_stopped" [ style = bold] "A_stop_0 rhel7-auto1" [ style=bold color="green" fontcolor="black"] "A_stop_0 rhel7-auto2" -> "A-clone_stopped_0" [ style = bold] "A_stop_0 rhel7-auto2" -> "A_start_0 " [ style = dashed] -"A_stop_0 rhel7-auto2" -> "all_stopped" [ style = bold] "A_stop_0 rhel7-auto2" [ style=bold color="green" fontcolor="black"] "B-clone_running_0" [ style=dashed color="red" fontcolor="orange"] "B-clone_start_0" -> "B-clone_running_0" [ style = dashed] @@ -32,11 +30,9 @@ "B_start_0 rhel7-auto4" -> "B-clone_running_0" [ style = dashed] "B_start_0 rhel7-auto4" -> "B_monitor_10000 rhel7-auto4" [ style = dashed] "B_start_0 rhel7-auto4" [ style=dashed color="red" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "shooter_monitor_60000 rhel7-auto3" [ style=bold color="green" fontcolor="black"] "shooter_start_0 rhel7-auto3" -> "shooter_monitor_60000 rhel7-auto3" [ style = bold] "shooter_start_0 rhel7-auto3" [ style=bold color="green" fontcolor="black"] -"shooter_stop_0 rhel7-auto1" -> "all_stopped" [ style = bold] "shooter_stop_0 rhel7-auto1" -> "shooter_start_0 rhel7-auto3" [ style = bold] "shooter_stop_0 rhel7-auto1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/clone-require-all-2.exp b/pengine/test10/clone-require-all-2.exp index 9b0b973..6caf5f9 100644 --- a/pengine/test10/clone-require-all-2.exp +++ b/pengine/test10/clone-require-all-2.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,72 +36,54 @@ - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/clone-require-all-2.summary b/pengine/test10/clone-require-all-2.summary index 2ebd230..ead9e14 100644 --- a/pengine/test10/clone-require-all-2.summary +++ b/pengine/test10/clone-require-all-2.summary @@ -25,7 +25,6 @@ Executing cluster transition: * Resource action: A stop on rhel7-auto1 * Resource action: A stop on rhel7-auto2 * Pseudo action: A-clone_stopped_0 - * Pseudo action: all_stopped * Resource action: shooter monitor=60000 on rhel7-auto3 Revised cluster status: diff --git a/pengine/test10/clone-require-all-3.dot b/pengine/test10/clone-require-all-3.dot index d93693d..878d952 100644 --- a/pengine/test10/clone-require-all-3.dot +++ b/pengine/test10/clone-require-all-3.dot @@ -13,11 +13,9 @@ "A_start_0 " [ style=dashed color="red" fontcolor="black"] "A_stop_0 rhel7-auto1" -> "A-clone_stopped_0" [ style = bold] "A_stop_0 rhel7-auto1" -> "A_start_0 " [ style = dashed] -"A_stop_0 rhel7-auto1" -> "all_stopped" [ style = bold] "A_stop_0 rhel7-auto1" [ style=bold color="green" fontcolor="black"] "A_stop_0 rhel7-auto2" -> "A-clone_stopped_0" [ style = bold] "A_stop_0 rhel7-auto2" -> "A_start_0 " [ style = dashed] -"A_stop_0 rhel7-auto2" -> "all_stopped" [ style = bold] "A_stop_0 rhel7-auto2" [ style=bold color="green" fontcolor="black"] "B-clone_running_0" [ style=dashed color="red" fontcolor="orange"] "B-clone_start_0" -> "B-clone_running_0" [ style = dashed] @@ -41,17 +39,13 @@ "B_start_0 rhel7-auto4" [ style=dashed color="red" fontcolor="black"] "B_stop_0 rhel7-auto3" -> "B-clone_stopped_0" [ style = bold] "B_stop_0 rhel7-auto3" -> "B_start_0 rhel7-auto3" [ style = dashed] -"B_stop_0 rhel7-auto3" -> "all_stopped" [ style = bold] "B_stop_0 rhel7-auto3" [ style=bold color="green" fontcolor="black"] "B_stop_0 rhel7-auto4" -> "B-clone_stopped_0" [ style = bold] "B_stop_0 rhel7-auto4" -> "B_start_0 rhel7-auto4" [ style = dashed] -"B_stop_0 rhel7-auto4" -> "all_stopped" [ style = bold] "B_stop_0 rhel7-auto4" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "shooter_monitor_60000 rhel7-auto3" [ style=bold color="green" fontcolor="black"] "shooter_start_0 rhel7-auto3" -> "shooter_monitor_60000 rhel7-auto3" [ style = bold] "shooter_start_0 rhel7-auto3" [ style=bold color="green" fontcolor="black"] -"shooter_stop_0 rhel7-auto1" -> "all_stopped" [ style = bold] "shooter_stop_0 rhel7-auto1" -> "shooter_start_0 rhel7-auto3" [ style = bold] "shooter_stop_0 rhel7-auto1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/clone-require-all-3.exp b/pengine/test10/clone-require-all-3.exp index 3e72133..8b223c8 100644 --- a/pengine/test10/clone-require-all-3.exp +++ b/pengine/test10/clone-require-all-3.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,134 +36,110 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/clone-require-all-3.summary b/pengine/test10/clone-require-all-3.summary index 78076e5..eadefcf 100644 --- a/pengine/test10/clone-require-all-3.summary +++ b/pengine/test10/clone-require-all-3.summary @@ -31,7 +31,6 @@ Executing cluster transition: * Resource action: A stop on rhel7-auto1 * Resource action: A stop on rhel7-auto2 * Pseudo action: A-clone_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Node rhel7-auto1 (1): standby diff --git a/pengine/test10/clone-require-all-4.dot b/pengine/test10/clone-require-all-4.dot index 4b9521f..f7d9fff 100644 --- a/pengine/test10/clone-require-all-4.dot +++ b/pengine/test10/clone-require-all-4.dot @@ -12,13 +12,10 @@ "A_start_0 " [ style=dashed color="red" fontcolor="black"] "A_stop_0 rhel7-auto1" -> "A-clone_stopped_0" [ style = bold] "A_stop_0 rhel7-auto1" -> "A_start_0 " [ style = dashed] -"A_stop_0 rhel7-auto1" -> "all_stopped" [ style = bold] "A_stop_0 rhel7-auto1" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "shooter_monitor_60000 rhel7-auto2" [ style=bold color="green" fontcolor="black"] "shooter_start_0 rhel7-auto2" -> "shooter_monitor_60000 rhel7-auto2" [ style = bold] "shooter_start_0 rhel7-auto2" [ style=bold color="green" fontcolor="black"] -"shooter_stop_0 rhel7-auto1" -> "all_stopped" [ style = bold] "shooter_stop_0 rhel7-auto1" -> "shooter_start_0 rhel7-auto2" [ style = bold] "shooter_stop_0 rhel7-auto1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/clone-require-all-4.exp b/pengine/test10/clone-require-all-4.exp index ff83ac9..2e36de6 100644 --- a/pengine/test10/clone-require-all-4.exp +++ b/pengine/test10/clone-require-all-4.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,35 +36,35 @@ - + - + - + - + - + - + @@ -72,40 +72,25 @@ - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/clone-require-all-4.summary b/pengine/test10/clone-require-all-4.summary index 5b50e04..7035852 100644 --- a/pengine/test10/clone-require-all-4.summary +++ b/pengine/test10/clone-require-all-4.summary @@ -22,7 +22,6 @@ Executing cluster transition: * Resource action: A stop on rhel7-auto1 * Pseudo action: A-clone_stopped_0 * Pseudo action: A-clone_start_0 - * Pseudo action: all_stopped * Resource action: shooter monitor=60000 on rhel7-auto2 * Pseudo action: A-clone_running_0 diff --git a/pengine/test10/clone-require-all-5.exp b/pengine/test10/clone-require-all-5.exp index b55799c..34dab7b 100644 --- a/pengine/test10/clone-require-all-5.exp +++ b/pengine/test10/clone-require-all-5.exp @@ -1,48 +1,48 @@ - + - + - + - + - + - + - + - + @@ -50,106 +50,106 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -167,7 +167,7 @@ - + diff --git a/pengine/test10/clone-require-all-6.dot b/pengine/test10/clone-require-all-6.dot index 3ee5c89..d9631a1 100644 --- a/pengine/test10/clone-require-all-6.dot +++ b/pengine/test10/clone-require-all-6.dot @@ -13,11 +13,8 @@ "A_start_0 " [ style=dashed color="red" fontcolor="black"] "A_stop_0 rhel7-auto1" -> "A-clone_stopped_0" [ style = bold] "A_stop_0 rhel7-auto1" -> "A_start_0 " [ style = dashed] -"A_stop_0 rhel7-auto1" -> "all_stopped" [ style = bold] "A_stop_0 rhel7-auto1" [ style=bold color="green" fontcolor="black"] "A_stop_0 rhel7-auto3" -> "A-clone_stopped_0" [ style = bold] "A_stop_0 rhel7-auto3" -> "A_start_0 " [ style = dashed] -"A_stop_0 rhel7-auto3" -> "all_stopped" [ style = bold] "A_stop_0 rhel7-auto3" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/clone-require-all-6.exp b/pengine/test10/clone-require-all-6.exp index 075bedf..3efc8ed 100644 --- a/pengine/test10/clone-require-all-6.exp +++ b/pengine/test10/clone-require-all-6.exp @@ -1,51 +1,51 @@ - + - + - + - + - + - + - + - + - + @@ -53,40 +53,25 @@ - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/clone-require-all-6.summary b/pengine/test10/clone-require-all-6.summary index 20ccf76..8d96ed7 100644 --- a/pengine/test10/clone-require-all-6.summary +++ b/pengine/test10/clone-require-all-6.summary @@ -20,7 +20,6 @@ Executing cluster transition: * Resource action: A stop on rhel7-auto3 * Pseudo action: A-clone_stopped_0 * Pseudo action: A-clone_start_0 - * Pseudo action: all_stopped * Pseudo action: A-clone_running_0 Revised cluster status: diff --git a/pengine/test10/clone-require-all-7.exp b/pengine/test10/clone-require-all-7.exp index 0ffd03d..6c401b3 100644 --- a/pengine/test10/clone-require-all-7.exp +++ b/pengine/test10/clone-require-all-7.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,7 +36,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -54,33 +54,33 @@ - + - + - + - + - + @@ -89,116 +89,116 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -216,10 +216,10 @@ - + - + diff --git a/pengine/test10/clone-require-all-no-interleave-1.exp b/pengine/test10/clone-require-all-no-interleave-1.exp index d839d92..ae98459 100644 --- a/pengine/test10/clone-require-all-no-interleave-1.exp +++ b/pengine/test10/clone-require-all-no-interleave-1.exp @@ -1,48 +1,48 @@ - + - + - + - + - + - + - + - + @@ -50,159 +50,159 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -220,7 +220,7 @@ - + diff --git a/pengine/test10/clone-require-all-no-interleave-2.exp b/pengine/test10/clone-require-all-no-interleave-2.exp index 05f20d9..d63b0d9 100644 --- a/pengine/test10/clone-require-all-no-interleave-2.exp +++ b/pengine/test10/clone-require-all-no-interleave-2.exp @@ -1,48 +1,48 @@ - + - + - + - + - + - + - + - + @@ -50,159 +50,159 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -220,7 +220,7 @@ - + diff --git a/pengine/test10/clone-require-all-no-interleave-3.dot b/pengine/test10/clone-require-all-no-interleave-3.dot index 58f97a5..9539e86 100644 --- a/pengine/test10/clone-require-all-no-interleave-3.dot +++ b/pengine/test10/clone-require-all-no-interleave-3.dot @@ -15,7 +15,6 @@ "A_start_0 rhel7-auto3" [ style=bold color="green" fontcolor="black"] "A_stop_0 rhel7-auto4" -> "A-clone_stopped_0" [ style = bold] "A_stop_0 rhel7-auto4" -> "A_start_0 rhel7-auto3" [ style = bold] -"A_stop_0 rhel7-auto4" -> "all_stopped" [ style = bold] "A_stop_0 rhel7-auto4" [ style=bold color="green" fontcolor="black"] "B-clone_running_0" [ style=bold color="green" fontcolor="orange"] "B-clone_start_0" -> "B-clone_running_0" [ style = bold] @@ -34,7 +33,6 @@ "B_start_0 rhel7-auto3" [ style=bold color="green" fontcolor="black"] "B_stop_0 rhel7-auto4" -> "B-clone_stopped_0" [ style = bold] "B_stop_0 rhel7-auto4" -> "B_start_0 rhel7-auto3" [ style = bold] -"B_stop_0 rhel7-auto4" -> "all_stopped" [ style = bold] "B_stop_0 rhel7-auto4" [ style=bold color="green" fontcolor="black"] "C-clone_running_0" [ style=bold color="green" fontcolor="orange"] "C-clone_start_0" -> "C-clone_running_0" [ style = bold] @@ -52,9 +50,7 @@ "C_start_0 rhel7-auto3" [ style=bold color="green" fontcolor="black"] "C_stop_0 rhel7-auto4" -> "C-clone_stopped_0" [ style = bold] "C_stop_0 rhel7-auto4" -> "C_start_0 rhel7-auto3" [ style = bold] -"C_stop_0 rhel7-auto4" -> "all_stopped" [ style = bold] "C_stop_0 rhel7-auto4" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "clone-one-or-more:order-B-clone-C-clone-mandatory" -> "C-clone_start_0" [ style = bold] "clone-one-or-more:order-B-clone-C-clone-mandatory" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/clone-require-all-no-interleave-3.exp b/pengine/test10/clone-require-all-no-interleave-3.exp index e68c1c0..c50b8c8 100644 --- a/pengine/test10/clone-require-all-no-interleave-3.exp +++ b/pengine/test10/clone-require-all-no-interleave-3.exp @@ -1,259 +1,259 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -261,22 +261,22 @@ - + - + - + - + @@ -285,37 +285,19 @@ - + - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/clone-require-all-no-interleave-3.summary b/pengine/test10/clone-require-all-no-interleave-3.summary index d45d078..0ce81fe 100644 --- a/pengine/test10/clone-require-all-no-interleave-3.summary +++ b/pengine/test10/clone-require-all-no-interleave-3.summary @@ -30,7 +30,6 @@ Executing cluster transition: * Resource action: A stop on rhel7-auto4 * Pseudo action: A-clone_stopped_0 * Pseudo action: A-clone_start_0 - * Pseudo action: all_stopped * Resource action: A start on rhel7-auto3 * Pseudo action: A-clone_running_0 * Pseudo action: B-clone_start_0 diff --git a/pengine/test10/clone_min_interleave_start_one.exp b/pengine/test10/clone_min_interleave_start_one.exp index a7ffb48..c915054 100644 --- a/pengine/test10/clone_min_interleave_start_one.exp +++ b/pengine/test10/clone_min_interleave_start_one.exp @@ -1,48 +1,48 @@ - + - + - + - + - + - + - + - + diff --git a/pengine/test10/clone_min_interleave_start_two.exp b/pengine/test10/clone_min_interleave_start_two.exp index 0ce054a..a82af70 100644 --- a/pengine/test10/clone_min_interleave_start_two.exp +++ b/pengine/test10/clone_min_interleave_start_two.exp @@ -1,77 +1,77 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -79,106 +79,106 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -190,121 +190,121 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -316,10 +316,10 @@ - + - + diff --git a/pengine/test10/clone_min_interleave_stop_one.dot b/pengine/test10/clone_min_interleave_stop_one.dot index a66ceb6..4175817 100644 --- a/pengine/test10/clone_min_interleave_stop_one.dot +++ b/pengine/test10/clone_min_interleave_stop_one.dot @@ -12,7 +12,5 @@ "FAKE1_start_0 " [ style=dashed color="red" fontcolor="black"] "FAKE1_stop_0 c7auto3" -> "FAKE1-clone_stopped_0" [ style = bold] "FAKE1_stop_0 c7auto3" -> "FAKE1_start_0 " [ style = dashed] -"FAKE1_stop_0 c7auto3" -> "all_stopped" [ style = bold] "FAKE1_stop_0 c7auto3" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/clone_min_interleave_stop_one.exp b/pengine/test10/clone_min_interleave_stop_one.exp index dd803cc..6b0ebc5 100644 --- a/pengine/test10/clone_min_interleave_stop_one.exp +++ b/pengine/test10/clone_min_interleave_stop_one.exp @@ -1,35 +1,35 @@ - + - + - + - + - + - + @@ -37,37 +37,25 @@ - + - + - + - - - - - - - - - - - - - + diff --git a/pengine/test10/clone_min_interleave_stop_one.summary b/pengine/test10/clone_min_interleave_stop_one.summary index 4fd094e..437bdcb 100644 --- a/pengine/test10/clone_min_interleave_stop_one.summary +++ b/pengine/test10/clone_min_interleave_stop_one.summary @@ -18,7 +18,6 @@ Executing cluster transition: * Resource action: FAKE1 stop on c7auto3 * Pseudo action: FAKE1-clone_stopped_0 * Pseudo action: FAKE1-clone_start_0 - * Pseudo action: all_stopped * Pseudo action: FAKE1-clone_running_0 Revised cluster status: diff --git a/pengine/test10/clone_min_interleave_stop_two.dot b/pengine/test10/clone_min_interleave_stop_two.dot index 73f60dd..0299a02 100644 --- a/pengine/test10/clone_min_interleave_stop_two.dot +++ b/pengine/test10/clone_min_interleave_stop_two.dot @@ -13,11 +13,9 @@ "FAKE1_start_0 " [ style=dashed color="red" fontcolor="black"] "FAKE1_stop_0 c7auto2" -> "FAKE1-clone_stopped_0" [ style = bold] "FAKE1_stop_0 c7auto2" -> "FAKE1_start_0 " [ style = dashed] -"FAKE1_stop_0 c7auto2" -> "all_stopped" [ style = bold] "FAKE1_stop_0 c7auto2" [ style=bold color="green" fontcolor="black"] "FAKE1_stop_0 c7auto3" -> "FAKE1-clone_stopped_0" [ style = bold] "FAKE1_stop_0 c7auto3" -> "FAKE1_start_0 " [ style = dashed] -"FAKE1_stop_0 c7auto3" -> "all_stopped" [ style = bold] "FAKE1_stop_0 c7auto3" [ style=bold color="green" fontcolor="black"] "FAKE2-clone_running_0" -> "FAKE3-clone_start_0" [ style = dashed] "FAKE2-clone_running_0" [ style=dashed color="red" fontcolor="orange"] @@ -51,17 +49,14 @@ "FAKE2_start_0 c7auto3" [ style=dashed color="red" fontcolor="black"] "FAKE2_stop_0 c7auto1" -> "FAKE2-clone_stopped_0" [ style = bold] "FAKE2_stop_0 c7auto1" -> "FAKE2_start_0 c7auto1" [ style = dashed] -"FAKE2_stop_0 c7auto1" -> "all_stopped" [ style = bold] "FAKE2_stop_0 c7auto1" [ style=bold color="green" fontcolor="black"] "FAKE2_stop_0 c7auto2" -> "FAKE1_stop_0 c7auto2" [ style = bold] "FAKE2_stop_0 c7auto2" -> "FAKE2-clone_stopped_0" [ style = bold] "FAKE2_stop_0 c7auto2" -> "FAKE2_start_0 c7auto2" [ style = dashed] -"FAKE2_stop_0 c7auto2" -> "all_stopped" [ style = bold] "FAKE2_stop_0 c7auto2" [ style=bold color="green" fontcolor="black"] "FAKE2_stop_0 c7auto3" -> "FAKE1_stop_0 c7auto3" [ style = bold] "FAKE2_stop_0 c7auto3" -> "FAKE2-clone_stopped_0" [ style = bold] "FAKE2_stop_0 c7auto3" -> "FAKE2_start_0 c7auto3" [ style = dashed] -"FAKE2_stop_0 c7auto3" -> "all_stopped" [ style = bold] "FAKE2_stop_0 c7auto3" [ style=bold color="green" fontcolor="black"] "FAKE3-clone_running_0" [ style=dashed color="red" fontcolor="orange"] "FAKE3-clone_start_0" -> "FAKE3-clone_running_0" [ style = dashed] @@ -92,17 +87,13 @@ "FAKE3_stop_0 c7auto1" -> "FAKE2_stop_0 c7auto1" [ style = bold] "FAKE3_stop_0 c7auto1" -> "FAKE3-clone_stopped_0" [ style = bold] "FAKE3_stop_0 c7auto1" -> "FAKE3_start_0 c7auto1" [ style = dashed] -"FAKE3_stop_0 c7auto1" -> "all_stopped" [ style = bold] "FAKE3_stop_0 c7auto1" [ style=bold color="green" fontcolor="black"] "FAKE3_stop_0 c7auto2" -> "FAKE2_stop_0 c7auto2" [ style = bold] "FAKE3_stop_0 c7auto2" -> "FAKE3-clone_stopped_0" [ style = bold] "FAKE3_stop_0 c7auto2" -> "FAKE3_start_0 c7auto2" [ style = dashed] -"FAKE3_stop_0 c7auto2" -> "all_stopped" [ style = bold] "FAKE3_stop_0 c7auto2" [ style=bold color="green" fontcolor="black"] "FAKE3_stop_0 c7auto3" -> "FAKE2_stop_0 c7auto3" [ style = bold] "FAKE3_stop_0 c7auto3" -> "FAKE3-clone_stopped_0" [ style = bold] "FAKE3_stop_0 c7auto3" -> "FAKE3_start_0 c7auto3" [ style = dashed] -"FAKE3_stop_0 c7auto3" -> "all_stopped" [ style = bold] "FAKE3_stop_0 c7auto3" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/clone_min_interleave_stop_two.exp b/pengine/test10/clone_min_interleave_stop_two.exp index db57deb..2a84007 100644 --- a/pengine/test10/clone_min_interleave_stop_two.exp +++ b/pengine/test10/clone_min_interleave_stop_two.exp @@ -1,270 +1,237 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/clone_min_interleave_stop_two.summary b/pengine/test10/clone_min_interleave_stop_two.summary index ccdb5e9..6498612 100644 --- a/pengine/test10/clone_min_interleave_stop_two.summary +++ b/pengine/test10/clone_min_interleave_stop_two.summary @@ -36,7 +36,6 @@ Executing cluster transition: * Resource action: FAKE1 stop on c7auto2 * Pseudo action: FAKE1-clone_stopped_0 * Pseudo action: FAKE1-clone_start_0 - * Pseudo action: all_stopped * Pseudo action: FAKE1-clone_running_0 Revised cluster status: diff --git a/pengine/test10/clone_min_start_one.dot b/pengine/test10/clone_min_start_one.dot index 3940361..e1ef9ac 100644 --- a/pengine/test10/clone_min_start_one.dot +++ b/pengine/test10/clone_min_start_one.dot @@ -10,11 +10,9 @@ "FAKE_monitor_10000 c7auto4" [ style=dashed color="red" fontcolor="black"] "FAKE_start_0 c7auto4" -> "FAKE_monitor_10000 c7auto4" [ style = dashed] "FAKE_start_0 c7auto4" [ style=dashed color="red" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "shooter_monitor_60000 c7auto3" [ style=bold color="green" fontcolor="black"] "shooter_start_0 c7auto3" -> "shooter_monitor_60000 c7auto3" [ style = bold] "shooter_start_0 c7auto3" [ style=bold color="green" fontcolor="black"] -"shooter_stop_0 c7auto1" -> "all_stopped" [ style = bold] "shooter_stop_0 c7auto1" -> "shooter_start_0 c7auto3" [ style = bold] "shooter_stop_0 c7auto1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/clone_min_start_one.exp b/pengine/test10/clone_min_start_one.exp index 6b383fc..9ea1efe 100644 --- a/pengine/test10/clone_min_start_one.exp +++ b/pengine/test10/clone_min_start_one.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,63 +36,51 @@ - + - + - + - + - + - + - + - + - - - - - - - - - - - - diff --git a/pengine/test10/clone_min_start_one.summary b/pengine/test10/clone_min_start_one.summary index 504b81f..a611c7b 100644 --- a/pengine/test10/clone_min_start_one.summary +++ b/pengine/test10/clone_min_start_one.summary @@ -17,7 +17,6 @@ Transition Summary: Executing cluster transition: * Resource action: shooter stop on c7auto1 * Pseudo action: FAKECLONE-clone_start_0 - * Pseudo action: all_stopped * Resource action: shooter start on c7auto3 * Resource action: FAKECLONE start on c7auto3 * Pseudo action: FAKECLONE-clone_running_0 diff --git a/pengine/test10/clone_min_start_two.exp b/pengine/test10/clone_min_start_two.exp index 486873e..48e1bfd 100644 --- a/pengine/test10/clone_min_start_two.exp +++ b/pengine/test10/clone_min_start_two.exp @@ -1,77 +1,77 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -79,20 +79,20 @@ - + - + - + @@ -111,10 +111,10 @@ - + - + diff --git a/pengine/test10/clone_min_stop_all.dot b/pengine/test10/clone_min_stop_all.dot index 254e889..cb97dd1 100644 --- a/pengine/test10/clone_min_stop_all.dot +++ b/pengine/test10/clone_min_stop_all.dot @@ -14,28 +14,22 @@ "FAKECLONE_start_0 " [ style=dashed color="red" fontcolor="black"] "FAKECLONE_stop_0 c7auto1" -> "FAKECLONE-clone_stopped_0" [ style = bold] "FAKECLONE_stop_0 c7auto1" -> "FAKECLONE_start_0 " [ style = dashed] -"FAKECLONE_stop_0 c7auto1" -> "all_stopped" [ style = bold] "FAKECLONE_stop_0 c7auto1" [ style=bold color="green" fontcolor="black"] "FAKECLONE_stop_0 c7auto2" -> "FAKECLONE-clone_stopped_0" [ style = bold] "FAKECLONE_stop_0 c7auto2" -> "FAKECLONE_start_0 " [ style = dashed] -"FAKECLONE_stop_0 c7auto2" -> "all_stopped" [ style = bold] "FAKECLONE_stop_0 c7auto2" [ style=bold color="green" fontcolor="black"] "FAKECLONE_stop_0 c7auto3" -> "FAKECLONE-clone_stopped_0" [ style = bold] "FAKECLONE_stop_0 c7auto3" -> "FAKECLONE_start_0 " [ style = dashed] -"FAKECLONE_stop_0 c7auto3" -> "all_stopped" [ style = bold] "FAKECLONE_stop_0 c7auto3" [ style=bold color="green" fontcolor="black"] "FAKE_monitor_10000 c7auto4" [ style=dashed color="red" fontcolor="black"] "FAKE_start_0 c7auto4" -> "FAKE_monitor_10000 c7auto4" [ style = dashed] "FAKE_start_0 c7auto4" [ style=dashed color="red" fontcolor="black"] "FAKE_stop_0 c7auto4" -> "FAKECLONE-clone_stop_0" [ style = bold] "FAKE_stop_0 c7auto4" -> "FAKE_start_0 c7auto4" [ style = dashed] -"FAKE_stop_0 c7auto4" -> "all_stopped" [ style = bold] "FAKE_stop_0 c7auto4" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "shooter_monitor_60000 c7auto4" [ style=bold color="green" fontcolor="black"] "shooter_start_0 c7auto4" -> "shooter_monitor_60000 c7auto4" [ style = bold] "shooter_start_0 c7auto4" [ style=bold color="green" fontcolor="black"] -"shooter_stop_0 c7auto1" -> "all_stopped" [ style = bold] "shooter_stop_0 c7auto1" -> "shooter_start_0 c7auto4" [ style = bold] "shooter_stop_0 c7auto1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/clone_min_stop_all.exp b/pengine/test10/clone_min_stop_all.exp index 62c9682..ff42f14 100644 --- a/pengine/test10/clone_min_stop_all.exp +++ b/pengine/test10/clone_min_stop_all.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,107 +36,83 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/clone_min_stop_all.summary b/pengine/test10/clone_min_stop_all.summary index c12b0a3..466f8a4 100644 --- a/pengine/test10/clone_min_stop_all.summary +++ b/pengine/test10/clone_min_stop_all.summary @@ -28,7 +28,6 @@ Executing cluster transition: * Resource action: FAKECLONE stop on c7auto2 * Resource action: FAKECLONE stop on c7auto3 * Pseudo action: FAKECLONE-clone_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Node c7auto1 (1): standby diff --git a/pengine/test10/clone_min_stop_one.dot b/pengine/test10/clone_min_stop_one.dot index 19f84cc..db22226 100644 --- a/pengine/test10/clone_min_stop_one.dot +++ b/pengine/test10/clone_min_stop_one.dot @@ -12,7 +12,5 @@ "FAKECLONE_start_0 " [ style=dashed color="red" fontcolor="black"] "FAKECLONE_stop_0 c7auto2" -> "FAKECLONE-clone_stopped_0" [ style = bold] "FAKECLONE_stop_0 c7auto2" -> "FAKECLONE_start_0 " [ style = dashed] -"FAKECLONE_stop_0 c7auto2" -> "all_stopped" [ style = bold] "FAKECLONE_stop_0 c7auto2" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/clone_min_stop_one.exp b/pengine/test10/clone_min_stop_one.exp index 80e4c6c..a1a0247 100644 --- a/pengine/test10/clone_min_stop_one.exp +++ b/pengine/test10/clone_min_stop_one.exp @@ -1,35 +1,35 @@ - + - + - + - + - + - + @@ -37,37 +37,25 @@ - + - + - + - - - - - - - - - - - - - + diff --git a/pengine/test10/clone_min_stop_one.summary b/pengine/test10/clone_min_stop_one.summary index 3fdb675..83ab379 100644 --- a/pengine/test10/clone_min_stop_one.summary +++ b/pengine/test10/clone_min_stop_one.summary @@ -17,7 +17,6 @@ Executing cluster transition: * Resource action: FAKECLONE stop on c7auto2 * Pseudo action: FAKECLONE-clone_stopped_0 * Pseudo action: FAKECLONE-clone_start_0 - * Pseudo action: all_stopped * Pseudo action: FAKECLONE-clone_running_0 Revised cluster status: diff --git a/pengine/test10/clone_min_stop_two.dot b/pengine/test10/clone_min_stop_two.dot index 11640f4..1f1b7a6 100644 --- a/pengine/test10/clone_min_stop_two.dot +++ b/pengine/test10/clone_min_stop_two.dot @@ -13,24 +13,19 @@ "FAKECLONE_start_0 " [ style=dashed color="red" fontcolor="black"] "FAKECLONE_stop_0 c7auto1" -> "FAKECLONE-clone_stopped_0" [ style = bold] "FAKECLONE_stop_0 c7auto1" -> "FAKECLONE_start_0 " [ style = dashed] -"FAKECLONE_stop_0 c7auto1" -> "all_stopped" [ style = bold] "FAKECLONE_stop_0 c7auto1" [ style=bold color="green" fontcolor="black"] "FAKECLONE_stop_0 c7auto2" -> "FAKECLONE-clone_stopped_0" [ style = bold] "FAKECLONE_stop_0 c7auto2" -> "FAKECLONE_start_0 " [ style = dashed] -"FAKECLONE_stop_0 c7auto2" -> "all_stopped" [ style = bold] "FAKECLONE_stop_0 c7auto2" [ style=bold color="green" fontcolor="black"] "FAKE_monitor_10000 c7auto4" [ style=dashed color="red" fontcolor="black"] "FAKE_start_0 c7auto4" -> "FAKE_monitor_10000 c7auto4" [ style = dashed] "FAKE_start_0 c7auto4" [ style=dashed color="red" fontcolor="black"] "FAKE_stop_0 c7auto4" -> "FAKECLONE-clone_stop_0" [ style = bold] "FAKE_stop_0 c7auto4" -> "FAKE_start_0 c7auto4" [ style = dashed] -"FAKE_stop_0 c7auto4" -> "all_stopped" [ style = bold] "FAKE_stop_0 c7auto4" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "shooter_monitor_60000 c7auto3" [ style=bold color="green" fontcolor="black"] "shooter_start_0 c7auto3" -> "shooter_monitor_60000 c7auto3" [ style = bold] "shooter_start_0 c7auto3" [ style=bold color="green" fontcolor="black"] -"shooter_stop_0 c7auto1" -> "all_stopped" [ style = bold] "shooter_stop_0 c7auto1" -> "shooter_start_0 c7auto3" [ style = bold] "shooter_stop_0 c7auto1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/clone_min_stop_two.exp b/pengine/test10/clone_min_stop_two.exp index 09386f4..27bb08c 100644 --- a/pengine/test10/clone_min_stop_two.exp +++ b/pengine/test10/clone_min_stop_two.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,112 +36,91 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/clone_min_stop_two.summary b/pengine/test10/clone_min_stop_two.summary index 5223501..10fea45 100644 --- a/pengine/test10/clone_min_stop_two.summary +++ b/pengine/test10/clone_min_stop_two.summary @@ -26,7 +26,6 @@ Executing cluster transition: * Resource action: FAKECLONE stop on c7auto2 * Pseudo action: FAKECLONE-clone_stopped_0 * Pseudo action: FAKECLONE-clone_start_0 - * Pseudo action: all_stopped * Pseudo action: FAKECLONE-clone_running_0 Revised cluster status: diff --git a/pengine/test10/cloned-group-stop.dot b/pengine/test10/cloned-group-stop.dot index a2a80c3..142bab9 100644 --- a/pengine/test10/cloned-group-stop.dot +++ b/pengine/test10/cloned-group-stop.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "cinder-api_monitor_60000 rhos4-node3" [ style=dashed color="red" fontcolor="black"] "cinder-api_monitor_60000 rhos4-node4" [ style=dashed color="red" fontcolor="black"] "cinder-api_start_0 rhos4-node3" -> "cinder-api_monitor_60000 rhos4-node3" [ style = dashed] @@ -10,11 +9,9 @@ digraph "g" { "cinder-api_start_0 rhos4-node4" -> "cinder-scheduler_start_0 rhos4-node4" [ style = dashed] "cinder-api_start_0 rhos4-node4" -> "cinder:0_running_0" [ style = dashed] "cinder-api_start_0 rhos4-node4" [ style=dashed color="red" fontcolor="black"] -"cinder-api_stop_0 rhos4-node3" -> "all_stopped" [ style = bold] "cinder-api_stop_0 rhos4-node3" -> "cinder-api_start_0 rhos4-node3" [ style = dashed] "cinder-api_stop_0 rhos4-node3" -> "cinder:1_stopped_0" [ style = bold] "cinder-api_stop_0 rhos4-node3" [ style=bold color="green" fontcolor="black"] -"cinder-api_stop_0 rhos4-node4" -> "all_stopped" [ style = bold] "cinder-api_stop_0 rhos4-node4" -> "cinder-api_start_0 rhos4-node4" [ style = dashed] "cinder-api_stop_0 rhos4-node4" -> "cinder:0_stopped_0" [ style = bold] "cinder-api_stop_0 rhos4-node4" [ style=bold color="green" fontcolor="black"] @@ -40,12 +37,10 @@ digraph "g" { "cinder-scheduler_start_0 rhos4-node4" -> "cinder-volume_start_0 rhos4-node4" [ style = dashed] "cinder-scheduler_start_0 rhos4-node4" -> "cinder:0_running_0" [ style = dashed] "cinder-scheduler_start_0 rhos4-node4" [ style=dashed color="red" fontcolor="black"] -"cinder-scheduler_stop_0 rhos4-node3" -> "all_stopped" [ style = bold] "cinder-scheduler_stop_0 rhos4-node3" -> "cinder-api_stop_0 rhos4-node3" [ style = bold] "cinder-scheduler_stop_0 rhos4-node3" -> "cinder-scheduler_start_0 rhos4-node3" [ style = dashed] "cinder-scheduler_stop_0 rhos4-node3" -> "cinder:1_stopped_0" [ style = bold] "cinder-scheduler_stop_0 rhos4-node3" [ style=bold color="green" fontcolor="black"] -"cinder-scheduler_stop_0 rhos4-node4" -> "all_stopped" [ style = bold] "cinder-scheduler_stop_0 rhos4-node4" -> "cinder-api_stop_0 rhos4-node4" [ style = bold] "cinder-scheduler_stop_0 rhos4-node4" -> "cinder-scheduler_start_0 rhos4-node4" [ style = dashed] "cinder-scheduler_stop_0 rhos4-node4" -> "cinder:0_stopped_0" [ style = bold] @@ -58,12 +53,10 @@ digraph "g" { "cinder-volume_start_0 rhos4-node4" -> "cinder-volume_monitor_60000 rhos4-node4" [ style = dashed] "cinder-volume_start_0 rhos4-node4" -> "cinder:0_running_0" [ style = dashed] "cinder-volume_start_0 rhos4-node4" [ style=dashed color="red" fontcolor="black"] -"cinder-volume_stop_0 rhos4-node3" -> "all_stopped" [ style = bold] "cinder-volume_stop_0 rhos4-node3" -> "cinder-scheduler_stop_0 rhos4-node3" [ style = bold] "cinder-volume_stop_0 rhos4-node3" -> "cinder-volume_start_0 rhos4-node3" [ style = dashed] "cinder-volume_stop_0 rhos4-node3" -> "cinder:1_stopped_0" [ style = bold] "cinder-volume_stop_0 rhos4-node3" [ style=bold color="green" fontcolor="black"] -"cinder-volume_stop_0 rhos4-node4" -> "all_stopped" [ style = bold] "cinder-volume_stop_0 rhos4-node4" -> "cinder-scheduler_stop_0 rhos4-node4" [ style = bold] "cinder-volume_stop_0 rhos4-node4" -> "cinder-volume_start_0 rhos4-node4" [ style = dashed] "cinder-volume_stop_0 rhos4-node4" -> "cinder:0_stopped_0" [ style = bold] @@ -106,12 +99,10 @@ digraph "g" { "glance-api_start_0 rhos4-node4" -> "glance-api_monitor_60000 rhos4-node4" [ style = dashed] "glance-api_start_0 rhos4-node4" -> "glance:0_running_0" [ style = dashed] "glance-api_start_0 rhos4-node4" [ style=dashed color="red" fontcolor="black"] -"glance-api_stop_0 rhos4-node3" -> "all_stopped" [ style = bold] "glance-api_stop_0 rhos4-node3" -> "glance-api_start_0 rhos4-node3" [ style = dashed] "glance-api_stop_0 rhos4-node3" -> "glance-registry_stop_0 rhos4-node3" [ style = bold] "glance-api_stop_0 rhos4-node3" -> "glance:1_stopped_0" [ style = bold] "glance-api_stop_0 rhos4-node3" [ style=bold color="green" fontcolor="black"] -"glance-api_stop_0 rhos4-node4" -> "all_stopped" [ style = bold] "glance-api_stop_0 rhos4-node4" -> "glance-api_start_0 rhos4-node4" [ style = dashed] "glance-api_stop_0 rhos4-node4" -> "glance-registry_stop_0 rhos4-node4" [ style = bold] "glance-api_stop_0 rhos4-node4" -> "glance:0_stopped_0" [ style = bold] @@ -139,11 +130,9 @@ digraph "g" { "glance-fs_start_0 rhos4-node4" -> "glance-registry_start_0 rhos4-node4" [ style = dashed] "glance-fs_start_0 rhos4-node4" -> "glance:0_running_0" [ style = dashed] "glance-fs_start_0 rhos4-node4" [ style=dashed color="red" fontcolor="black"] -"glance-fs_stop_0 rhos4-node3" -> "all_stopped" [ style = bold] "glance-fs_stop_0 rhos4-node3" -> "glance-fs_start_0 rhos4-node3" [ style = dashed] "glance-fs_stop_0 rhos4-node3" -> "glance:1_stopped_0" [ style = bold] "glance-fs_stop_0 rhos4-node3" [ style=bold color="green" fontcolor="black"] -"glance-fs_stop_0 rhos4-node4" -> "all_stopped" [ style = bold] "glance-fs_stop_0 rhos4-node4" -> "glance-fs_start_0 rhos4-node4" [ style = dashed] "glance-fs_stop_0 rhos4-node4" -> "glance:0_stopped_0" [ style = bold] "glance-fs_stop_0 rhos4-node4" [ style=bold color="green" fontcolor="black"] @@ -157,12 +146,10 @@ digraph "g" { "glance-registry_start_0 rhos4-node4" -> "glance-registry_monitor_60000 rhos4-node4" [ style = dashed] "glance-registry_start_0 rhos4-node4" -> "glance:0_running_0" [ style = dashed] "glance-registry_start_0 rhos4-node4" [ style=dashed color="red" fontcolor="black"] -"glance-registry_stop_0 rhos4-node3" -> "all_stopped" [ style = bold] "glance-registry_stop_0 rhos4-node3" -> "glance-fs_stop_0 rhos4-node3" [ style = bold] "glance-registry_stop_0 rhos4-node3" -> "glance-registry_start_0 rhos4-node3" [ style = dashed] "glance-registry_stop_0 rhos4-node3" -> "glance:1_stopped_0" [ style = bold] "glance-registry_stop_0 rhos4-node3" [ style=bold color="green" fontcolor="black"] -"glance-registry_stop_0 rhos4-node4" -> "all_stopped" [ style = bold] "glance-registry_stop_0 rhos4-node4" -> "glance-fs_stop_0 rhos4-node4" [ style = bold] "glance-registry_stop_0 rhos4-node4" -> "glance-registry_start_0 rhos4-node4" [ style = dashed] "glance-registry_stop_0 rhos4-node4" -> "glance:0_stopped_0" [ style = bold] @@ -218,11 +205,9 @@ digraph "g" { "keystone_start_0 rhos4-node4" -> "keystone-clone_running_0" [ style = dashed] "keystone_start_0 rhos4-node4" -> "keystone_monitor_60000 rhos4-node4" [ style = dashed] "keystone_start_0 rhos4-node4" [ style=dashed color="red" fontcolor="black"] -"keystone_stop_0 rhos4-node3" -> "all_stopped" [ style = bold] "keystone_stop_0 rhos4-node3" -> "keystone-clone_stopped_0" [ style = bold] "keystone_stop_0 rhos4-node3" -> "keystone_start_0 rhos4-node3" [ style = dashed] "keystone_stop_0 rhos4-node3" [ style=bold color="green" fontcolor="black"] -"keystone_stop_0 rhos4-node4" -> "all_stopped" [ style = bold] "keystone_stop_0 rhos4-node4" -> "keystone-clone_stopped_0" [ style = bold] "keystone_stop_0 rhos4-node4" -> "keystone_start_0 rhos4-node4" [ style = dashed] "keystone_stop_0 rhos4-node4" [ style=bold color="green" fontcolor="black"] @@ -231,10 +216,8 @@ digraph "g" { "qpidd-clone_stop_0" -> "qpidd_stop_0 rhos4-node4" [ style = bold] "qpidd-clone_stop_0" [ style=bold color="green" fontcolor="orange"] "qpidd-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] -"qpidd_stop_0 rhos4-node3" -> "all_stopped" [ style = bold] "qpidd_stop_0 rhos4-node3" -> "qpidd-clone_stopped_0" [ style = bold] "qpidd_stop_0 rhos4-node3" [ style=bold color="green" fontcolor="black"] -"qpidd_stop_0 rhos4-node4" -> "all_stopped" [ style = bold] "qpidd_stop_0 rhos4-node4" -> "qpidd-clone_stopped_0" [ style = bold] "qpidd_stop_0 rhos4-node4" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/cloned-group-stop.exp b/pengine/test10/cloned-group-stop.exp index a512940..436fc2e 100644 --- a/pengine/test10/cloned-group-stop.exp +++ b/pengine/test10/cloned-group-stop.exp @@ -1,539 +1,482 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/cloned-group-stop.summary b/pengine/test10/cloned-group-stop.summary index dd1b02c..86a0e33 100644 --- a/pengine/test10/cloned-group-stop.summary +++ b/pengine/test10/cloned-group-stop.summary @@ -68,7 +68,6 @@ Executing cluster transition: * Resource action: qpidd stop on rhos4-node4 * Resource action: qpidd stop on rhos4-node3 * Pseudo action: qpidd-clone_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ rhos4-node3 rhos4-node4 ] diff --git a/pengine/test10/cloned-group.dot b/pengine/test10/cloned-group.dot index cf6ec27..398133b 100644 --- a/pengine/test10/cloned-group.dot +++ b/pengine/test10/cloned-group.dot @@ -1,6 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] -"apache2:0_stop_0 webcluster01" -> "all_stopped" [ style = bold] "apache2:0_stop_0 webcluster01" -> "grrr:2_stopped_0" [ style = bold] "apache2:0_stop_0 webcluster01" [ style=bold color="green" fontcolor="black"] "apache2:1_monitor_10000 webcluster01" [ style=bold color="green" fontcolor="black" ] @@ -8,7 +6,6 @@ digraph "g" { "apache2:1_start_0 webcluster01" -> "grrr:0_running_0" [ style = bold] "apache2:1_start_0 webcluster01" -> "mysql-proxy:1_start_0 webcluster01" [ style = bold] "apache2:1_start_0 webcluster01" [ style=bold color="green" fontcolor="black" ] -"apache2:1_stop_0 webcluster01" -> "all_stopped" [ style = bold] "apache2:1_stop_0 webcluster01" -> "apache2:1_start_0 webcluster01" [ style = bold] "apache2:1_stop_0 webcluster01" -> "grrr:0_stopped_0" [ style = bold] "apache2:1_stop_0 webcluster01" [ style=bold color="green" fontcolor="black" ] @@ -41,7 +38,6 @@ digraph "g" { "grrr:2_stop_0" [ style=bold color="green" fontcolor="orange" ] "grrr:2_stopped_0" -> "apache2_clone_stopped_0" [ style = bold] "grrr:2_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"mysql-proxy:0_stop_0 webcluster01" -> "all_stopped" [ style = bold] "mysql-proxy:0_stop_0 webcluster01" -> "apache2:0_stop_0 webcluster01" [ style = bold] "mysql-proxy:0_stop_0 webcluster01" -> "grrr:2_stopped_0" [ style = bold] "mysql-proxy:0_stop_0 webcluster01" [ style=bold color="green" fontcolor="black"] @@ -49,7 +45,6 @@ digraph "g" { "mysql-proxy:1_start_0 webcluster01" -> "grrr:0_running_0" [ style = bold] "mysql-proxy:1_start_0 webcluster01" -> "mysql-proxy:1_monitor_10000 webcluster01" [ style = bold] "mysql-proxy:1_start_0 webcluster01" [ style=bold color="green" fontcolor="black" ] -"mysql-proxy:1_stop_0 webcluster01" -> "all_stopped" [ style = bold] "mysql-proxy:1_stop_0 webcluster01" -> "apache2:1_stop_0 webcluster01" [ style = bold] "mysql-proxy:1_stop_0 webcluster01" -> "grrr:0_stopped_0" [ style = bold] "mysql-proxy:1_stop_0 webcluster01" -> "mysql-proxy:1_start_0 webcluster01" [ style = bold] diff --git a/pengine/test10/cloned-group.exp b/pengine/test10/cloned-group.exp index 3e2d000..b1f9807 100644 --- a/pengine/test10/cloned-group.exp +++ b/pengine/test10/cloned-group.exp @@ -1,96 +1,96 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -103,39 +103,39 @@ - + - + - + - + - + - + - + @@ -148,90 +148,90 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -239,49 +239,28 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/cloned-group.summary b/pengine/test10/cloned-group.summary index 0c9c061..b2b8c04 100644 --- a/pengine/test10/cloned-group.summary +++ b/pengine/test10/cloned-group.summary @@ -24,7 +24,6 @@ Executing cluster transition: * Resource action: mysql-proxy:0 stop on webcluster01 * Resource action: apache2:1 stop on webcluster01 * Resource action: apache2:0 stop on webcluster01 - * Pseudo action: all_stopped * Pseudo action: grrr:0_stopped_0 * Pseudo action: grrr:2_stopped_0 * Pseudo action: apache2_clone_stopped_0 diff --git a/pengine/test10/cloned_start_one.dot b/pengine/test10/cloned_start_one.dot index b3c254c..ac5706d 100644 --- a/pengine/test10/cloned_start_one.dot +++ b/pengine/test10/cloned_start_one.dot @@ -18,15 +18,12 @@ "FAKECLONE2_start_0 c7auto4" -> "FAKECLONE2_monitor_10000 c7auto4" [ style = dashed] "FAKECLONE2_start_0 c7auto4" [ style=dashed color="red" fontcolor="black"] "FAKECLONE2_stop_0 c7auto3" -> "FAKECLONE2-clone_stopped_0" [ style = bold] -"FAKECLONE2_stop_0 c7auto3" -> "all_stopped" [ style = bold] "FAKECLONE2_stop_0 c7auto3" [ style=bold color="green" fontcolor="black"] "FAKECLONE2_stop_0 c7auto4" -> "FAKECLONE2-clone_stopped_0" [ style = bold] "FAKECLONE2_stop_0 c7auto4" -> "FAKECLONE2_start_0 c7auto4" [ style = dashed] -"FAKECLONE2_stop_0 c7auto4" -> "all_stopped" [ style = bold] "FAKECLONE2_stop_0 c7auto4" [ style=bold color="green" fontcolor="black"] "FAKECLONE_monitor_10000 c7auto1" [ style=bold color="green" fontcolor="black"] "FAKECLONE_start_0 c7auto1" -> "FAKECLONE-clone_running_0" [ style = bold] "FAKECLONE_start_0 c7auto1" -> "FAKECLONE_monitor_10000 c7auto1" [ style = bold] "FAKECLONE_start_0 c7auto1" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/cloned_start_one.exp b/pengine/test10/cloned_start_one.exp index 1cd567a..6384787 100644 --- a/pengine/test10/cloned_start_one.exp +++ b/pengine/test10/cloned_start_one.exp @@ -1,48 +1,48 @@ - + - + - + - + - + - + - + - + @@ -50,69 +50,54 @@ - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - diff --git a/pengine/test10/cloned_start_one.summary b/pengine/test10/cloned_start_one.summary index 38bf2ae..c9b0d82 100644 --- a/pengine/test10/cloned_start_one.summary +++ b/pengine/test10/cloned_start_one.summary @@ -24,7 +24,6 @@ Executing cluster transition: * Resource action: FAKECLONE2 stop on c7auto3 * Resource action: FAKECLONE2 stop on c7auto4 * Pseudo action: FAKECLONE2-clone_stopped_0 - * Pseudo action: all_stopped * Resource action: FAKECLONE monitor=10000 on c7auto1 Revised cluster status: diff --git a/pengine/test10/cloned_start_two.dot b/pengine/test10/cloned_start_two.dot index 348d435..9f98c5d 100644 --- a/pengine/test10/cloned_start_two.dot +++ b/pengine/test10/cloned_start_two.dot @@ -9,7 +9,6 @@ "FAKECLONE2-clone_stop_0" [ style=bold color="green" fontcolor="orange"] "FAKECLONE2-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] "FAKECLONE2_stop_0 c7auto3" -> "FAKECLONE2-clone_stopped_0" [ style = bold] -"FAKECLONE2_stop_0 c7auto3" -> "all_stopped" [ style = bold] "FAKECLONE2_stop_0 c7auto3" [ style=bold color="green" fontcolor="black"] "FAKECLONE:1_monitor_10000 c7auto1" [ style=bold color="green" fontcolor="black"] "FAKECLONE:1_start_0 c7auto1" -> "FAKECLONE-clone_running_0" [ style = bold] @@ -21,6 +20,5 @@ "FAKECLONE_start_0 c7auto2" -> "FAKECLONE_monitor_10000 c7auto2" [ style = bold] "FAKECLONE_start_0 c7auto2" -> "clone-one-or-more:order-FAKECLONE-clone-FAKECLONE2-clone-mandatory" [ style = bold] "FAKECLONE_start_0 c7auto2" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "clone-one-or-more:order-FAKECLONE-clone-FAKECLONE2-clone-mandatory" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/cloned_start_two.exp b/pengine/test10/cloned_start_two.exp index d3eb250..80ccf2e 100644 --- a/pengine/test10/cloned_start_two.exp +++ b/pengine/test10/cloned_start_two.exp @@ -1,77 +1,77 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -79,35 +79,35 @@ - + - + - + - + - + - + @@ -115,28 +115,16 @@ - - - - - - - - - - - - - + - + diff --git a/pengine/test10/cloned_start_two.summary b/pengine/test10/cloned_start_two.summary index 2b47881..1f5ed5f 100644 --- a/pengine/test10/cloned_start_two.summary +++ b/pengine/test10/cloned_start_two.summary @@ -23,7 +23,6 @@ Executing cluster transition: * Pseudo action: FAKECLONE-clone_running_0 * Resource action: FAKECLONE2 stop on c7auto3 * Pseudo action: FAKECLONE2-clone_stopped_0 - * Pseudo action: all_stopped * Pseudo action: clone-one-or-more:order-FAKECLONE-clone-FAKECLONE2-clone-mandatory * Resource action: FAKECLONE monitor=10000 on c7auto2 * Resource action: FAKECLONE monitor=10000 on c7auto1 diff --git a/pengine/test10/cloned_stop_one.dot b/pengine/test10/cloned_stop_one.dot index d181135..ce82958 100644 --- a/pengine/test10/cloned_stop_one.dot +++ b/pengine/test10/cloned_stop_one.dot @@ -14,13 +14,10 @@ "FAKECLONE2-clone_stopped_0" -> "FAKECLONE-clone_stop_0" [ style = bold] "FAKECLONE2-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] "FAKECLONE2_stop_0 c7auto3" -> "FAKECLONE2-clone_stopped_0" [ style = bold] -"FAKECLONE2_stop_0 c7auto3" -> "all_stopped" [ style = bold] "FAKECLONE2_stop_0 c7auto3" [ style=bold color="green" fontcolor="black"] "FAKECLONE_start_0 " -> "FAKECLONE-clone_running_0" [ style = dashed] "FAKECLONE_start_0 " [ style=dashed color="red" fontcolor="black"] "FAKECLONE_stop_0 c7auto3" -> "FAKECLONE-clone_stopped_0" [ style = bold] "FAKECLONE_stop_0 c7auto3" -> "FAKECLONE_start_0 " [ style = dashed] -"FAKECLONE_stop_0 c7auto3" -> "all_stopped" [ style = bold] "FAKECLONE_stop_0 c7auto3" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/cloned_stop_one.exp b/pengine/test10/cloned_stop_one.exp index d4797ac..e1cb0d0 100644 --- a/pengine/test10/cloned_stop_one.exp +++ b/pengine/test10/cloned_stop_one.exp @@ -1,117 +1,102 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - diff --git a/pengine/test10/cloned_stop_one.summary b/pengine/test10/cloned_stop_one.summary index 892548d..edd3c1d 100644 --- a/pengine/test10/cloned_stop_one.summary +++ b/pengine/test10/cloned_stop_one.summary @@ -23,7 +23,6 @@ Executing cluster transition: * Resource action: FAKECLONE stop on c7auto3 * Pseudo action: FAKECLONE-clone_stopped_0 * Pseudo action: FAKECLONE-clone_start_0 - * Pseudo action: all_stopped * Pseudo action: FAKECLONE-clone_running_0 Revised cluster status: diff --git a/pengine/test10/cloned_stop_two.dot b/pengine/test10/cloned_stop_two.dot index 2c7fd3d..cb23d3c 100644 --- a/pengine/test10/cloned_stop_two.dot +++ b/pengine/test10/cloned_stop_two.dot @@ -25,21 +25,16 @@ "FAKECLONE2_start_0 c7auto4" -> "FAKECLONE2_monitor_10000 c7auto4" [ style = dashed] "FAKECLONE2_start_0 c7auto4" [ style=dashed color="red" fontcolor="black"] "FAKECLONE2_stop_0 c7auto3" -> "FAKECLONE2-clone_stopped_0" [ style = bold] -"FAKECLONE2_stop_0 c7auto3" -> "all_stopped" [ style = bold] "FAKECLONE2_stop_0 c7auto3" [ style=bold color="green" fontcolor="black"] "FAKECLONE2_stop_0 c7auto4" -> "FAKECLONE2-clone_stopped_0" [ style = bold] "FAKECLONE2_stop_0 c7auto4" -> "FAKECLONE2_start_0 c7auto4" [ style = dashed] -"FAKECLONE2_stop_0 c7auto4" -> "all_stopped" [ style = bold] "FAKECLONE2_stop_0 c7auto4" [ style=bold color="green" fontcolor="black"] "FAKECLONE_start_0 " -> "FAKECLONE-clone_running_0" [ style = dashed] "FAKECLONE_start_0 " [ style=dashed color="red" fontcolor="black"] "FAKECLONE_stop_0 c7auto2" -> "FAKECLONE-clone_stopped_0" [ style = bold] "FAKECLONE_stop_0 c7auto2" -> "FAKECLONE_start_0 " [ style = dashed] -"FAKECLONE_stop_0 c7auto2" -> "all_stopped" [ style = bold] "FAKECLONE_stop_0 c7auto2" [ style=bold color="green" fontcolor="black"] "FAKECLONE_stop_0 c7auto3" -> "FAKECLONE-clone_stopped_0" [ style = bold] "FAKECLONE_stop_0 c7auto3" -> "FAKECLONE_start_0 " [ style = dashed] -"FAKECLONE_stop_0 c7auto3" -> "all_stopped" [ style = bold] "FAKECLONE_stop_0 c7auto3" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/cloned_stop_two.exp b/pengine/test10/cloned_stop_two.exp index cc39af6..08e8dc9 100644 --- a/pengine/test10/cloned_stop_two.exp +++ b/pengine/test10/cloned_stop_two.exp @@ -1,155 +1,134 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/cloned_stop_two.summary b/pengine/test10/cloned_stop_two.summary index d6a4f2c..24583d9 100644 --- a/pengine/test10/cloned_stop_two.summary +++ b/pengine/test10/cloned_stop_two.summary @@ -28,7 +28,6 @@ Executing cluster transition: * Resource action: FAKECLONE stop on c7auto3 * Pseudo action: FAKECLONE-clone_stopped_0 * Pseudo action: FAKECLONE-clone_start_0 - * Pseudo action: all_stopped * Pseudo action: FAKECLONE-clone_running_0 Revised cluster status: diff --git a/pengine/test10/cluster-specific-params.exp b/pengine/test10/cluster-specific-params.exp index 00fa252..77a02e8 100644 --- a/pengine/test10/cluster-specific-params.exp +++ b/pengine/test10/cluster-specific-params.exp @@ -1,36 +1,36 @@ - + - + - + - + - + - + @@ -39,7 +39,7 @@ - + diff --git a/pengine/test10/colo_master_w_native.exp b/pengine/test10/colo_master_w_native.exp index ffa773f..ecd8ce7 100644 --- a/pengine/test10/colo_master_w_native.exp +++ b/pengine/test10/colo_master_w_native.exp @@ -1,143 +1,143 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -147,7 +147,7 @@ - + @@ -162,58 +162,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -221,118 +221,118 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/colo_slave_w_native.dot b/pengine/test10/colo_slave_w_native.dot index 045dde6..9a8c12d 100644 --- a/pengine/test10/colo_slave_w_native.dot +++ b/pengine/test10/colo_slave_w_native.dot @@ -3,7 +3,6 @@ "A_start_0 node2" -> "A_monitor_10000 node2" [ style = bold] "A_start_0 node2" [ style=bold color="green" fontcolor="black"] "A_stop_0 node1" -> "A_start_0 node2" [ style = bold] -"A_stop_0 node1" -> "all_stopped" [ style = bold] "A_stop_0 node1" [ style=bold color="green" fontcolor="black"] "Cancel MS_RSC_NATIVE:1_monitor_15000 node1" -> "MS_RSC_NATIVE:1_promote_0 node1" [ style = bold] "Cancel MS_RSC_NATIVE:1_monitor_15000 node1" [ style=bold color="green" fontcolor="black"] @@ -66,5 +65,4 @@ "MS_RSC_promote_0" [ style=bold color="green" fontcolor="orange"] "MS_RSC_promoted_0" -> "MS_RSC_post_notify_promoted_0" [ style = bold] "MS_RSC_promoted_0" [ style=bold color="green" fontcolor="orange"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/colo_slave_w_native.exp b/pengine/test10/colo_slave_w_native.exp index a548923..1a1f4f7 100644 --- a/pengine/test10/colo_slave_w_native.exp +++ b/pengine/test10/colo_slave_w_native.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,143 +36,143 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -182,7 +182,7 @@ - + @@ -197,58 +197,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -256,130 +256,118 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - + diff --git a/pengine/test10/colo_slave_w_native.summary b/pengine/test10/colo_slave_w_native.summary index f59d93b..8eb1d1e 100644 --- a/pengine/test10/colo_slave_w_native.summary +++ b/pengine/test10/colo_slave_w_native.summary @@ -16,7 +16,6 @@ Executing cluster transition: * Resource action: A stop on node1 * Resource action: MS_RSC_NATIVE:1 cancel=15000 on node1 * Pseudo action: MS_RSC_pre_notify_demote_0 - * Pseudo action: all_stopped * Resource action: A start on node2 * Resource action: MS_RSC_NATIVE:0 notify on node2 * Resource action: MS_RSC_NATIVE:1 notify on node1 diff --git a/pengine/test10/coloc-attr.exp b/pengine/test10/coloc-attr.exp index d69fc0a..de67286 100644 --- a/pengine/test10/coloc-attr.exp +++ b/pengine/test10/coloc-attr.exp @@ -1,22 +1,22 @@ - + - + - + - + @@ -24,54 +24,54 @@ - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/coloc-clone-stays-active.dot b/pengine/test10/coloc-clone-stays-active.dot index ef729ef..7e4bea3 100644 --- a/pengine/test10/coloc-clone-stays-active.dot +++ b/pengine/test10/coloc-clone-stays-active.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "mgmt-vm_migrate_from_0 s01-1" -> "mgmt-vm_start_0 s01-1" [ style = bold] "mgmt-vm_migrate_from_0 s01-1" -> "mgmt-vm_stop_0 s01-0" [ style = bold] "mgmt-vm_migrate_from_0 s01-1" [ style=bold color="green" fontcolor="black" ] @@ -8,7 +7,6 @@ digraph "g" { "mgmt-vm_monitor_10000 s01-1" [ style=bold color="green" fontcolor="black" ] "mgmt-vm_start_0 s01-1" -> "mgmt-vm_monitor_10000 s01-1" [ style = bold] "mgmt-vm_start_0 s01-1" [ style=bold color="green" fontcolor="orange" ] -"mgmt-vm_stop_0 s01-0" -> "all_stopped" [ style = bold] "mgmt-vm_stop_0 s01-0" -> "mgmt-vm_start_0 s01-1" [ style = bold] "mgmt-vm_stop_0 s01-0" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/coloc-clone-stays-active.exp b/pengine/test10/coloc-clone-stays-active.exp index e765d8c..dbeb23e 100644 --- a/pengine/test10/coloc-clone-stays-active.exp +++ b/pengine/test10/coloc-clone-stays-active.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,54 +23,42 @@ - + - + - + - + - + - + - - - - - - - - - - - - - + diff --git a/pengine/test10/coloc-clone-stays-active.summary b/pengine/test10/coloc-clone-stays-active.summary index df9b92c..cfc573c 100644 --- a/pengine/test10/coloc-clone-stays-active.summary +++ b/pengine/test10/coloc-clone-stays-active.summary @@ -104,7 +104,6 @@ Executing cluster transition: * Resource action: mgmt-vm migrate_to on s01-0 * Resource action: mgmt-vm migrate_from on s01-1 * Resource action: mgmt-vm stop on s01-0 - * Pseudo action: all_stopped * Pseudo action: mgmt-vm_start_0 * Resource action: mgmt-vm monitor=10000 on s01-1 diff --git a/pengine/test10/coloc-group.exp b/pengine/test10/coloc-group.exp index 7aaf59c..d043b31 100644 --- a/pengine/test10/coloc-group.exp +++ b/pengine/test10/coloc-group.exp @@ -1,26 +1,26 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -55,23 +55,23 @@ - + - + - + - + @@ -80,7 +80,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -98,7 +98,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -116,7 +116,7 @@ - + diff --git a/pengine/test10/coloc-intra-set.dot b/pengine/test10/coloc-intra-set.dot index a5ddb3b..c7b09a4 100644 --- a/pengine/test10/coloc-intra-set.dot +++ b/pengine/test10/coloc-intra-set.dot @@ -1,17 +1,14 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "d0:0_delete_0 hex-13" [ style=bold color="green" fontcolor="black"] "dlm:0_delete_0 hex-13" [ style=bold color="green" fontcolor="black"] "dummy1_monitor_15000 hex-14" [ style=bold color="green" fontcolor="black" ] "dummy1_start_0 hex-14" -> "dummy1_monitor_15000 hex-14" [ style = bold] "dummy1_start_0 hex-14" [ style=bold color="green" fontcolor="black" ] -"dummy1_stop_0 hex-13" -> "all_stopped" [ style = bold] "dummy1_stop_0 hex-13" -> "dummy1_start_0 hex-14" [ style = bold] "dummy1_stop_0 hex-13" [ style=bold color="green" fontcolor="black" ] "dummy3_monitor_15000 hex-14" [ style=bold color="green" fontcolor="black" ] "dummy3_start_0 hex-14" -> "dummy3_monitor_15000 hex-14" [ style = bold] "dummy3_start_0 hex-14" [ style=bold color="green" fontcolor="black" ] -"dummy3_stop_0 hex-13" -> "all_stopped" [ style = bold] "dummy3_stop_0 hex-13" -> "dummy3_start_0 hex-14" [ style = bold] "dummy3_stop_0 hex-13" [ style=bold color="green" fontcolor="black" ] "dummy4_delete_0 hex-13" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/coloc-intra-set.exp b/pengine/test10/coloc-intra-set.exp index 198f943..fbd26bf 100644 --- a/pengine/test10/coloc-intra-set.exp +++ b/pengine/test10/coloc-intra-set.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,33 +36,33 @@ - + - + - + - + - + @@ -71,7 +71,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -98,7 +98,7 @@ - + @@ -107,27 +107,11 @@ - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/coloc-intra-set.summary b/pengine/test10/coloc-intra-set.summary index e313d5a..3e2dcfe 100644 --- a/pengine/test10/coloc-intra-set.summary +++ b/pengine/test10/coloc-intra-set.summary @@ -20,7 +20,6 @@ Executing cluster transition: * Resource action: dummy4 delete on hex-13 * Resource action: dlm:0 delete on hex-13 * Resource action: ocfs2-3:0 delete on hex-13 - * Pseudo action: all_stopped * Resource action: dummy1 start on hex-14 * Resource action: dummy3 start on hex-14 * Resource action: dummy1 monitor=15000 on hex-14 diff --git a/pengine/test10/coloc-list.exp b/pengine/test10/coloc-list.exp index a53d554..95716a4 100644 --- a/pengine/test10/coloc-list.exp +++ b/pengine/test10/coloc-list.exp @@ -1,26 +1,26 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -47,20 +47,20 @@ - + - + - + @@ -69,7 +69,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -87,26 +87,26 @@ - + - + - + - + - + @@ -115,7 +115,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -142,7 +142,7 @@ - + diff --git a/pengine/test10/coloc-loop.exp b/pengine/test10/coloc-loop.exp index 9fa67e8..58e3bf2 100644 --- a/pengine/test10/coloc-loop.exp +++ b/pengine/test10/coloc-loop.exp @@ -1,26 +1,26 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -47,26 +47,26 @@ - + - + - + - + - + @@ -75,7 +75,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -93,26 +93,26 @@ - + - + - + - + - + @@ -121,7 +121,7 @@ - + @@ -130,7 +130,7 @@ - + diff --git a/pengine/test10/coloc-many-one.exp b/pengine/test10/coloc-many-one.exp index 3054754..01aa095 100644 --- a/pengine/test10/coloc-many-one.exp +++ b/pengine/test10/coloc-many-one.exp @@ -1,26 +1,26 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -47,20 +47,20 @@ - + - + - + @@ -69,7 +69,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -87,26 +87,26 @@ - + - + - + - + - + @@ -115,7 +115,7 @@ - + @@ -124,7 +124,7 @@ - + diff --git a/pengine/test10/coloc-slave-anti.exp b/pengine/test10/coloc-slave-anti.exp index a98aae1..d5215c2 100644 --- a/pengine/test10/coloc-slave-anti.exp +++ b/pengine/test10/coloc-slave-anti.exp @@ -1,28 +1,28 @@ - + - + - + - + - + - + @@ -30,85 +30,85 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/coloc_fp_logic.dot b/pengine/test10/coloc_fp_logic.dot index 5a900e4..ce5c5e8 100644 --- a/pengine/test10/coloc_fp_logic.dot +++ b/pengine/test10/coloc_fp_logic.dot @@ -3,7 +3,5 @@ "A_start_0 node2" -> "A_monitor_10000 node2" [ style = bold] "A_start_0 node2" [ style=bold color="green" fontcolor="black"] "A_stop_0 node1" -> "A_start_0 node2" [ style = bold] -"A_stop_0 node1" -> "all_stopped" [ style = bold] "A_stop_0 node1" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/coloc_fp_logic.exp b/pengine/test10/coloc_fp_logic.exp index 659a5f2..6527fa2 100644 --- a/pengine/test10/coloc_fp_logic.exp +++ b/pengine/test10/coloc_fp_logic.exp @@ -1,50 +1,37 @@ - + - + - + - + - + - - - - - - - - - - - - - diff --git a/pengine/test10/coloc_fp_logic.summary b/pengine/test10/coloc_fp_logic.summary index 0c2f4b9..951e4c7 100644 --- a/pengine/test10/coloc_fp_logic.summary +++ b/pengine/test10/coloc_fp_logic.summary @@ -10,7 +10,6 @@ Transition Summary: Executing cluster transition: * Resource action: A stop on node1 - * Pseudo action: all_stopped * Resource action: A start on node2 * Resource action: A monitor=10000 on node2 diff --git a/pengine/test10/colocate-primitive-with-clone.exp b/pengine/test10/colocate-primitive-with-clone.exp index 66218e8..16efa49 100644 --- a/pengine/test10/colocate-primitive-with-clone.exp +++ b/pengine/test10/colocate-primitive-with-clone.exp @@ -1,31 +1,31 @@ - + - + - + - + - + - + - + @@ -33,107 +33,107 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/colocated-utilization-clone.exp b/pengine/test10/colocated-utilization-clone.exp index 376c653..c7bc4d0 100644 --- a/pengine/test10/colocated-utilization-clone.exp +++ b/pengine/test10/colocated-utilization-clone.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,23 +35,23 @@ - + - + - + - + @@ -60,89 +60,89 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -151,7 +151,7 @@ - + @@ -160,26 +160,26 @@ - + - + - + - + - + @@ -188,7 +188,7 @@ - + @@ -197,53 +197,53 @@ - + - + - + - + - + - + - + - + - + - + @@ -252,26 +252,26 @@ - + - + - + - + - + @@ -280,110 +280,110 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -392,7 +392,7 @@ - + @@ -401,7 +401,7 @@ - + @@ -410,35 +410,35 @@ - + - + - + - + - + - + - + - + @@ -447,7 +447,7 @@ - + @@ -456,7 +456,7 @@ - + @@ -465,7 +465,7 @@ - + @@ -473,7 +473,7 @@ - + @@ -481,7 +481,7 @@ - + diff --git a/pengine/test10/colocated-utilization-group.exp b/pengine/test10/colocated-utilization-group.exp index 11e64a1..138ba2b 100644 --- a/pengine/test10/colocated-utilization-group.exp +++ b/pengine/test10/colocated-utilization-group.exp @@ -1,26 +1,26 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -38,25 +38,25 @@ - + - + - + - + - + @@ -64,29 +64,29 @@ - + - + - + - + - + - + @@ -95,7 +95,7 @@ - + @@ -104,32 +104,32 @@ - + - + - + - + - + - + - + @@ -138,7 +138,7 @@ - + @@ -147,25 +147,25 @@ - + - + - + - + - + @@ -173,29 +173,29 @@ - + - + - + - + - + - + @@ -204,7 +204,7 @@ - + @@ -213,32 +213,32 @@ - + - + - + - + - + - + - + @@ -247,7 +247,7 @@ - + @@ -256,7 +256,7 @@ - + @@ -264,7 +264,7 @@ - + diff --git a/pengine/test10/colocated-utilization-primitive-1.exp b/pengine/test10/colocated-utilization-primitive-1.exp index b34471a..afeab88 100644 --- a/pengine/test10/colocated-utilization-primitive-1.exp +++ b/pengine/test10/colocated-utilization-primitive-1.exp @@ -1,26 +1,26 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -38,26 +38,26 @@ - + - + - + - + - + @@ -66,7 +66,7 @@ - + @@ -75,26 +75,26 @@ - + - + - + - + - + @@ -103,7 +103,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -120,7 +120,7 @@ - + diff --git a/pengine/test10/colocated-utilization-primitive-2.exp b/pengine/test10/colocated-utilization-primitive-2.exp index 1e304cb..3379f48 100644 --- a/pengine/test10/colocated-utilization-primitive-2.exp +++ b/pengine/test10/colocated-utilization-primitive-2.exp @@ -1,26 +1,26 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -38,26 +38,26 @@ - + - + - + - + - + @@ -66,7 +66,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -101,7 +101,7 @@ - + diff --git a/pengine/test10/colocation_constraint_stops_master.dot b/pengine/test10/colocation_constraint_stops_master.dot index e723761..9d30140 100644 --- a/pengine/test10/colocation_constraint_stops_master.dot +++ b/pengine/test10/colocation_constraint_stops_master.dot @@ -1,7 +1,6 @@ digraph "g" { "MASTER_RSC_A_confirmed-post_notify_demoted_0" -> "MASTER_RSC_A_pre_notify_stop_0" [ style = bold] "MASTER_RSC_A_confirmed-post_notify_demoted_0" [ style=bold color="green" fontcolor="orange"] -"MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "MASTER_RSC_A_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"] "MASTER_RSC_A_confirmed-pre_notify_demote_0" -> "MASTER_RSC_A_demote_0" [ style = bold] "MASTER_RSC_A_confirmed-pre_notify_demote_0" -> "MASTER_RSC_A_post_notify_demoted_0" [ style = bold] @@ -43,7 +42,5 @@ "NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"] "NATIVE_RSC_A:0_stop_0 fc16-builder" -> "MASTER_RSC_A_stopped_0" [ style = bold] "NATIVE_RSC_A:0_stop_0 fc16-builder" -> "NATIVE_RSC_A:0_delete_0 fc16-builder2" [ style = bold] -"NATIVE_RSC_A:0_stop_0 fc16-builder" -> "all_stopped" [ style = bold] "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/colocation_constraint_stops_master.exp b/pengine/test10/colocation_constraint_stops_master.exp index 0b006d2..8fdf366 100644 --- a/pengine/test10/colocation_constraint_stops_master.exp +++ b/pengine/test10/colocation_constraint_stops_master.exp @@ -1,133 +1,133 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -135,127 +135,112 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/colocation_constraint_stops_master.summary b/pengine/test10/colocation_constraint_stops_master.summary index e4b8697..65da876 100644 --- a/pengine/test10/colocation_constraint_stops_master.summary +++ b/pengine/test10/colocation_constraint_stops_master.summary @@ -27,7 +27,6 @@ Executing cluster transition: * Pseudo action: MASTER_RSC_A_stopped_0 * Pseudo action: MASTER_RSC_A_post_notify_stopped_0 * Pseudo action: MASTER_RSC_A_confirmed-post_notify_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ fc16-builder fc16-builder2 ] diff --git a/pengine/test10/colocation_constraint_stops_slave.dot b/pengine/test10/colocation_constraint_stops_slave.dot index c342595..046c126 100644 --- a/pengine/test10/colocation_constraint_stops_slave.dot +++ b/pengine/test10/colocation_constraint_stops_slave.dot @@ -1,5 +1,4 @@ digraph "g" { -"MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "MASTER_RSC_A_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"] "MASTER_RSC_A_confirmed-pre_notify_stop_0" -> "MASTER_RSC_A_post_notify_stopped_0" [ style = bold] "MASTER_RSC_A_confirmed-pre_notify_stop_0" -> "MASTER_RSC_A_stop_0" [ style = bold] @@ -17,9 +16,6 @@ "NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" -> "MASTER_RSC_A_confirmed-pre_notify_stop_0" [ style = bold] "NATIVE_RSC_A:0_pre_notify_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"] "NATIVE_RSC_A:0_stop_0 fc16-builder" -> "MASTER_RSC_A_stopped_0" [ style = bold] -"NATIVE_RSC_A:0_stop_0 fc16-builder" -> "all_stopped" [ style = bold] "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"] -"NATIVE_RSC_B_stop_0 fc16-builder" -> "all_stopped" [ style = bold] "NATIVE_RSC_B_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/colocation_constraint_stops_slave.exp b/pengine/test10/colocation_constraint_stops_slave.exp index 1da1134..0aeddec 100644 --- a/pengine/test10/colocation_constraint_stops_slave.exp +++ b/pengine/test10/colocation_constraint_stops_slave.exp @@ -1,75 +1,75 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -77,57 +77,38 @@ - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/colocation_constraint_stops_slave.summary b/pengine/test10/colocation_constraint_stops_slave.summary index 4a5a582..7a53def 100644 --- a/pengine/test10/colocation_constraint_stops_slave.summary +++ b/pengine/test10/colocation_constraint_stops_slave.summary @@ -22,7 +22,6 @@ Executing cluster transition: * Pseudo action: MASTER_RSC_A_stopped_0 * Pseudo action: MASTER_RSC_A_post_notify_stopped_0 * Pseudo action: MASTER_RSC_A_confirmed-post_notify_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ fc16-builder ] diff --git a/pengine/test10/comments.exp b/pengine/test10/comments.exp index cfb31c9..cef1d2c 100644 --- a/pengine/test10/comments.exp +++ b/pengine/test10/comments.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,23 +35,23 @@ - + - + - + - + @@ -60,7 +60,7 @@ - + diff --git a/pengine/test10/complex_enforce_colo.dot b/pengine/test10/complex_enforce_colo.dot index a4811b8..46da048 100644 --- a/pengine/test10/complex_enforce_colo.dot +++ b/pengine/test10/complex_enforce_colo.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "ceilometer-alarm-evaluator-clone_running_0" -> "ceilometer-alarm-notifier-clone_start_0" [ style = dashed] "ceilometer-alarm-evaluator-clone_running_0" [ style=dashed color="red" fontcolor="orange"] "ceilometer-alarm-evaluator-clone_start_0" -> "ceilometer-alarm-evaluator-clone_running_0" [ style = dashed] @@ -30,17 +29,14 @@ "ceilometer-alarm-evaluator_start_0 rhos6-node3" -> "ceilometer-alarm-evaluator_monitor_60000 rhos6-node3" [ style = dashed] "ceilometer-alarm-evaluator_start_0 rhos6-node3" -> "ceilometer-alarm-notifier_start_0 rhos6-node3" [ style = dashed] "ceilometer-alarm-evaluator_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"ceilometer-alarm-evaluator_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "ceilometer-alarm-evaluator_stop_0 rhos6-node1" -> "ceilometer-alarm-evaluator-clone_stopped_0" [ style = bold] "ceilometer-alarm-evaluator_stop_0 rhos6-node1" -> "ceilometer-alarm-evaluator_start_0 rhos6-node1" [ style = dashed] "ceilometer-alarm-evaluator_stop_0 rhos6-node1" -> "ceilometer-delay_stop_0 rhos6-node1" [ style = bold] "ceilometer-alarm-evaluator_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"ceilometer-alarm-evaluator_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "ceilometer-alarm-evaluator_stop_0 rhos6-node2" -> "ceilometer-alarm-evaluator-clone_stopped_0" [ style = bold] "ceilometer-alarm-evaluator_stop_0 rhos6-node2" -> "ceilometer-alarm-evaluator_start_0 rhos6-node2" [ style = dashed] "ceilometer-alarm-evaluator_stop_0 rhos6-node2" -> "ceilometer-delay_stop_0 rhos6-node2" [ style = bold] "ceilometer-alarm-evaluator_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"ceilometer-alarm-evaluator_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "ceilometer-alarm-evaluator_stop_0 rhos6-node3" -> "ceilometer-alarm-evaluator-clone_stopped_0" [ style = bold] "ceilometer-alarm-evaluator_stop_0 rhos6-node3" -> "ceilometer-alarm-evaluator_start_0 rhos6-node3" [ style = dashed] "ceilometer-alarm-evaluator_stop_0 rhos6-node3" -> "ceilometer-delay_stop_0 rhos6-node3" [ style = bold] @@ -75,17 +71,14 @@ "ceilometer-alarm-notifier_start_0 rhos6-node3" -> "ceilometer-alarm-notifier_monitor_60000 rhos6-node3" [ style = dashed] "ceilometer-alarm-notifier_start_0 rhos6-node3" -> "ceilometer-notification_start_0 rhos6-node3" [ style = dashed] "ceilometer-alarm-notifier_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"ceilometer-alarm-notifier_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "ceilometer-alarm-notifier_stop_0 rhos6-node1" -> "ceilometer-alarm-evaluator_stop_0 rhos6-node1" [ style = bold] "ceilometer-alarm-notifier_stop_0 rhos6-node1" -> "ceilometer-alarm-notifier-clone_stopped_0" [ style = bold] "ceilometer-alarm-notifier_stop_0 rhos6-node1" -> "ceilometer-alarm-notifier_start_0 rhos6-node1" [ style = dashed] "ceilometer-alarm-notifier_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"ceilometer-alarm-notifier_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "ceilometer-alarm-notifier_stop_0 rhos6-node2" -> "ceilometer-alarm-evaluator_stop_0 rhos6-node2" [ style = bold] "ceilometer-alarm-notifier_stop_0 rhos6-node2" -> "ceilometer-alarm-notifier-clone_stopped_0" [ style = bold] "ceilometer-alarm-notifier_stop_0 rhos6-node2" -> "ceilometer-alarm-notifier_start_0 rhos6-node2" [ style = dashed] "ceilometer-alarm-notifier_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"ceilometer-alarm-notifier_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "ceilometer-alarm-notifier_stop_0 rhos6-node3" -> "ceilometer-alarm-evaluator_stop_0 rhos6-node3" [ style = bold] "ceilometer-alarm-notifier_stop_0 rhos6-node3" -> "ceilometer-alarm-notifier-clone_stopped_0" [ style = bold] "ceilometer-alarm-notifier_stop_0 rhos6-node3" -> "ceilometer-alarm-notifier_start_0 rhos6-node3" [ style = dashed] @@ -120,17 +113,14 @@ "ceilometer-api_start_0 rhos6-node3" -> "ceilometer-api_monitor_60000 rhos6-node3" [ style = dashed] "ceilometer-api_start_0 rhos6-node3" -> "ceilometer-delay_start_0 rhos6-node3" [ style = dashed] "ceilometer-api_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"ceilometer-api_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "ceilometer-api_stop_0 rhos6-node1" -> "ceilometer-api-clone_stopped_0" [ style = bold] "ceilometer-api_stop_0 rhos6-node1" -> "ceilometer-api_start_0 rhos6-node1" [ style = dashed] "ceilometer-api_stop_0 rhos6-node1" -> "ceilometer-collector_stop_0 rhos6-node1" [ style = bold] "ceilometer-api_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"ceilometer-api_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "ceilometer-api_stop_0 rhos6-node2" -> "ceilometer-api-clone_stopped_0" [ style = bold] "ceilometer-api_stop_0 rhos6-node2" -> "ceilometer-api_start_0 rhos6-node2" [ style = dashed] "ceilometer-api_stop_0 rhos6-node2" -> "ceilometer-collector_stop_0 rhos6-node2" [ style = bold] "ceilometer-api_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"ceilometer-api_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "ceilometer-api_stop_0 rhos6-node3" -> "ceilometer-api-clone_stopped_0" [ style = bold] "ceilometer-api_stop_0 rhos6-node3" -> "ceilometer-api_start_0 rhos6-node3" [ style = dashed] "ceilometer-api_stop_0 rhos6-node3" -> "ceilometer-collector_stop_0 rhos6-node3" [ style = bold] @@ -139,7 +129,6 @@ "ceilometer-central_start_0 rhos6-node3" -> "ceilometer-central_monitor_60000 rhos6-node3" [ style = dashed] "ceilometer-central_start_0 rhos6-node3" -> "ceilometer-collector-clone_start_0" [ style = dashed] "ceilometer-central_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"ceilometer-central_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "ceilometer-central_stop_0 rhos6-node3" -> "ceilometer-central_start_0 rhos6-node3" [ style = dashed] "ceilometer-central_stop_0 rhos6-node3" -> "keystone-clone_stop_0" [ style = bold] "ceilometer-central_stop_0 rhos6-node3" [ style=bold color="green" fontcolor="black"] @@ -173,15 +162,12 @@ "ceilometer-collector_start_0 rhos6-node3" -> "ceilometer-collector-clone_running_0" [ style = dashed] "ceilometer-collector_start_0 rhos6-node3" -> "ceilometer-collector_monitor_60000 rhos6-node3" [ style = dashed] "ceilometer-collector_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"ceilometer-collector_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "ceilometer-collector_stop_0 rhos6-node1" -> "ceilometer-collector-clone_stopped_0" [ style = bold] "ceilometer-collector_stop_0 rhos6-node1" -> "ceilometer-collector_start_0 rhos6-node1" [ style = dashed] "ceilometer-collector_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"ceilometer-collector_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "ceilometer-collector_stop_0 rhos6-node2" -> "ceilometer-collector-clone_stopped_0" [ style = bold] "ceilometer-collector_stop_0 rhos6-node2" -> "ceilometer-collector_start_0 rhos6-node2" [ style = dashed] "ceilometer-collector_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"ceilometer-collector_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "ceilometer-collector_stop_0 rhos6-node3" -> "ceilometer-collector-clone_stopped_0" [ style = bold] "ceilometer-collector_stop_0 rhos6-node3" -> "ceilometer-collector_start_0 rhos6-node3" [ style = dashed] "ceilometer-collector_stop_0 rhos6-node3" [ style=bold color="green" fontcolor="black"] @@ -215,17 +201,14 @@ "ceilometer-delay_start_0 rhos6-node3" -> "ceilometer-delay-clone_running_0" [ style = dashed] "ceilometer-delay_start_0 rhos6-node3" -> "ceilometer-delay_monitor_10000 rhos6-node3" [ style = dashed] "ceilometer-delay_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"ceilometer-delay_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "ceilometer-delay_stop_0 rhos6-node1" -> "ceilometer-api_stop_0 rhos6-node1" [ style = bold] "ceilometer-delay_stop_0 rhos6-node1" -> "ceilometer-delay-clone_stopped_0" [ style = bold] "ceilometer-delay_stop_0 rhos6-node1" -> "ceilometer-delay_start_0 rhos6-node1" [ style = dashed] "ceilometer-delay_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"ceilometer-delay_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "ceilometer-delay_stop_0 rhos6-node2" -> "ceilometer-api_stop_0 rhos6-node2" [ style = bold] "ceilometer-delay_stop_0 rhos6-node2" -> "ceilometer-delay-clone_stopped_0" [ style = bold] "ceilometer-delay_stop_0 rhos6-node2" -> "ceilometer-delay_start_0 rhos6-node2" [ style = dashed] "ceilometer-delay_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"ceilometer-delay_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "ceilometer-delay_stop_0 rhos6-node3" -> "ceilometer-api_stop_0 rhos6-node3" [ style = bold] "ceilometer-delay_stop_0 rhos6-node3" -> "ceilometer-delay-clone_stopped_0" [ style = bold] "ceilometer-delay_stop_0 rhos6-node3" -> "ceilometer-delay_start_0 rhos6-node3" [ style = dashed] @@ -260,17 +243,14 @@ "ceilometer-notification_start_0 rhos6-node3" -> "ceilometer-notification_monitor_60000 rhos6-node3" [ style = dashed] "ceilometer-notification_start_0 rhos6-node3" -> "heat-api_start_0 rhos6-node3" [ style = dashed] "ceilometer-notification_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"ceilometer-notification_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "ceilometer-notification_stop_0 rhos6-node1" -> "ceilometer-alarm-notifier_stop_0 rhos6-node1" [ style = bold] "ceilometer-notification_stop_0 rhos6-node1" -> "ceilometer-notification-clone_stopped_0" [ style = bold] "ceilometer-notification_stop_0 rhos6-node1" -> "ceilometer-notification_start_0 rhos6-node1" [ style = dashed] "ceilometer-notification_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"ceilometer-notification_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "ceilometer-notification_stop_0 rhos6-node2" -> "ceilometer-alarm-notifier_stop_0 rhos6-node2" [ style = bold] "ceilometer-notification_stop_0 rhos6-node2" -> "ceilometer-notification-clone_stopped_0" [ style = bold] "ceilometer-notification_stop_0 rhos6-node2" -> "ceilometer-notification_start_0 rhos6-node2" [ style = dashed] "ceilometer-notification_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"ceilometer-notification_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "ceilometer-notification_stop_0 rhos6-node3" -> "ceilometer-alarm-notifier_stop_0 rhos6-node3" [ style = bold] "ceilometer-notification_stop_0 rhos6-node3" -> "ceilometer-notification-clone_stopped_0" [ style = bold] "ceilometer-notification_stop_0 rhos6-node3" -> "ceilometer-notification_start_0 rhos6-node3" [ style = dashed] @@ -279,7 +259,6 @@ "cinder-api_start_0 rhos6-node1" -> "cinder-api_monitor_60000 rhos6-node1" [ style = dashed] "cinder-api_start_0 rhos6-node1" -> "cinder-scheduler_start_0 rhos6-node1" [ style = dashed] "cinder-api_start_0 rhos6-node1" [ style=dashed color="red" fontcolor="black"] -"cinder-api_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "cinder-api_stop_0 rhos6-node1" -> "cinder-api_start_0 rhos6-node1" [ style = dashed] "cinder-api_stop_0 rhos6-node1" -> "keystone-clone_stop_0" [ style = bold] "cinder-api_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] @@ -287,14 +266,12 @@ "cinder-scheduler_start_0 rhos6-node1" -> "cinder-scheduler_monitor_60000 rhos6-node1" [ style = dashed] "cinder-scheduler_start_0 rhos6-node1" -> "cinder-volume_start_0 rhos6-node1" [ style = dashed] "cinder-scheduler_start_0 rhos6-node1" [ style=dashed color="red" fontcolor="black"] -"cinder-scheduler_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "cinder-scheduler_stop_0 rhos6-node1" -> "cinder-api_stop_0 rhos6-node1" [ style = bold] "cinder-scheduler_stop_0 rhos6-node1" -> "cinder-scheduler_start_0 rhos6-node1" [ style = dashed] "cinder-scheduler_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] "cinder-volume_monitor_60000 rhos6-node1" [ style=dashed color="red" fontcolor="black"] "cinder-volume_start_0 rhos6-node1" -> "cinder-volume_monitor_60000 rhos6-node1" [ style = dashed] "cinder-volume_start_0 rhos6-node1" [ style=dashed color="red" fontcolor="black"] -"cinder-volume_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "cinder-volume_stop_0 rhos6-node1" -> "cinder-scheduler_stop_0 rhos6-node1" [ style = bold] "cinder-volume_stop_0 rhos6-node1" -> "cinder-volume_start_0 rhos6-node1" [ style = dashed] "cinder-volume_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] @@ -324,17 +301,14 @@ "glance-api_start_0 rhos6-node3" -> "glance-api-clone_running_0" [ style = dashed] "glance-api_start_0 rhos6-node3" -> "glance-api_monitor_60000 rhos6-node3" [ style = dashed] "glance-api_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"glance-api_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "glance-api_stop_0 rhos6-node1" -> "glance-api-clone_stopped_0" [ style = bold] "glance-api_stop_0 rhos6-node1" -> "glance-api_start_0 rhos6-node1" [ style = dashed] "glance-api_stop_0 rhos6-node1" -> "glance-registry_stop_0 rhos6-node1" [ style = bold] "glance-api_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"glance-api_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "glance-api_stop_0 rhos6-node2" -> "glance-api-clone_stopped_0" [ style = bold] "glance-api_stop_0 rhos6-node2" -> "glance-api_start_0 rhos6-node2" [ style = dashed] "glance-api_stop_0 rhos6-node2" -> "glance-registry_stop_0 rhos6-node2" [ style = bold] "glance-api_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"glance-api_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "glance-api_stop_0 rhos6-node3" -> "glance-api-clone_stopped_0" [ style = bold] "glance-api_stop_0 rhos6-node3" -> "glance-api_start_0 rhos6-node3" [ style = dashed] "glance-api_stop_0 rhos6-node3" -> "glance-registry_stop_0 rhos6-node3" [ style = bold] @@ -366,17 +340,14 @@ "glance-registry_start_0 rhos6-node3" -> "glance-registry-clone_running_0" [ style = dashed] "glance-registry_start_0 rhos6-node3" -> "glance-registry_monitor_60000 rhos6-node3" [ style = dashed] "glance-registry_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"glance-registry_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "glance-registry_stop_0 rhos6-node1" -> "glance-registry-clone_stopped_0" [ style = bold] "glance-registry_stop_0 rhos6-node1" -> "glance-registry_start_0 rhos6-node1" [ style = dashed] "glance-registry_stop_0 rhos6-node1" -> "keystone_stop_0 rhos6-node1" [ style = bold] "glance-registry_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"glance-registry_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "glance-registry_stop_0 rhos6-node2" -> "glance-registry-clone_stopped_0" [ style = bold] "glance-registry_stop_0 rhos6-node2" -> "glance-registry_start_0 rhos6-node2" [ style = dashed] "glance-registry_stop_0 rhos6-node2" -> "keystone_stop_0 rhos6-node2" [ style = bold] "glance-registry_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"glance-registry_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "glance-registry_stop_0 rhos6-node3" -> "glance-registry-clone_stopped_0" [ style = bold] "glance-registry_stop_0 rhos6-node3" -> "glance-registry_start_0 rhos6-node3" [ style = dashed] "glance-registry_stop_0 rhos6-node3" -> "keystone_stop_0 rhos6-node3" [ style = bold] @@ -411,17 +382,14 @@ "heat-api-cfn_start_0 rhos6-node3" -> "heat-api-cfn_monitor_60000 rhos6-node3" [ style = dashed] "heat-api-cfn_start_0 rhos6-node3" -> "heat-api-cloudwatch_start_0 rhos6-node3" [ style = dashed] "heat-api-cfn_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"heat-api-cfn_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "heat-api-cfn_stop_0 rhos6-node1" -> "heat-api-cfn-clone_stopped_0" [ style = bold] "heat-api-cfn_stop_0 rhos6-node1" -> "heat-api-cfn_start_0 rhos6-node1" [ style = dashed] "heat-api-cfn_stop_0 rhos6-node1" -> "heat-api_stop_0 rhos6-node1" [ style = bold] "heat-api-cfn_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"heat-api-cfn_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "heat-api-cfn_stop_0 rhos6-node2" -> "heat-api-cfn-clone_stopped_0" [ style = bold] "heat-api-cfn_stop_0 rhos6-node2" -> "heat-api-cfn_start_0 rhos6-node2" [ style = dashed] "heat-api-cfn_stop_0 rhos6-node2" -> "heat-api_stop_0 rhos6-node2" [ style = bold] "heat-api-cfn_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"heat-api-cfn_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "heat-api-cfn_stop_0 rhos6-node3" -> "heat-api-cfn-clone_stopped_0" [ style = bold] "heat-api-cfn_stop_0 rhos6-node3" -> "heat-api-cfn_start_0 rhos6-node3" [ style = dashed] "heat-api-cfn_stop_0 rhos6-node3" -> "heat-api_stop_0 rhos6-node3" [ style = bold] @@ -468,17 +436,14 @@ "heat-api-cloudwatch_start_0 rhos6-node3" -> "heat-api-cloudwatch-clone_running_0" [ style = dashed] "heat-api-cloudwatch_start_0 rhos6-node3" -> "heat-api-cloudwatch_monitor_60000 rhos6-node3" [ style = dashed] "heat-api-cloudwatch_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"heat-api-cloudwatch_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "heat-api-cloudwatch_stop_0 rhos6-node1" -> "heat-api-cfn_stop_0 rhos6-node1" [ style = bold] "heat-api-cloudwatch_stop_0 rhos6-node1" -> "heat-api-cloudwatch-clone_stopped_0" [ style = bold] "heat-api-cloudwatch_stop_0 rhos6-node1" -> "heat-api-cloudwatch_start_0 rhos6-node1" [ style = dashed] "heat-api-cloudwatch_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"heat-api-cloudwatch_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "heat-api-cloudwatch_stop_0 rhos6-node2" -> "heat-api-cfn_stop_0 rhos6-node2" [ style = bold] "heat-api-cloudwatch_stop_0 rhos6-node2" -> "heat-api-cloudwatch-clone_stopped_0" [ style = bold] "heat-api-cloudwatch_stop_0 rhos6-node2" -> "heat-api-cloudwatch_start_0 rhos6-node2" [ style = dashed] "heat-api-cloudwatch_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"heat-api-cloudwatch_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "heat-api-cloudwatch_stop_0 rhos6-node3" -> "heat-api-cfn_stop_0 rhos6-node3" [ style = bold] "heat-api-cloudwatch_stop_0 rhos6-node3" -> "heat-api-cloudwatch-clone_stopped_0" [ style = bold] "heat-api-cloudwatch_stop_0 rhos6-node3" -> "heat-api-cloudwatch_start_0 rhos6-node3" [ style = dashed] @@ -498,17 +463,14 @@ "heat-api_start_0 rhos6-node3" -> "heat-api-clone_running_0" [ style = dashed] "heat-api_start_0 rhos6-node3" -> "heat-api_monitor_60000 rhos6-node3" [ style = dashed] "heat-api_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"heat-api_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "heat-api_stop_0 rhos6-node1" -> "ceilometer-notification_stop_0 rhos6-node1" [ style = bold] "heat-api_stop_0 rhos6-node1" -> "heat-api-clone_stopped_0" [ style = bold] "heat-api_stop_0 rhos6-node1" -> "heat-api_start_0 rhos6-node1" [ style = dashed] "heat-api_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"heat-api_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "heat-api_stop_0 rhos6-node2" -> "ceilometer-notification_stop_0 rhos6-node2" [ style = bold] "heat-api_stop_0 rhos6-node2" -> "heat-api-clone_stopped_0" [ style = bold] "heat-api_stop_0 rhos6-node2" -> "heat-api_start_0 rhos6-node2" [ style = dashed] "heat-api_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"heat-api_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "heat-api_stop_0 rhos6-node3" -> "ceilometer-notification_stop_0 rhos6-node3" [ style = bold] "heat-api_stop_0 rhos6-node3" -> "heat-api-clone_stopped_0" [ style = bold] "heat-api_stop_0 rhos6-node3" -> "heat-api_start_0 rhos6-node3" [ style = dashed] @@ -516,7 +478,6 @@ "heat-engine_monitor_60000 rhos6-node2" [ style=dashed color="red" fontcolor="black"] "heat-engine_start_0 rhos6-node2" -> "heat-engine_monitor_60000 rhos6-node2" [ style = dashed] "heat-engine_start_0 rhos6-node2" [ style=dashed color="red" fontcolor="black"] -"heat-engine_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "heat-engine_stop_0 rhos6-node2" -> "heat-api-cloudwatch-clone_stop_0" [ style = bold] "heat-engine_stop_0 rhos6-node2" -> "heat-engine_start_0 rhos6-node2" [ style = dashed] "heat-engine_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] @@ -526,13 +487,10 @@ "keystone-clone_stop_0" -> "keystone_stop_0 rhos6-node3" [ style = bold] "keystone-clone_stop_0" [ style=bold color="green" fontcolor="orange"] "keystone-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] -"keystone_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "keystone_stop_0 rhos6-node1" -> "keystone-clone_stopped_0" [ style = bold] "keystone_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"keystone_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "keystone_stop_0 rhos6-node2" -> "keystone-clone_stopped_0" [ style = bold] "keystone_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"keystone_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "keystone_stop_0 rhos6-node3" -> "keystone-clone_stopped_0" [ style = bold] "keystone_stop_0 rhos6-node3" [ style=bold color="green" fontcolor="black"] "neutron-dhcp-agent-clone_running_0" -> "neutron-l3-agent-clone_start_0" [ style = dashed] @@ -562,17 +520,14 @@ "neutron-dhcp-agent_start_0 rhos6-node3" -> "neutron-dhcp-agent-clone_running_0" [ style = dashed] "neutron-dhcp-agent_start_0 rhos6-node3" -> "neutron-dhcp-agent_monitor_60000 rhos6-node3" [ style = dashed] "neutron-dhcp-agent_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"neutron-dhcp-agent_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "neutron-dhcp-agent_stop_0 rhos6-node1" -> "neutron-dhcp-agent-clone_stopped_0" [ style = bold] "neutron-dhcp-agent_stop_0 rhos6-node1" -> "neutron-dhcp-agent_start_0 rhos6-node1" [ style = dashed] "neutron-dhcp-agent_stop_0 rhos6-node1" -> "neutron-openvswitch-agent_stop_0 rhos6-node1" [ style = bold] "neutron-dhcp-agent_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"neutron-dhcp-agent_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "neutron-dhcp-agent_stop_0 rhos6-node2" -> "neutron-dhcp-agent-clone_stopped_0" [ style = bold] "neutron-dhcp-agent_stop_0 rhos6-node2" -> "neutron-dhcp-agent_start_0 rhos6-node2" [ style = dashed] "neutron-dhcp-agent_stop_0 rhos6-node2" -> "neutron-openvswitch-agent_stop_0 rhos6-node2" [ style = bold] "neutron-dhcp-agent_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"neutron-dhcp-agent_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "neutron-dhcp-agent_stop_0 rhos6-node3" -> "neutron-dhcp-agent-clone_stopped_0" [ style = bold] "neutron-dhcp-agent_stop_0 rhos6-node3" -> "neutron-dhcp-agent_start_0 rhos6-node3" [ style = dashed] "neutron-dhcp-agent_stop_0 rhos6-node3" -> "neutron-openvswitch-agent_stop_0 rhos6-node3" [ style = bold] @@ -604,17 +559,14 @@ "neutron-l3-agent_start_0 rhos6-node3" -> "neutron-l3-agent-clone_running_0" [ style = dashed] "neutron-l3-agent_start_0 rhos6-node3" -> "neutron-l3-agent_monitor_60000 rhos6-node3" [ style = dashed] "neutron-l3-agent_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"neutron-l3-agent_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "neutron-l3-agent_stop_0 rhos6-node1" -> "neutron-dhcp-agent_stop_0 rhos6-node1" [ style = bold] "neutron-l3-agent_stop_0 rhos6-node1" -> "neutron-l3-agent-clone_stopped_0" [ style = bold] "neutron-l3-agent_stop_0 rhos6-node1" -> "neutron-l3-agent_start_0 rhos6-node1" [ style = dashed] "neutron-l3-agent_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"neutron-l3-agent_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "neutron-l3-agent_stop_0 rhos6-node2" -> "neutron-dhcp-agent_stop_0 rhos6-node2" [ style = bold] "neutron-l3-agent_stop_0 rhos6-node2" -> "neutron-l3-agent-clone_stopped_0" [ style = bold] "neutron-l3-agent_stop_0 rhos6-node2" -> "neutron-l3-agent_start_0 rhos6-node2" [ style = dashed] "neutron-l3-agent_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"neutron-l3-agent_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "neutron-l3-agent_stop_0 rhos6-node3" -> "neutron-dhcp-agent_stop_0 rhos6-node3" [ style = bold] "neutron-l3-agent_stop_0 rhos6-node3" -> "neutron-l3-agent-clone_stopped_0" [ style = bold] "neutron-l3-agent_stop_0 rhos6-node3" -> "neutron-l3-agent_start_0 rhos6-node3" [ style = dashed] @@ -645,17 +597,14 @@ "neutron-metadata-agent_start_0 rhos6-node3" -> "neutron-metadata-agent-clone_running_0" [ style = dashed] "neutron-metadata-agent_start_0 rhos6-node3" -> "neutron-metadata-agent_monitor_60000 rhos6-node3" [ style = dashed] "neutron-metadata-agent_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"neutron-metadata-agent_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "neutron-metadata-agent_stop_0 rhos6-node1" -> "neutron-l3-agent_stop_0 rhos6-node1" [ style = bold] "neutron-metadata-agent_stop_0 rhos6-node1" -> "neutron-metadata-agent-clone_stopped_0" [ style = bold] "neutron-metadata-agent_stop_0 rhos6-node1" -> "neutron-metadata-agent_start_0 rhos6-node1" [ style = dashed] "neutron-metadata-agent_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"neutron-metadata-agent_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "neutron-metadata-agent_stop_0 rhos6-node2" -> "neutron-l3-agent_stop_0 rhos6-node2" [ style = bold] "neutron-metadata-agent_stop_0 rhos6-node2" -> "neutron-metadata-agent-clone_stopped_0" [ style = bold] "neutron-metadata-agent_stop_0 rhos6-node2" -> "neutron-metadata-agent_start_0 rhos6-node2" [ style = dashed] "neutron-metadata-agent_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"neutron-metadata-agent_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "neutron-metadata-agent_stop_0 rhos6-node3" -> "neutron-l3-agent_stop_0 rhos6-node3" [ style = bold] "neutron-metadata-agent_stop_0 rhos6-node3" -> "neutron-metadata-agent-clone_stopped_0" [ style = bold] "neutron-metadata-agent_stop_0 rhos6-node3" -> "neutron-metadata-agent_start_0 rhos6-node3" [ style = dashed] @@ -687,17 +636,14 @@ "neutron-netns-cleanup_start_0 rhos6-node3" -> "neutron-netns-cleanup-clone_running_0" [ style = dashed] "neutron-netns-cleanup_start_0 rhos6-node3" -> "neutron-netns-cleanup_monitor_10000 rhos6-node3" [ style = dashed] "neutron-netns-cleanup_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"neutron-netns-cleanup_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "neutron-netns-cleanup_stop_0 rhos6-node1" -> "neutron-netns-cleanup-clone_stopped_0" [ style = bold] "neutron-netns-cleanup_stop_0 rhos6-node1" -> "neutron-netns-cleanup_start_0 rhos6-node1" [ style = dashed] "neutron-netns-cleanup_stop_0 rhos6-node1" -> "neutron-ovs-cleanup_stop_0 rhos6-node1" [ style = bold] "neutron-netns-cleanup_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"neutron-netns-cleanup_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "neutron-netns-cleanup_stop_0 rhos6-node2" -> "neutron-netns-cleanup-clone_stopped_0" [ style = bold] "neutron-netns-cleanup_stop_0 rhos6-node2" -> "neutron-netns-cleanup_start_0 rhos6-node2" [ style = dashed] "neutron-netns-cleanup_stop_0 rhos6-node2" -> "neutron-ovs-cleanup_stop_0 rhos6-node2" [ style = bold] "neutron-netns-cleanup_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"neutron-netns-cleanup_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "neutron-netns-cleanup_stop_0 rhos6-node3" -> "neutron-netns-cleanup-clone_stopped_0" [ style = bold] "neutron-netns-cleanup_stop_0 rhos6-node3" -> "neutron-netns-cleanup_start_0 rhos6-node3" [ style = dashed] "neutron-netns-cleanup_stop_0 rhos6-node3" -> "neutron-ovs-cleanup_stop_0 rhos6-node3" [ style = bold] @@ -729,17 +675,14 @@ "neutron-openvswitch-agent_start_0 rhos6-node3" -> "neutron-openvswitch-agent-clone_running_0" [ style = dashed] "neutron-openvswitch-agent_start_0 rhos6-node3" -> "neutron-openvswitch-agent_monitor_60000 rhos6-node3" [ style = dashed] "neutron-openvswitch-agent_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"neutron-openvswitch-agent_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "neutron-openvswitch-agent_stop_0 rhos6-node1" -> "neutron-netns-cleanup_stop_0 rhos6-node1" [ style = bold] "neutron-openvswitch-agent_stop_0 rhos6-node1" -> "neutron-openvswitch-agent-clone_stopped_0" [ style = bold] "neutron-openvswitch-agent_stop_0 rhos6-node1" -> "neutron-openvswitch-agent_start_0 rhos6-node1" [ style = dashed] "neutron-openvswitch-agent_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"neutron-openvswitch-agent_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "neutron-openvswitch-agent_stop_0 rhos6-node2" -> "neutron-netns-cleanup_stop_0 rhos6-node2" [ style = bold] "neutron-openvswitch-agent_stop_0 rhos6-node2" -> "neutron-openvswitch-agent-clone_stopped_0" [ style = bold] "neutron-openvswitch-agent_stop_0 rhos6-node2" -> "neutron-openvswitch-agent_start_0 rhos6-node2" [ style = dashed] "neutron-openvswitch-agent_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"neutron-openvswitch-agent_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "neutron-openvswitch-agent_stop_0 rhos6-node3" -> "neutron-netns-cleanup_stop_0 rhos6-node3" [ style = bold] "neutron-openvswitch-agent_stop_0 rhos6-node3" -> "neutron-openvswitch-agent-clone_stopped_0" [ style = bold] "neutron-openvswitch-agent_stop_0 rhos6-node3" -> "neutron-openvswitch-agent_start_0 rhos6-node3" [ style = dashed] @@ -771,17 +714,14 @@ "neutron-ovs-cleanup_start_0 rhos6-node3" -> "neutron-ovs-cleanup-clone_running_0" [ style = dashed] "neutron-ovs-cleanup_start_0 rhos6-node3" -> "neutron-ovs-cleanup_monitor_10000 rhos6-node3" [ style = dashed] "neutron-ovs-cleanup_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"neutron-ovs-cleanup_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "neutron-ovs-cleanup_stop_0 rhos6-node1" -> "neutron-ovs-cleanup-clone_stopped_0" [ style = bold] "neutron-ovs-cleanup_stop_0 rhos6-node1" -> "neutron-ovs-cleanup_start_0 rhos6-node1" [ style = dashed] "neutron-ovs-cleanup_stop_0 rhos6-node1" -> "neutron-scale:2_stop_0 rhos6-node1" [ style = bold] "neutron-ovs-cleanup_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"neutron-ovs-cleanup_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "neutron-ovs-cleanup_stop_0 rhos6-node2" -> "neutron-ovs-cleanup-clone_stopped_0" [ style = bold] "neutron-ovs-cleanup_stop_0 rhos6-node2" -> "neutron-ovs-cleanup_start_0 rhos6-node2" [ style = dashed] "neutron-ovs-cleanup_stop_0 rhos6-node2" -> "neutron-scale:1_stop_0 rhos6-node2" [ style = bold] "neutron-ovs-cleanup_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"neutron-ovs-cleanup_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "neutron-ovs-cleanup_stop_0 rhos6-node3" -> "neutron-ovs-cleanup-clone_stopped_0" [ style = bold] "neutron-ovs-cleanup_stop_0 rhos6-node3" -> "neutron-ovs-cleanup_start_0 rhos6-node3" [ style = dashed] "neutron-ovs-cleanup_stop_0 rhos6-node3" -> "neutron-scale:0_stop_0 rhos6-node3" [ style = bold] @@ -805,7 +745,6 @@ "neutron-scale:0_start_0 rhos6-node3" -> "neutron-scale-clone_running_0" [ style = dashed] "neutron-scale:0_start_0 rhos6-node3" -> "neutron-scale:0_monitor_10000 rhos6-node3" [ style = dashed] "neutron-scale:0_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"neutron-scale:0_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "neutron-scale:0_stop_0 rhos6-node3" -> "neutron-scale-clone_stopped_0" [ style = bold] "neutron-scale:0_stop_0 rhos6-node3" -> "neutron-scale:0_start_0 rhos6-node3" [ style = dashed] "neutron-scale:0_stop_0 rhos6-node3" -> "neutron-server_stop_0 rhos6-node3" [ style = bold] @@ -814,7 +753,6 @@ "neutron-scale:1_start_0 rhos6-node2" -> "neutron-scale-clone_running_0" [ style = dashed] "neutron-scale:1_start_0 rhos6-node2" -> "neutron-scale:1_monitor_10000 rhos6-node2" [ style = dashed] "neutron-scale:1_start_0 rhos6-node2" [ style=dashed color="red" fontcolor="black"] -"neutron-scale:1_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "neutron-scale:1_stop_0 rhos6-node2" -> "neutron-scale-clone_stopped_0" [ style = bold] "neutron-scale:1_stop_0 rhos6-node2" -> "neutron-scale:1_start_0 rhos6-node2" [ style = dashed] "neutron-scale:1_stop_0 rhos6-node2" -> "neutron-server_stop_0 rhos6-node2" [ style = bold] @@ -823,7 +761,6 @@ "neutron-scale:2_start_0 rhos6-node1" -> "neutron-scale-clone_running_0" [ style = dashed] "neutron-scale:2_start_0 rhos6-node1" -> "neutron-scale:2_monitor_10000 rhos6-node1" [ style = dashed] "neutron-scale:2_start_0 rhos6-node1" [ style=dashed color="red" fontcolor="black"] -"neutron-scale:2_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "neutron-scale:2_stop_0 rhos6-node1" -> "neutron-scale-clone_stopped_0" [ style = bold] "neutron-scale:2_stop_0 rhos6-node1" -> "neutron-scale:2_start_0 rhos6-node1" [ style = dashed] "neutron-scale:2_stop_0 rhos6-node1" -> "neutron-server_stop_0 rhos6-node1" [ style = bold] @@ -855,17 +792,14 @@ "neutron-server_start_0 rhos6-node3" -> "neutron-server-clone_running_0" [ style = dashed] "neutron-server_start_0 rhos6-node3" -> "neutron-server_monitor_60000 rhos6-node3" [ style = dashed] "neutron-server_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"neutron-server_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "neutron-server_stop_0 rhos6-node1" -> "keystone_stop_0 rhos6-node1" [ style = bold] "neutron-server_stop_0 rhos6-node1" -> "neutron-server-clone_stopped_0" [ style = bold] "neutron-server_stop_0 rhos6-node1" -> "neutron-server_start_0 rhos6-node1" [ style = dashed] "neutron-server_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"neutron-server_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "neutron-server_stop_0 rhos6-node2" -> "keystone_stop_0 rhos6-node2" [ style = bold] "neutron-server_stop_0 rhos6-node2" -> "neutron-server-clone_stopped_0" [ style = bold] "neutron-server_stop_0 rhos6-node2" -> "neutron-server_start_0 rhos6-node2" [ style = dashed] "neutron-server_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"neutron-server_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "neutron-server_stop_0 rhos6-node3" -> "keystone_stop_0 rhos6-node3" [ style = bold] "neutron-server_stop_0 rhos6-node3" -> "neutron-server-clone_stopped_0" [ style = bold] "neutron-server_stop_0 rhos6-node3" -> "neutron-server_start_0 rhos6-node3" [ style = dashed] @@ -897,17 +831,14 @@ "nova-api_start_0 rhos6-node3" -> "nova-api-clone_running_0" [ style = dashed] "nova-api_start_0 rhos6-node3" -> "nova-api_monitor_60000 rhos6-node3" [ style = dashed] "nova-api_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"nova-api_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "nova-api_stop_0 rhos6-node1" -> "nova-api-clone_stopped_0" [ style = bold] "nova-api_stop_0 rhos6-node1" -> "nova-api_start_0 rhos6-node1" [ style = dashed] "nova-api_stop_0 rhos6-node1" -> "nova-novncproxy_stop_0 rhos6-node1" [ style = bold] "nova-api_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"nova-api_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "nova-api_stop_0 rhos6-node2" -> "nova-api-clone_stopped_0" [ style = bold] "nova-api_stop_0 rhos6-node2" -> "nova-api_start_0 rhos6-node2" [ style = dashed] "nova-api_stop_0 rhos6-node2" -> "nova-novncproxy_stop_0 rhos6-node2" [ style = bold] "nova-api_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"nova-api_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "nova-api_stop_0 rhos6-node3" -> "nova-api-clone_stopped_0" [ style = bold] "nova-api_stop_0 rhos6-node3" -> "nova-api_start_0 rhos6-node3" [ style = dashed] "nova-api_stop_0 rhos6-node3" -> "nova-novncproxy_stop_0 rhos6-node3" [ style = bold] @@ -938,17 +869,14 @@ "nova-conductor_start_0 rhos6-node3" -> "nova-conductor-clone_running_0" [ style = dashed] "nova-conductor_start_0 rhos6-node3" -> "nova-conductor_monitor_60000 rhos6-node3" [ style = dashed] "nova-conductor_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"nova-conductor_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "nova-conductor_stop_0 rhos6-node1" -> "nova-conductor-clone_stopped_0" [ style = bold] "nova-conductor_stop_0 rhos6-node1" -> "nova-conductor_start_0 rhos6-node1" [ style = dashed] "nova-conductor_stop_0 rhos6-node1" -> "nova-scheduler_stop_0 rhos6-node1" [ style = bold] "nova-conductor_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"nova-conductor_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "nova-conductor_stop_0 rhos6-node2" -> "nova-conductor-clone_stopped_0" [ style = bold] "nova-conductor_stop_0 rhos6-node2" -> "nova-conductor_start_0 rhos6-node2" [ style = dashed] "nova-conductor_stop_0 rhos6-node2" -> "nova-scheduler_stop_0 rhos6-node2" [ style = bold] "nova-conductor_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"nova-conductor_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "nova-conductor_stop_0 rhos6-node3" -> "nova-conductor-clone_stopped_0" [ style = bold] "nova-conductor_stop_0 rhos6-node3" -> "nova-conductor_start_0 rhos6-node3" [ style = dashed] "nova-conductor_stop_0 rhos6-node3" -> "nova-scheduler_stop_0 rhos6-node3" [ style = bold] @@ -980,17 +908,14 @@ "nova-consoleauth_start_0 rhos6-node3" -> "nova-consoleauth-clone_running_0" [ style = dashed] "nova-consoleauth_start_0 rhos6-node3" -> "nova-consoleauth_monitor_60000 rhos6-node3" [ style = dashed] "nova-consoleauth_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"nova-consoleauth_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "nova-consoleauth_stop_0 rhos6-node1" -> "keystone_stop_0 rhos6-node1" [ style = bold] "nova-consoleauth_stop_0 rhos6-node1" -> "nova-consoleauth-clone_stopped_0" [ style = bold] "nova-consoleauth_stop_0 rhos6-node1" -> "nova-consoleauth_start_0 rhos6-node1" [ style = dashed] "nova-consoleauth_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"nova-consoleauth_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "nova-consoleauth_stop_0 rhos6-node2" -> "keystone_stop_0 rhos6-node2" [ style = bold] "nova-consoleauth_stop_0 rhos6-node2" -> "nova-consoleauth-clone_stopped_0" [ style = bold] "nova-consoleauth_stop_0 rhos6-node2" -> "nova-consoleauth_start_0 rhos6-node2" [ style = dashed] "nova-consoleauth_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"nova-consoleauth_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "nova-consoleauth_stop_0 rhos6-node3" -> "keystone_stop_0 rhos6-node3" [ style = bold] "nova-consoleauth_stop_0 rhos6-node3" -> "nova-consoleauth-clone_stopped_0" [ style = bold] "nova-consoleauth_stop_0 rhos6-node3" -> "nova-consoleauth_start_0 rhos6-node3" [ style = dashed] @@ -1022,17 +947,14 @@ "nova-novncproxy_start_0 rhos6-node3" -> "nova-novncproxy-clone_running_0" [ style = dashed] "nova-novncproxy_start_0 rhos6-node3" -> "nova-novncproxy_monitor_60000 rhos6-node3" [ style = dashed] "nova-novncproxy_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"nova-novncproxy_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "nova-novncproxy_stop_0 rhos6-node1" -> "nova-consoleauth_stop_0 rhos6-node1" [ style = bold] "nova-novncproxy_stop_0 rhos6-node1" -> "nova-novncproxy-clone_stopped_0" [ style = bold] "nova-novncproxy_stop_0 rhos6-node1" -> "nova-novncproxy_start_0 rhos6-node1" [ style = dashed] "nova-novncproxy_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"nova-novncproxy_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "nova-novncproxy_stop_0 rhos6-node2" -> "nova-consoleauth_stop_0 rhos6-node2" [ style = bold] "nova-novncproxy_stop_0 rhos6-node2" -> "nova-novncproxy-clone_stopped_0" [ style = bold] "nova-novncproxy_stop_0 rhos6-node2" -> "nova-novncproxy_start_0 rhos6-node2" [ style = dashed] "nova-novncproxy_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"nova-novncproxy_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "nova-novncproxy_stop_0 rhos6-node3" -> "nova-consoleauth_stop_0 rhos6-node3" [ style = bold] "nova-novncproxy_stop_0 rhos6-node3" -> "nova-novncproxy-clone_stopped_0" [ style = bold] "nova-novncproxy_stop_0 rhos6-node3" -> "nova-novncproxy_start_0 rhos6-node3" [ style = dashed] @@ -1064,17 +986,14 @@ "nova-scheduler_start_0 rhos6-node3" -> "nova-scheduler-clone_running_0" [ style = dashed] "nova-scheduler_start_0 rhos6-node3" -> "nova-scheduler_monitor_60000 rhos6-node3" [ style = dashed] "nova-scheduler_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"nova-scheduler_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "nova-scheduler_stop_0 rhos6-node1" -> "nova-api_stop_0 rhos6-node1" [ style = bold] "nova-scheduler_stop_0 rhos6-node1" -> "nova-scheduler-clone_stopped_0" [ style = bold] "nova-scheduler_stop_0 rhos6-node1" -> "nova-scheduler_start_0 rhos6-node1" [ style = dashed] "nova-scheduler_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"nova-scheduler_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "nova-scheduler_stop_0 rhos6-node2" -> "nova-api_stop_0 rhos6-node2" [ style = bold] "nova-scheduler_stop_0 rhos6-node2" -> "nova-scheduler-clone_stopped_0" [ style = bold] "nova-scheduler_stop_0 rhos6-node2" -> "nova-scheduler_start_0 rhos6-node2" [ style = dashed] "nova-scheduler_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"nova-scheduler_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "nova-scheduler_stop_0 rhos6-node3" -> "nova-api_stop_0 rhos6-node3" [ style = bold] "nova-scheduler_stop_0 rhos6-node3" -> "nova-scheduler-clone_stopped_0" [ style = bold] "nova-scheduler_stop_0 rhos6-node3" -> "nova-scheduler_start_0 rhos6-node3" [ style = dashed] @@ -1107,17 +1026,14 @@ "swift-account_start_0 rhos6-node3" -> "swift-account-clone_running_0" [ style = dashed] "swift-account_start_0 rhos6-node3" -> "swift-account_monitor_60000 rhos6-node3" [ style = dashed] "swift-account_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"swift-account_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "swift-account_stop_0 rhos6-node1" -> "keystone_stop_0 rhos6-node1" [ style = bold] "swift-account_stop_0 rhos6-node1" -> "swift-account-clone_stopped_0" [ style = bold] "swift-account_stop_0 rhos6-node1" -> "swift-account_start_0 rhos6-node1" [ style = dashed] "swift-account_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"swift-account_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "swift-account_stop_0 rhos6-node2" -> "keystone_stop_0 rhos6-node2" [ style = bold] "swift-account_stop_0 rhos6-node2" -> "swift-account-clone_stopped_0" [ style = bold] "swift-account_stop_0 rhos6-node2" -> "swift-account_start_0 rhos6-node2" [ style = dashed] "swift-account_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"swift-account_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "swift-account_stop_0 rhos6-node3" -> "keystone_stop_0 rhos6-node3" [ style = bold] "swift-account_stop_0 rhos6-node3" -> "swift-account-clone_stopped_0" [ style = bold] "swift-account_stop_0 rhos6-node3" -> "swift-account_start_0 rhos6-node3" [ style = dashed] @@ -1149,17 +1065,14 @@ "swift-container_start_0 rhos6-node3" -> "swift-container-clone_running_0" [ style = dashed] "swift-container_start_0 rhos6-node3" -> "swift-container_monitor_60000 rhos6-node3" [ style = dashed] "swift-container_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"swift-container_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "swift-container_stop_0 rhos6-node1" -> "swift-account_stop_0 rhos6-node1" [ style = bold] "swift-container_stop_0 rhos6-node1" -> "swift-container-clone_stopped_0" [ style = bold] "swift-container_stop_0 rhos6-node1" -> "swift-container_start_0 rhos6-node1" [ style = dashed] "swift-container_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"swift-container_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "swift-container_stop_0 rhos6-node2" -> "swift-account_stop_0 rhos6-node2" [ style = bold] "swift-container_stop_0 rhos6-node2" -> "swift-container-clone_stopped_0" [ style = bold] "swift-container_stop_0 rhos6-node2" -> "swift-container_start_0 rhos6-node2" [ style = dashed] "swift-container_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"swift-container_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "swift-container_stop_0 rhos6-node3" -> "swift-account_stop_0 rhos6-node3" [ style = bold] "swift-container_stop_0 rhos6-node3" -> "swift-container-clone_stopped_0" [ style = bold] "swift-container_stop_0 rhos6-node3" -> "swift-container_start_0 rhos6-node3" [ style = dashed] @@ -1181,7 +1094,6 @@ "swift-object-expirer_monitor_60000 rhos6-node2" [ style=dashed color="red" fontcolor="black"] "swift-object-expirer_start_0 rhos6-node2" -> "swift-object-expirer_monitor_60000 rhos6-node2" [ style = dashed] "swift-object-expirer_start_0 rhos6-node2" [ style=dashed color="red" fontcolor="black"] -"swift-object-expirer_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "swift-object-expirer_stop_0 rhos6-node2" -> "swift-object-expirer_start_0 rhos6-node2" [ style = dashed] "swift-object-expirer_stop_0 rhos6-node2" -> "swift-proxy-clone_stop_0" [ style = bold] "swift-object-expirer_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] @@ -1197,17 +1109,14 @@ "swift-object_start_0 rhos6-node3" -> "swift-object-clone_running_0" [ style = dashed] "swift-object_start_0 rhos6-node3" -> "swift-object_monitor_60000 rhos6-node3" [ style = dashed] "swift-object_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"swift-object_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "swift-object_stop_0 rhos6-node1" -> "swift-container_stop_0 rhos6-node1" [ style = bold] "swift-object_stop_0 rhos6-node1" -> "swift-object-clone_stopped_0" [ style = bold] "swift-object_stop_0 rhos6-node1" -> "swift-object_start_0 rhos6-node1" [ style = dashed] "swift-object_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"swift-object_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "swift-object_stop_0 rhos6-node2" -> "swift-container_stop_0 rhos6-node2" [ style = bold] "swift-object_stop_0 rhos6-node2" -> "swift-object-clone_stopped_0" [ style = bold] "swift-object_stop_0 rhos6-node2" -> "swift-object_start_0 rhos6-node2" [ style = dashed] "swift-object_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"swift-object_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "swift-object_stop_0 rhos6-node3" -> "swift-container_stop_0 rhos6-node3" [ style = bold] "swift-object_stop_0 rhos6-node3" -> "swift-object-clone_stopped_0" [ style = bold] "swift-object_stop_0 rhos6-node3" -> "swift-object_start_0 rhos6-node3" [ style = dashed] @@ -1239,17 +1148,14 @@ "swift-proxy_start_0 rhos6-node3" -> "swift-proxy-clone_running_0" [ style = dashed] "swift-proxy_start_0 rhos6-node3" -> "swift-proxy_monitor_60000 rhos6-node3" [ style = dashed] "swift-proxy_start_0 rhos6-node3" [ style=dashed color="red" fontcolor="black"] -"swift-proxy_stop_0 rhos6-node1" -> "all_stopped" [ style = bold] "swift-proxy_stop_0 rhos6-node1" -> "swift-account_stop_0 rhos6-node1" [ style = bold] "swift-proxy_stop_0 rhos6-node1" -> "swift-proxy-clone_stopped_0" [ style = bold] "swift-proxy_stop_0 rhos6-node1" -> "swift-proxy_start_0 rhos6-node1" [ style = dashed] "swift-proxy_stop_0 rhos6-node1" [ style=bold color="green" fontcolor="black"] -"swift-proxy_stop_0 rhos6-node2" -> "all_stopped" [ style = bold] "swift-proxy_stop_0 rhos6-node2" -> "swift-account_stop_0 rhos6-node2" [ style = bold] "swift-proxy_stop_0 rhos6-node2" -> "swift-proxy-clone_stopped_0" [ style = bold] "swift-proxy_stop_0 rhos6-node2" -> "swift-proxy_start_0 rhos6-node2" [ style = dashed] "swift-proxy_stop_0 rhos6-node2" [ style=bold color="green" fontcolor="black"] -"swift-proxy_stop_0 rhos6-node3" -> "all_stopped" [ style = bold] "swift-proxy_stop_0 rhos6-node3" -> "swift-account_stop_0 rhos6-node3" [ style = bold] "swift-proxy_stop_0 rhos6-node3" -> "swift-proxy-clone_stopped_0" [ style = bold] "swift-proxy_stop_0 rhos6-node3" -> "swift-proxy_start_0 rhos6-node3" [ style = dashed] diff --git a/pengine/test10/complex_enforce_colo.exp b/pengine/test10/complex_enforce_colo.exp index dd00a16..db9e246 100644 --- a/pengine/test10/complex_enforce_colo.exp +++ b/pengine/test10/complex_enforce_colo.exp @@ -1,271 +1,271 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -273,33 +273,33 @@ - + - + - + - + - + @@ -308,241 +308,241 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -550,79 +550,79 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -631,634 +631,634 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1266,391 +1266,391 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1658,1032 +1658,744 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/complex_enforce_colo.summary b/pengine/test10/complex_enforce_colo.summary index 0426e98..4201acc 100644 --- a/pengine/test10/complex_enforce_colo.summary +++ b/pengine/test10/complex_enforce_colo.summary @@ -348,7 +348,6 @@ Executing cluster transition: * Resource action: keystone stop on rhos6-node2 * Resource action: keystone stop on rhos6-node3 * Pseudo action: keystone-clone_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ rhos6-node1 rhos6-node2 rhos6-node3 ] diff --git a/pengine/test10/concurrent-fencing.dot b/pengine/test10/concurrent-fencing.dot index 657fa6a..91817cd 100644 --- a/pengine/test10/concurrent-fencing.dot +++ b/pengine/test10/concurrent-fencing.dot @@ -1,13 +1,7 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "stonith 'reboot' node1" -> "stonith 'reboot' node2" [ style = bold] -"stonith 'reboot' node1" -> "stonith_complete" [ style = bold] "stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] -"stonith 'reboot' node2" -> "stonith_complete" [ style = bold] "stonith 'reboot' node2" [ style=bold color="green" fontcolor="black"] "stonith 'reboot' node3" -> "stonith 'reboot' node2" [ style = bold] -"stonith 'reboot' node3" -> "stonith_complete" [ style = bold] "stonith 'reboot' node3" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/concurrent-fencing.exp b/pengine/test10/concurrent-fencing.exp index c916c1b..f479556 100644 --- a/pengine/test10/concurrent-fencing.exp +++ b/pengine/test10/concurrent-fencing.exp @@ -1,36 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -40,7 +10,7 @@ - + @@ -58,7 +28,7 @@ - + diff --git a/pengine/test10/concurrent-fencing.summary b/pengine/test10/concurrent-fencing.summary index 46d3323..2124528 100644 --- a/pengine/test10/concurrent-fencing.summary +++ b/pengine/test10/concurrent-fencing.summary @@ -16,8 +16,6 @@ Executing cluster transition: * Fencing node3 (reboot) * Fencing node1 (reboot) * Fencing node2 (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped Revised cluster status: OFFLINE: [ node1 node2 node3 ] diff --git a/pengine/test10/container-1.exp b/pengine/test10/container-1.exp index 0c40b34..db8bde8 100644 --- a/pengine/test10/container-1.exp +++ b/pengine/test10/container-1.exp @@ -1,36 +1,36 @@ - + - + - + - + - + - + @@ -39,7 +39,7 @@ - + @@ -48,53 +48,53 @@ - + - + - + - + - + - + - + - + diff --git a/pengine/test10/container-2.dot b/pengine/test10/container-2.dot index 8b65f59..15a5336 100644 --- a/pengine/test10/container-2.dot +++ b/pengine/test10/container-2.dot @@ -1,24 +1,20 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "container1_monitor_20000 node1" [ style=bold color="green" fontcolor="black"] "container1_start_0 node1" -> "container1_monitor_20000 node1" [ style = bold] "container1_start_0 node1" -> "rsc1_start_0 node1" [ style = bold] "container1_start_0 node1" -> "rsc2_start_0 node1" [ style = bold] "container1_start_0 node1" [ style=bold color="green" fontcolor="black"] -"container1_stop_0 node1" -> "all_stopped" [ style = bold] "container1_stop_0 node1" -> "container1_start_0 node1" [ style = bold] "container1_stop_0 node1" [ style=bold color="green" fontcolor="black"] "rsc1_monitor_10000 node1" [ style=bold color="green" fontcolor="black"] "rsc1_start_0 node1" -> "rsc1_monitor_10000 node1" [ style = bold] "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "container1_stop_0 node1" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_start_0 node1" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black"] "rsc2_monitor_5000 node1" [ style=bold color="green" fontcolor="black"] "rsc2_start_0 node1" -> "rsc2_monitor_5000 node1" [ style = bold] "rsc2_start_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "container1_stop_0 node1" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/container-2.exp b/pengine/test10/container-2.exp index ab50c7f..e0cb0af 100644 --- a/pengine/test10/container-2.exp +++ b/pengine/test10/container-2.exp @@ -1,7 +1,7 @@ - + @@ -21,10 +21,10 @@ - + - + @@ -37,29 +37,29 @@ - + - + - + - + - + @@ -75,29 +75,29 @@ - + - + - + - + - + @@ -113,25 +113,7 @@ - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/container-2.summary b/pengine/test10/container-2.summary index 011dbe4..7297257 100644 --- a/pengine/test10/container-2.summary +++ b/pengine/test10/container-2.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Resource action: rsc1 stop on node1 * Resource action: rsc2 stop on node1 * Resource action: container1 stop on node1 - * Pseudo action: all_stopped * Resource action: container1 start on node1 * Resource action: container1 monitor=20000 on node1 * Resource action: rsc1 start on node1 diff --git a/pengine/test10/container-3.dot b/pengine/test10/container-3.dot index 6ec52b9..87d8233 100644 --- a/pengine/test10/container-3.dot +++ b/pengine/test10/container-3.dot @@ -1,11 +1,9 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "container1_monitor_20000 node1" [ style=bold color="green" fontcolor="black"] "container1_start_0 node1" -> "container1_monitor_20000 node1" [ style = bold] "container1_start_0 node1" -> "rsc1_start_0 node1" [ style = bold] "container1_start_0 node1" -> "rsc2_start_0 node1" [ style = bold] "container1_start_0 node1" [ style=bold color="green" fontcolor="black"] -"container1_stop_0 node1" -> "all_stopped" [ style = bold] "container1_stop_0 node1" -> "container1_start_0 node1" [ style = bold] "container1_stop_0 node1" [ style=bold color="green" fontcolor="black"] "rsc1_monitor_10000 node1" [ style=bold color="green" fontcolor="black"] @@ -14,7 +12,6 @@ digraph "g" { "rsc2_monitor_5000 node1" [ style=bold color="green" fontcolor="black"] "rsc2_start_0 node1" -> "rsc2_monitor_5000 node1" [ style = bold] "rsc2_start_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "container1_stop_0 node1" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/container-3.exp b/pengine/test10/container-3.exp index c52dd31..f85e1d4 100644 --- a/pengine/test10/container-3.exp +++ b/pengine/test10/container-3.exp @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -34,55 +34,55 @@ - + - + - + - + - + - + - + - + - + @@ -98,22 +98,7 @@ - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/container-3.summary b/pengine/test10/container-3.summary index 424f27e..340359c 100644 --- a/pengine/test10/container-3.summary +++ b/pengine/test10/container-3.summary @@ -14,7 +14,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc2 stop on node1 * Resource action: container1 stop on node1 - * Pseudo action: all_stopped * Resource action: container1 start on node1 * Resource action: container1 monitor=20000 on node1 * Resource action: rsc1 start on node1 diff --git a/pengine/test10/container-4.dot b/pengine/test10/container-4.dot index 3babe8f..65824a0 100644 --- a/pengine/test10/container-4.dot +++ b/pengine/test10/container-4.dot @@ -1,24 +1,20 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "container1_monitor_20000 node2" [ style=bold color="green" fontcolor="black"] "container1_start_0 node2" -> "container1_monitor_20000 node2" [ style = bold] "container1_start_0 node2" -> "rsc1_start_0 node2" [ style = bold] "container1_start_0 node2" -> "rsc2_start_0 node2" [ style = bold] "container1_start_0 node2" [ style=bold color="green" fontcolor="black"] -"container1_stop_0 node1" -> "all_stopped" [ style = bold] "container1_stop_0 node1" -> "container1_start_0 node2" [ style = bold] "container1_stop_0 node1" [ style=bold color="green" fontcolor="black"] "rsc1_monitor_10000 node2" [ style=bold color="green" fontcolor="black"] "rsc1_start_0 node2" -> "rsc1_monitor_10000 node2" [ style = bold] "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "container1_stop_0 node1" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black"] "rsc2_monitor_5000 node2" [ style=bold color="green" fontcolor="black"] "rsc2_start_0 node2" -> "rsc2_monitor_5000 node2" [ style = bold] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "container1_stop_0 node1" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/container-4.exp b/pengine/test10/container-4.exp index c734230..77ebec4 100644 --- a/pengine/test10/container-4.exp +++ b/pengine/test10/container-4.exp @@ -1,20 +1,20 @@ - + - + - + @@ -34,45 +34,45 @@ - + - + - + - + - + - + - + - + @@ -81,59 +81,40 @@ - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/container-4.summary b/pengine/test10/container-4.summary index 387db8f..ca86d39 100644 --- a/pengine/test10/container-4.summary +++ b/pengine/test10/container-4.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Resource action: rsc1 stop on node1 * Resource action: rsc2 stop on node1 * Resource action: container1 stop on node1 - * Pseudo action: all_stopped * Resource action: container1 start on node2 * Resource action: rsc1 start on node2 * Resource action: rsc2 start on node2 diff --git a/pengine/test10/container-group-1.exp b/pengine/test10/container-group-1.exp index fc9e237..fff7183 100644 --- a/pengine/test10/container-group-1.exp +++ b/pengine/test10/container-group-1.exp @@ -1,28 +1,28 @@ - + - + - + - + - + - + @@ -30,39 +30,39 @@ - + - + - + - + - + - + - + @@ -71,7 +71,7 @@ - + @@ -80,62 +80,62 @@ - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/container-group-2.dot b/pengine/test10/container-group-2.dot index 49e8d56..061c380 100644 --- a/pengine/test10/container-group-2.dot +++ b/pengine/test10/container-group-2.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "container-group_running_0" [ style=bold color="green" fontcolor="orange"] "container-group_start_0" -> "container-group_running_0" [ style = bold] "container-group_start_0" -> "container1_start_0 node1" [ style = bold] @@ -19,7 +18,6 @@ digraph "g" { "container1_start_0 node1" -> "rsc1_start_0 node1" [ style = bold] "container1_start_0 node1" -> "rsc2_start_0 node1" [ style = bold] "container1_start_0 node1" [ style=bold color="green" fontcolor="black"] -"container1_stop_0 node1" -> "all_stopped" [ style = bold] "container1_stop_0 node1" -> "container-group_stopped_0" [ style = bold] "container1_stop_0 node1" -> "container1_start_0 node1" [ style = bold] "container1_stop_0 node1" [ style=bold color="green" fontcolor="black"] @@ -28,7 +26,6 @@ digraph "g" { "rsc1_start_0 node1" -> "rsc1_monitor_10000 node1" [ style = bold] "rsc1_start_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "container-group_stopped_0" [ style = bold] "rsc1_stop_0 node1" -> "container1_stop_0 node1" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_start_0 node1" [ style = bold] @@ -37,7 +34,6 @@ digraph "g" { "rsc2_start_0 node1" -> "container-group_running_0" [ style = bold] "rsc2_start_0 node1" -> "rsc2_monitor_5000 node1" [ style = bold] "rsc2_start_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "container-group_stopped_0" [ style = bold] "rsc2_stop_0 node1" -> "container1_stop_0 node1" [ style = bold] "rsc2_stop_0 node1" -> "rsc1_stop_0 node1" [ style = bold] diff --git a/pengine/test10/container-group-2.exp b/pengine/test10/container-group-2.exp index bfbb8f2..a5903c6 100644 --- a/pengine/test10/container-group-2.exp +++ b/pengine/test10/container-group-2.exp @@ -1,7 +1,7 @@ - + @@ -10,19 +10,19 @@ - + - + - + - + @@ -30,40 +30,40 @@ - + - + - + - + - + - + - + - + @@ -73,7 +73,7 @@ - + @@ -86,13 +86,13 @@ - + - + - + @@ -105,42 +105,42 @@ - + - + - + - + - + - + - + - + @@ -153,42 +153,42 @@ - + - + - + - + - + - + - + - + @@ -201,25 +201,7 @@ - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/container-group-2.summary b/pengine/test10/container-group-2.summary index 68d62aa..b0c6b1f 100644 --- a/pengine/test10/container-group-2.summary +++ b/pengine/test10/container-group-2.summary @@ -17,7 +17,6 @@ Executing cluster transition: * Resource action: rsc2 stop on node1 * Resource action: rsc1 stop on node1 * Resource action: container1 stop on node1 - * Pseudo action: all_stopped * Pseudo action: container-group_stopped_0 * Pseudo action: container-group_start_0 * Resource action: container1 start on node1 diff --git a/pengine/test10/container-group-3.dot b/pengine/test10/container-group-3.dot index f6ae999..416e0e6 100644 --- a/pengine/test10/container-group-3.dot +++ b/pengine/test10/container-group-3.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "container-group_running_0" [ style=bold color="green" fontcolor="orange"] "container-group_start_0" -> "container-group_running_0" [ style = bold] "container-group_start_0" -> "container1_start_0 node1" [ style = bold] @@ -17,7 +16,6 @@ digraph "g" { "container1_start_0 node1" -> "rsc1_start_0 node1" [ style = bold] "container1_start_0 node1" -> "rsc2_start_0 node1" [ style = bold] "container1_start_0 node1" [ style=bold color="green" fontcolor="black"] -"container1_stop_0 node1" -> "all_stopped" [ style = bold] "container1_stop_0 node1" -> "container-group_stopped_0" [ style = bold] "container1_stop_0 node1" -> "container1_start_0 node1" [ style = bold] "container1_stop_0 node1" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/container-group-3.exp b/pengine/test10/container-group-3.exp index 58dedb9..8466066 100644 --- a/pengine/test10/container-group-3.exp +++ b/pengine/test10/container-group-3.exp @@ -1,7 +1,7 @@ - + @@ -10,13 +10,13 @@ - + - + @@ -24,40 +24,40 @@ - + - + - + - + - + - + - + - + @@ -67,7 +67,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -93,80 +93,68 @@ - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - + diff --git a/pengine/test10/container-group-3.summary b/pengine/test10/container-group-3.summary index 3e327ff..e641763 100644 --- a/pengine/test10/container-group-3.summary +++ b/pengine/test10/container-group-3.summary @@ -15,7 +15,6 @@ Transition Summary: Executing cluster transition: * Pseudo action: container-group_stop_0 * Resource action: container1 stop on node1 - * Pseudo action: all_stopped * Pseudo action: container-group_stopped_0 * Pseudo action: container-group_start_0 * Resource action: container1 start on node1 diff --git a/pengine/test10/container-group-4.dot b/pengine/test10/container-group-4.dot index 7ccd78f..3821bc4 100644 --- a/pengine/test10/container-group-4.dot +++ b/pengine/test10/container-group-4.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "container-group_running_0" [ style=bold color="green" fontcolor="orange"] "container-group_start_0" -> "container-group_running_0" [ style = bold] "container-group_start_0" -> "container1_start_0 node2" [ style = bold] @@ -19,7 +18,6 @@ digraph "g" { "container1_start_0 node2" -> "rsc1_start_0 node2" [ style = bold] "container1_start_0 node2" -> "rsc2_start_0 node2" [ style = bold] "container1_start_0 node2" [ style=bold color="green" fontcolor="black"] -"container1_stop_0 node1" -> "all_stopped" [ style = bold] "container1_stop_0 node1" -> "container-group_stopped_0" [ style = bold] "container1_stop_0 node1" -> "container1_start_0 node2" [ style = bold] "container1_stop_0 node1" [ style=bold color="green" fontcolor="black"] @@ -28,7 +26,6 @@ digraph "g" { "rsc1_start_0 node2" -> "rsc1_monitor_10000 node2" [ style = bold] "rsc1_start_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "container-group_stopped_0" [ style = bold] "rsc1_stop_0 node1" -> "container1_stop_0 node1" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold] @@ -37,7 +34,6 @@ digraph "g" { "rsc2_start_0 node2" -> "container-group_running_0" [ style = bold] "rsc2_start_0 node2" -> "rsc2_monitor_5000 node2" [ style = bold] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "container-group_stopped_0" [ style = bold] "rsc2_stop_0 node1" -> "container1_stop_0 node1" [ style = bold] "rsc2_stop_0 node1" -> "rsc1_stop_0 node1" [ style = bold] diff --git a/pengine/test10/container-group-4.exp b/pengine/test10/container-group-4.exp index efb7127..ba930f8 100644 --- a/pengine/test10/container-group-4.exp +++ b/pengine/test10/container-group-4.exp @@ -1,7 +1,7 @@ - + @@ -10,19 +10,19 @@ - + - + - + - + @@ -30,53 +30,53 @@ - + - + - + - + - + - + - + - + - + - + @@ -86,7 +86,7 @@ - + @@ -99,127 +99,109 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/container-group-4.summary b/pengine/test10/container-group-4.summary index 8ab682b..e70407e 100644 --- a/pengine/test10/container-group-4.summary +++ b/pengine/test10/container-group-4.summary @@ -17,7 +17,6 @@ Executing cluster transition: * Resource action: rsc2 stop on node1 * Resource action: rsc1 stop on node1 * Resource action: container1 stop on node1 - * Pseudo action: all_stopped * Pseudo action: container-group_stopped_0 * Pseudo action: container-group_start_0 * Resource action: container1 start on node2 diff --git a/pengine/test10/container-is-remote-node.exp b/pengine/test10/container-is-remote-node.exp index d656dd2..35c2181 100644 --- a/pengine/test10/container-is-remote-node.exp +++ b/pengine/test10/container-is-remote-node.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/pengine/test10/date-1.exp b/pengine/test10/date-1.exp index 61455bb..8543365 100644 --- a/pengine/test10/date-1.exp +++ b/pengine/test10/date-1.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + diff --git a/pengine/test10/enforce-colo1.dot b/pengine/test10/enforce-colo1.dot index 68200fe..45b08f4 100644 --- a/pengine/test10/enforce-colo1.dot +++ b/pengine/test10/enforce-colo1.dot @@ -1,16 +1,13 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "central_monitor_10000 rhel7-auto3" [ style=dashed color="red" fontcolor="black"] "central_start_0 rhel7-auto3" -> "central_monitor_10000 rhel7-auto3" [ style = dashed] "central_start_0 rhel7-auto3" [ style=dashed color="red" fontcolor="black"] -"central_stop_0 rhel7-auto3" -> "all_stopped" [ style = bold] "central_stop_0 rhel7-auto3" -> "central_start_0 rhel7-auto3" [ style = dashed] "central_stop_0 rhel7-auto3" -> "keystone-clone_stop_0" [ style = bold] "central_stop_0 rhel7-auto3" [ style=bold color="green" fontcolor="black"] "engine_monitor_10000 rhel7-auto3" [ style=dashed color="red" fontcolor="black"] "engine_start_0 rhel7-auto3" -> "engine_monitor_10000 rhel7-auto3" [ style = dashed] "engine_start_0 rhel7-auto3" [ style=dashed color="red" fontcolor="black"] -"engine_stop_0 rhel7-auto3" -> "all_stopped" [ style = bold] "engine_stop_0 rhel7-auto3" -> "engine_start_0 rhel7-auto3" [ style = dashed] "engine_stop_0 rhel7-auto3" [ style=bold color="green" fontcolor="black"] "keystone-clone_stop_0" -> "keystone-clone_stopped_0" [ style = bold] @@ -19,13 +16,10 @@ "keystone-clone_stop_0" -> "keystone_stop_0 rhel7-auto3" [ style = bold] "keystone-clone_stop_0" [ style=bold color="green" fontcolor="orange"] "keystone-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] -"keystone_stop_0 rhel7-auto1" -> "all_stopped" [ style = bold] "keystone_stop_0 rhel7-auto1" -> "keystone-clone_stopped_0" [ style = bold] "keystone_stop_0 rhel7-auto1" [ style=bold color="green" fontcolor="black"] -"keystone_stop_0 rhel7-auto2" -> "all_stopped" [ style = bold] "keystone_stop_0 rhel7-auto2" -> "keystone-clone_stopped_0" [ style = bold] "keystone_stop_0 rhel7-auto2" [ style=bold color="green" fontcolor="black"] -"keystone_stop_0 rhel7-auto3" -> "all_stopped" [ style = bold] "keystone_stop_0 rhel7-auto3" -> "keystone-clone_stopped_0" [ style = bold] "keystone_stop_0 rhel7-auto3" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/enforce-colo1.exp b/pengine/test10/enforce-colo1.exp index 6e2a6a9..8e15308 100644 --- a/pengine/test10/enforce-colo1.exp +++ b/pengine/test10/enforce-colo1.exp @@ -1,7 +1,7 @@ - + @@ -10,107 +10,83 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/enforce-colo1.summary b/pengine/test10/enforce-colo1.summary index 4968326..e990424 100644 --- a/pengine/test10/enforce-colo1.summary +++ b/pengine/test10/enforce-colo1.summary @@ -24,7 +24,6 @@ Executing cluster transition: * Resource action: keystone stop on rhel7-auto3 * Resource action: keystone stop on rhel7-auto1 * Pseudo action: keystone-clone_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ rhel7-auto1 rhel7-auto2 rhel7-auto3 ] diff --git a/pengine/test10/failcount-block.exp b/pengine/test10/failcount-block.exp index dd6b8c7..db48d3e 100644 --- a/pengine/test10/failcount-block.exp +++ b/pengine/test10/failcount-block.exp @@ -19,20 +19,20 @@ - + - + - + @@ -50,20 +50,20 @@ - + - + - + diff --git a/pengine/test10/group-dependents.dot b/pengine/test10/group-dependents.dot index 7392afc..939d34f 100644 --- a/pengine/test10/group-dependents.dot +++ b/pengine/test10/group-dependents.dot @@ -1,7 +1,6 @@ digraph "g" { "Cancel drbd:1_monitor_31000 asttest2" -> "drbd:1_promote_0 asttest2" [ style = bold] "Cancel drbd:1_monitor_31000 asttest2" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "asterisk_monitor_1000 asttest2" [ style=bold color="green" fontcolor="black"] "asterisk_start_0 asttest2" -> "asterisk_monitor_1000 asttest2" [ style = bold] "asterisk_start_0 asttest2" -> "iax2_mon_start_0 asttest2" [ style = bold] @@ -17,7 +16,6 @@ digraph "g" { "dahdi_start_0 asttest2" -> "fonulator_start_0 asttest2" [ style = bold] "dahdi_start_0 asttest2" -> "voip_running_0" [ style = bold] "dahdi_start_0 asttest2" [ style=bold color="green" fontcolor="orange"] -"dahdi_stop_0 asttest1" -> "all_stopped" [ style = bold] "dahdi_stop_0 asttest1" -> "dahdi_start_0 asttest2" [ style = bold] "dahdi_stop_0 asttest1" -> "mysqld_migrate_to_0 asttest1" [ style = dashed] "dahdi_stop_0 asttest1" -> "mysqld_stop_0 asttest1" [ style = bold] @@ -54,7 +52,6 @@ digraph "g" { "fs_drbd_start_0 asttest2" -> "fs_drbd_monitor_1000 asttest2" [ style = bold] "fs_drbd_start_0 asttest2" -> "ip_voip_addresses_p_start_0" [ style = bold] "fs_drbd_start_0 asttest2" [ style=bold color="green" fontcolor="black"] -"fs_drbd_stop_0 asttest1" -> "all_stopped" [ style = bold] "fs_drbd_stop_0 asttest1" -> "fs_drbd_start_0 asttest2" [ style = bold] "fs_drbd_stop_0 asttest1" -> "ms_drbd_demote_0" [ style = bold] "fs_drbd_stop_0 asttest1" [ style=bold color="green" fontcolor="black"] @@ -102,7 +99,6 @@ digraph "g" { "ip_voip_route_test1_start_0 asttest2" -> "ip_voip_route_test1_monitor_1000 asttest2" [ style = bold] "ip_voip_route_test1_start_0 asttest2" -> "ip_voip_routes_running_0" [ style = bold] "ip_voip_route_test1_start_0 asttest2" [ style=bold color="green" fontcolor="orange"] -"ip_voip_route_test1_stop_0 asttest1" -> "all_stopped" [ style = bold] "ip_voip_route_test1_stop_0 asttest1" -> "ip_voip_route_test1_start_0 asttest2" [ style = bold] "ip_voip_route_test1_stop_0 asttest1" -> "ip_voip_routes_stopped_0" [ style = bold] "ip_voip_route_test1_stop_0 asttest1" [ style=bold color="green" fontcolor="black"] @@ -115,7 +111,6 @@ digraph "g" { "ip_voip_route_test2_start_0 asttest2" -> "ip_voip_route_test2_monitor_1000 asttest2" [ style = bold] "ip_voip_route_test2_start_0 asttest2" -> "ip_voip_routes_running_0" [ style = bold] "ip_voip_route_test2_start_0 asttest2" [ style=bold color="green" fontcolor="orange"] -"ip_voip_route_test2_stop_0 asttest1" -> "all_stopped" [ style = bold] "ip_voip_route_test2_stop_0 asttest1" -> "ip_voip_route_test2_start_0 asttest2" [ style = bold] "ip_voip_route_test2_stop_0 asttest1" -> "ip_voip_routes_stopped_0" [ style = bold] "ip_voip_route_test2_stop_0 asttest1" [ style=bold color="green" fontcolor="black"] @@ -141,7 +136,6 @@ digraph "g" { "ip_voip_vlan850_start_0 asttest2" -> "ip_voip_addresses_p_running_0" [ style = bold] "ip_voip_vlan850_start_0 asttest2" -> "ip_voip_vlan850_monitor_1000 asttest2" [ style = bold] "ip_voip_vlan850_start_0 asttest2" [ style=bold color="green" fontcolor="orange"] -"ip_voip_vlan850_stop_0 asttest1" -> "all_stopped" [ style = bold] "ip_voip_vlan850_stop_0 asttest1" -> "ip_voip_addresses_p_stopped_0" [ style = bold] "ip_voip_vlan850_stop_0 asttest1" -> "ip_voip_vlan850_start_0 asttest2" [ style = bold] "ip_voip_vlan850_stop_0 asttest1" [ style=bold color="green" fontcolor="black"] @@ -154,7 +148,6 @@ digraph "g" { "ip_voip_vlan851_start_0 asttest2" -> "ip_voip_addresses_p_running_0" [ style = bold] "ip_voip_vlan851_start_0 asttest2" -> "ip_voip_vlan851_monitor_1000 asttest2" [ style = bold] "ip_voip_vlan851_start_0 asttest2" [ style=bold color="green" fontcolor="orange"] -"ip_voip_vlan851_stop_0 asttest1" -> "all_stopped" [ style = bold] "ip_voip_vlan851_stop_0 asttest1" -> "ip_voip_addresses_p_stopped_0" [ style = bold] "ip_voip_vlan851_stop_0 asttest1" -> "ip_voip_vlan851_start_0 asttest2" [ style = bold] "ip_voip_vlan851_stop_0 asttest1" [ style=bold color="green" fontcolor="black"] @@ -167,7 +160,6 @@ digraph "g" { "ip_voip_vlan852_start_0 asttest2" -> "ip_voip_addresses_p_running_0" [ style = bold] "ip_voip_vlan852_start_0 asttest2" -> "ip_voip_vlan852_monitor_1000 asttest2" [ style = bold] "ip_voip_vlan852_start_0 asttest2" [ style=bold color="green" fontcolor="orange"] -"ip_voip_vlan852_stop_0 asttest1" -> "all_stopped" [ style = bold] "ip_voip_vlan852_stop_0 asttest1" -> "ip_voip_addresses_p_stopped_0" [ style = bold] "ip_voip_vlan852_stop_0 asttest1" -> "ip_voip_vlan852_start_0 asttest2" [ style = bold] "ip_voip_vlan852_stop_0 asttest1" [ style=bold color="green" fontcolor="black"] @@ -180,7 +172,6 @@ digraph "g" { "ip_voip_vlan853_start_0 asttest2" -> "ip_voip_addresses_p_running_0" [ style = bold] "ip_voip_vlan853_start_0 asttest2" -> "ip_voip_vlan853_monitor_1000 asttest2" [ style = bold] "ip_voip_vlan853_start_0 asttest2" [ style=bold color="green" fontcolor="orange"] -"ip_voip_vlan853_stop_0 asttest1" -> "all_stopped" [ style = bold] "ip_voip_vlan853_stop_0 asttest1" -> "ip_voip_addresses_p_stopped_0" [ style = bold] "ip_voip_vlan853_stop_0 asttest1" -> "ip_voip_vlan853_start_0 asttest2" [ style = bold] "ip_voip_vlan853_stop_0 asttest1" [ style=bold color="green" fontcolor="black"] @@ -193,7 +184,6 @@ digraph "g" { "ip_voip_vlan854_start_0 asttest2" -> "ip_voip_addresses_p_running_0" [ style = bold] "ip_voip_vlan854_start_0 asttest2" -> "ip_voip_vlan854_monitor_1000 asttest2" [ style = bold] "ip_voip_vlan854_start_0 asttest2" [ style=bold color="green" fontcolor="orange"] -"ip_voip_vlan854_stop_0 asttest1" -> "all_stopped" [ style = bold] "ip_voip_vlan854_stop_0 asttest1" -> "ip_voip_addresses_p_stopped_0" [ style = bold] "ip_voip_vlan854_stop_0 asttest1" -> "ip_voip_vlan854_start_0 asttest2" [ style = bold] "ip_voip_vlan854_stop_0 asttest1" [ style=bold color="green" fontcolor="black"] @@ -206,7 +196,6 @@ digraph "g" { "ip_voip_vlan855_start_0 asttest2" -> "ip_voip_addresses_p_running_0" [ style = bold] "ip_voip_vlan855_start_0 asttest2" -> "ip_voip_vlan855_monitor_1000 asttest2" [ style = bold] "ip_voip_vlan855_start_0 asttest2" [ style=bold color="green" fontcolor="orange"] -"ip_voip_vlan855_stop_0 asttest1" -> "all_stopped" [ style = bold] "ip_voip_vlan855_stop_0 asttest1" -> "ip_voip_addresses_p_stopped_0" [ style = bold] "ip_voip_vlan855_stop_0 asttest1" -> "ip_voip_vlan855_start_0 asttest2" [ style = bold] "ip_voip_vlan855_stop_0 asttest1" [ style=bold color="green" fontcolor="black"] @@ -219,7 +208,6 @@ digraph "g" { "ip_voip_vlan856_start_0 asttest2" -> "ip_voip_addresses_p_running_0" [ style = bold] "ip_voip_vlan856_start_0 asttest2" -> "ip_voip_vlan856_monitor_1000 asttest2" [ style = bold] "ip_voip_vlan856_start_0 asttest2" [ style=bold color="green" fontcolor="orange"] -"ip_voip_vlan856_stop_0 asttest1" -> "all_stopped" [ style = bold] "ip_voip_vlan856_stop_0 asttest1" -> "ip_voip_addresses_p_stopped_0" [ style = bold] "ip_voip_vlan856_stop_0 asttest1" -> "ip_voip_vlan856_start_0 asttest2" [ style = bold] "ip_voip_vlan856_stop_0 asttest1" [ style=bold color="green" fontcolor="black"] @@ -232,7 +220,6 @@ digraph "g" { "ip_voip_vlan998_start_0 asttest2" -> "ip_voip_addresses_p_running_0" [ style = bold] "ip_voip_vlan998_start_0 asttest2" -> "ip_voip_vlan998_monitor_1000 asttest2" [ style = bold] "ip_voip_vlan998_start_0 asttest2" [ style=bold color="green" fontcolor="orange"] -"ip_voip_vlan998_stop_0 asttest1" -> "all_stopped" [ style = bold] "ip_voip_vlan998_stop_0 asttest1" -> "ip_voip_addresses_p_stopped_0" [ style = bold] "ip_voip_vlan998_stop_0 asttest1" -> "ip_voip_vlan998_start_0 asttest2" [ style = bold] "ip_voip_vlan998_stop_0 asttest1" [ style=bold color="green" fontcolor="black"] @@ -286,7 +273,6 @@ digraph "g" { "mysqld_start_0 asttest2" -> "mysqld_monitor_1000 asttest2" [ style = bold] "mysqld_start_0 asttest2" -> "voip_running_0" [ style = bold] "mysqld_start_0 asttest2" [ style=bold color="green" fontcolor="orange"] -"mysqld_stop_0 asttest1" -> "all_stopped" [ style = bold] "mysqld_stop_0 asttest1" -> "mysqld_start_0 asttest2" [ style = bold] "mysqld_stop_0 asttest1" -> "voip_stopped_0" [ style = bold] "mysqld_stop_0 asttest1" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/group-dependents.exp b/pengine/test10/group-dependents.exp index 0df62f0..e1dbf26 100644 --- a/pengine/test10/group-dependents.exp +++ b/pengine/test10/group-dependents.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -27,68 +27,68 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -97,354 +97,354 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -453,67 +453,67 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -522,166 +522,166 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -690,67 +690,67 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -759,67 +759,67 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -828,67 +828,67 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -897,67 +897,67 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -966,67 +966,67 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -1035,67 +1035,67 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -1104,67 +1104,67 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -1173,232 +1173,232 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1408,7 +1408,7 @@ - + @@ -1423,58 +1423,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -1482,169 +1482,121 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/group-dependents.summary b/pengine/test10/group-dependents.summary index 15b750b..aa7303c 100644 --- a/pengine/test10/group-dependents.summary +++ b/pengine/test10/group-dependents.summary @@ -101,7 +101,6 @@ Executing cluster transition: * Pseudo action: ip_voip_addresses_p_stopped_0 * Resource action: fs_drbd stop on asttest1 * Pseudo action: ms_drbd_demote_0 - * Pseudo action: all_stopped * Resource action: drbd:0 demote on asttest1 * Pseudo action: ms_drbd_demoted_0 * Pseudo action: ms_drbd_post_notify_demoted_0 diff --git a/pengine/test10/group-fail.dot b/pengine/test10/group-fail.dot index ee8b4e9..b4a3b18 100644 --- a/pengine/test10/group-fail.dot +++ b/pengine/test10/group-fail.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "group1_running_0" [ style=bold color="green" fontcolor="orange"] "group1_start_0" -> "group1_running_0" [ style = bold] "group1_start_0" -> "rsc1_start_0 node1" [ style = bold] @@ -19,7 +18,6 @@ digraph "g" { "rsc2_start_0 node1" -> "group1_running_0" [ style = bold] "rsc2_start_0 node1" -> "rsc3_start_0 node1" [ style = bold] "rsc2_start_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "group1_stopped_0" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black"] @@ -28,7 +26,6 @@ digraph "g" { "rsc3_start_0 node1" [ style=bold color="green" fontcolor="black"] "rsc4_start_0 node1" -> "group1_running_0" [ style = bold] "rsc4_start_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc4_stop_0 node1" -> "all_stopped" [ style = bold] "rsc4_stop_0 node1" -> "group1_stopped_0" [ style = bold] "rsc4_stop_0 node1" -> "rsc2_stop_0 node1" [ style = bold] "rsc4_stop_0 node1" -> "rsc4_start_0 node1" [ style = bold] diff --git a/pengine/test10/group-fail.exp b/pengine/test10/group-fail.exp index c2b9f80..64b5aab 100644 --- a/pengine/test10/group-fail.exp +++ b/pengine/test10/group-fail.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -27,148 +27,133 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/group-fail.summary b/pengine/test10/group-fail.summary index 8ed59ca..44d8d31 100644 --- a/pengine/test10/group-fail.summary +++ b/pengine/test10/group-fail.summary @@ -18,7 +18,6 @@ Executing cluster transition: * Pseudo action: group1_stop_0 * Resource action: rsc4 stop on node1 * Resource action: rsc2 stop on node1 - * Pseudo action: all_stopped * Pseudo action: group1_stopped_0 * Pseudo action: group1_start_0 * Resource action: rsc1 start on node1 diff --git a/pengine/test10/group-unmanaged-stopped.dot b/pengine/test10/group-unmanaged-stopped.dot index a2392d6..0fab903 100644 --- a/pengine/test10/group-unmanaged-stopped.dot +++ b/pengine/test10/group-unmanaged-stopped.dot @@ -1,10 +1,8 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "group-1_stop_0" -> "group-1_stopped_0" [ style = bold] "group-1_stop_0" -> "r192.168.122.115_stop_0 pcmk-1" [ style = bold] "group-1_stop_0" [ style=bold color="green" fontcolor="orange"] "group-1_stopped_0" [ style=bold color="green" fontcolor="orange"] -"r192.168.122.115_stop_0 pcmk-1" -> "all_stopped" [ style = bold] "r192.168.122.115_stop_0 pcmk-1" -> "group-1_stopped_0" [ style = bold] "r192.168.122.115_stop_0 pcmk-1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/group-unmanaged-stopped.exp b/pengine/test10/group-unmanaged-stopped.exp index c1f2193..1256c53 100644 --- a/pengine/test10/group-unmanaged-stopped.exp +++ b/pengine/test10/group-unmanaged-stopped.exp @@ -1,22 +1,22 @@ - + - + - + - + @@ -24,26 +24,14 @@ - + - - - - - - - - - - - - - + diff --git a/pengine/test10/group-unmanaged-stopped.summary b/pengine/test10/group-unmanaged-stopped.summary index de0586a..1b37290 100644 --- a/pengine/test10/group-unmanaged-stopped.summary +++ b/pengine/test10/group-unmanaged-stopped.summary @@ -13,7 +13,6 @@ Transition Summary: Executing cluster transition: * Pseudo action: group-1_stop_0 * Resource action: r192.168.122.115 stop on pcmk-1 - * Pseudo action: all_stopped * Pseudo action: group-1_stopped_0 Revised cluster status: diff --git a/pengine/test10/group1.exp b/pengine/test10/group1.exp index cec1961..dc70429 100644 --- a/pengine/test10/group1.exp +++ b/pengine/test10/group1.exp @@ -1,28 +1,28 @@ - + - + - + - + - + - + @@ -30,26 +30,26 @@ - + - + - + - + - + @@ -58,7 +58,7 @@ - + @@ -67,29 +67,29 @@ - + - + - + - + - + - + @@ -98,7 +98,7 @@ - + @@ -107,29 +107,29 @@ - + - + - + - + - + - + @@ -138,7 +138,7 @@ - + diff --git a/pengine/test10/group10.dot b/pengine/test10/group10.dot index 36c2c6e..4cfbda6 100644 --- a/pengine/test10/group10.dot +++ b/pengine/test10/group10.dot @@ -1,11 +1,9 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_192.168.100.181_monitor_5000 c001n01" [ style=bold color="green" fontcolor="black" ] "child_192.168.100.181_start_0 c001n01" -> "child_192.168.100.181_monitor_5000 c001n01" [ style = bold] "child_192.168.100.181_start_0 c001n01" -> "child_192.168.100.182_start_0 c001n01" [ style = bold] "child_192.168.100.181_start_0 c001n01" -> "group-1_running_0" [ style = bold] "child_192.168.100.181_start_0 c001n01" [ style=bold color="green" fontcolor="black" ] -"child_192.168.100.181_stop_0 c001n01" -> "all_stopped" [ style = bold] "child_192.168.100.181_stop_0 c001n01" -> "child_192.168.100.181_start_0 c001n01" [ style = bold] "child_192.168.100.181_stop_0 c001n01" -> "group-1_stopped_0" [ style = bold] "child_192.168.100.181_stop_0 c001n01" [ style=bold color="green" fontcolor="black" ] @@ -14,7 +12,6 @@ "child_192.168.100.182_start_0 c001n01" -> "child_192.168.100.183_start_0 c001n01" [ style = bold] "child_192.168.100.182_start_0 c001n01" -> "group-1_running_0" [ style = bold] "child_192.168.100.182_start_0 c001n01" [ style=bold color="green" fontcolor="black" ] -"child_192.168.100.182_stop_0 c001n01" -> "all_stopped" [ style = bold] "child_192.168.100.182_stop_0 c001n01" -> "child_192.168.100.181_stop_0 c001n01" [ style = bold] "child_192.168.100.182_stop_0 c001n01" -> "child_192.168.100.182_start_0 c001n01" [ style = bold] "child_192.168.100.182_stop_0 c001n01" -> "group-1_stopped_0" [ style = bold] @@ -23,7 +20,6 @@ "child_192.168.100.183_start_0 c001n01" -> "child_192.168.100.183_monitor_5000 c001n01" [ style = bold] "child_192.168.100.183_start_0 c001n01" -> "group-1_running_0" [ style = bold] "child_192.168.100.183_start_0 c001n01" [ style=bold color="green" fontcolor="black" ] -"child_192.168.100.183_stop_0 c001n01" -> "all_stopped" [ style = bold] "child_192.168.100.183_stop_0 c001n01" -> "child_192.168.100.182_stop_0 c001n01" [ style = bold] "child_192.168.100.183_stop_0 c001n01" -> "child_192.168.100.183_start_0 c001n01" [ style = bold] "child_192.168.100.183_stop_0 c001n01" -> "group-1_stopped_0" [ style = bold] diff --git a/pengine/test10/group10.exp b/pengine/test10/group10.exp index 78df467..f58b015 100644 --- a/pengine/test10/group10.exp +++ b/pengine/test10/group10.exp @@ -1,7 +1,7 @@ - + @@ -10,19 +10,19 @@ - + - + - + - + @@ -30,40 +30,40 @@ - + - + - + - + - + - + - + - + @@ -73,7 +73,7 @@ - + @@ -86,10 +86,10 @@ - + - + @@ -102,42 +102,42 @@ - + - + - + - + - + - + - + - + @@ -150,39 +150,39 @@ - + - + - + - + - + - + - + @@ -195,13 +195,13 @@ - + - + @@ -210,7 +210,7 @@ - + @@ -219,7 +219,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -237,7 +237,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -264,7 +264,7 @@ - + @@ -273,30 +273,11 @@ - + - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/group10.summary b/pengine/test10/group10.summary index f7d0eef..6bac3cf 100644 --- a/pengine/test10/group10.summary +++ b/pengine/test10/group10.summary @@ -36,7 +36,6 @@ Executing cluster transition: * Resource action: child_DoFencing:3 monitor on c001n01 * Resource action: child_192.168.100.182 stop on c001n01 * Resource action: child_192.168.100.181 stop on c001n01 - * Pseudo action: all_stopped * Pseudo action: group-1_stopped_0 * Pseudo action: group-1_start_0 * Resource action: child_192.168.100.181 start on c001n01 diff --git a/pengine/test10/group11.dot b/pengine/test10/group11.dot index d7a282f..c5f0e7e 100644 --- a/pengine/test10/group11.dot +++ b/pengine/test10/group11.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "group1_running_0" [ style=dashed color="red" fontcolor="orange" ] "group1_start_0" -> "group1_running_0" [ style = dashed] "group1_start_0" -> "rsc3_start_0 " [ style = dashed] @@ -10,12 +9,10 @@ digraph "g" { "group1_stop_0" [ style=bold color="green" fontcolor="orange" ] "group1_stopped_0" -> "group1_start_0" [ style = bold] "group1_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "group1_stopped_0" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3_start_0 " -> "group1_running_0" [ style = dashed] "rsc3_start_0 " [ style=dashed color="red" fontcolor="black" ] -"rsc3_stop_0 node1" -> "all_stopped" [ style = bold] "rsc3_stop_0 node1" -> "group1_stopped_0" [ style = bold] "rsc3_stop_0 node1" -> "rsc2_stop_0 node1" [ style = bold] "rsc3_stop_0 node1" -> "rsc3_start_0 " [ style = dashed] diff --git a/pengine/test10/group11.exp b/pengine/test10/group11.exp index 901702e..5639cf8 100644 --- a/pengine/test10/group11.exp +++ b/pengine/test10/group11.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -27,57 +27,42 @@ - + - + - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/group11.summary b/pengine/test10/group11.summary index 204d632..fc1fe58 100644 --- a/pengine/test10/group11.summary +++ b/pengine/test10/group11.summary @@ -16,7 +16,6 @@ Executing cluster transition: * Pseudo action: group1_stop_0 * Resource action: rsc3 stop on node1 * Resource action: rsc2 stop on node1 - * Pseudo action: all_stopped * Pseudo action: group1_stopped_0 * Pseudo action: group1_start_0 diff --git a/pengine/test10/group13.dot b/pengine/test10/group13.dot index 8e594b0..bbef56e 100644 --- a/pengine/test10/group13.dot +++ b/pengine/test10/group13.dot @@ -1,10 +1,8 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "nfs_stop_0" -> "nfs_stopped_0" [ style = bold] "nfs_stop_0" -> "resource_nfs_stop_0 jamesltc" [ style = bold] "nfs_stop_0" [ style=bold color="green" fontcolor="orange" ] "nfs_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"resource_nfs_stop_0 jamesltc" -> "all_stopped" [ style = bold] "resource_nfs_stop_0 jamesltc" -> "nfs_stopped_0" [ style = bold] "resource_nfs_stop_0 jamesltc" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/group13.exp b/pengine/test10/group13.exp index aeab46d..ccf8bfd 100644 --- a/pengine/test10/group13.exp +++ b/pengine/test10/group13.exp @@ -1,22 +1,22 @@ - + - + - + - + @@ -24,26 +24,14 @@ - + - - - - - - - - - - - - - + diff --git a/pengine/test10/group13.summary b/pengine/test10/group13.summary index 5f92a4f..ce0f0a2 100644 --- a/pengine/test10/group13.summary +++ b/pengine/test10/group13.summary @@ -13,7 +13,6 @@ Transition Summary: Executing cluster transition: * Pseudo action: nfs_stop_0 * Resource action: resource_nfs stop on jamesltc - * Pseudo action: all_stopped * Pseudo action: nfs_stopped_0 Revised cluster status: diff --git a/pengine/test10/group14.dot b/pengine/test10/group14.dot index 7b42899..18b6e7c 100644 --- a/pengine/test10/group14.dot +++ b/pengine/test10/group14.dot @@ -5,7 +5,6 @@ "DoFencing_start_0" -> "child_DoFencing:0_start_0 c001n06" [ style = bold] "DoFencing_start_0" -> "child_DoFencing:1_start_0 c001n07" [ style = bold] "DoFencing_start_0" [ style=bold color="green" fontcolor="orange" ] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:0_monitor_20000 c001n06" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_start_0 c001n06" -> "DoFencing_running_0" [ style = bold] "child_DoFencing:0_start_0 c001n06" -> "child_DoFencing:0_monitor_20000 c001n06" [ style = bold] @@ -36,7 +35,6 @@ "r192.168.100.181_start_0 c001n07" -> "r192.168.100.181_monitor_5000 c001n07" [ style = dashed] "r192.168.100.181_start_0 c001n07" -> "r192.168.100.182_start_0 c001n07" [ style = dashed] "r192.168.100.181_start_0 c001n07" [ style=dashed color="red" fontcolor="black" ] -"r192.168.100.181_stop_0 c001n06" -> "all_stopped" [ style = bold] "r192.168.100.181_stop_0 c001n06" -> "group-1_stopped_0" [ style = bold] "r192.168.100.181_stop_0 c001n06" -> "r192.168.100.181_start_0 c001n07" [ style = dashed] "r192.168.100.181_stop_0 c001n06" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/group14.exp b/pengine/test10/group14.exp index 839c85e..4ab5ad2 100644 --- a/pengine/test10/group14.exp +++ b/pengine/test10/group14.exp @@ -1,22 +1,22 @@ - + - + - + - + @@ -24,118 +24,105 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - diff --git a/pengine/test10/group14.summary b/pengine/test10/group14.summary index f7a5d7d..0c4f6f8 100644 --- a/pengine/test10/group14.summary +++ b/pengine/test10/group14.summary @@ -56,7 +56,6 @@ Executing cluster transition: * Pseudo action: group-1_stop_0 * Resource action: r192.168.100.181 stop on c001n06 * Pseudo action: DoFencing_start_0 - * Pseudo action: all_stopped * Pseudo action: group-1_stopped_0 * Pseudo action: group-1_start_0 * Resource action: child_DoFencing:0 start on c001n06 diff --git a/pengine/test10/group15.exp b/pengine/test10/group15.exp index f8344f5..4a59980 100644 --- a/pengine/test10/group15.exp +++ b/pengine/test10/group15.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,28 +55,28 @@ - + - + - + - + - + - + @@ -84,26 +84,26 @@ - + - + - + - + - + @@ -112,7 +112,7 @@ - + @@ -121,29 +121,29 @@ - + - + - + - + - + - + @@ -152,7 +152,7 @@ - + @@ -161,29 +161,29 @@ - + - + - + - + - + - + @@ -192,7 +192,7 @@ - + diff --git a/pengine/test10/group2.exp b/pengine/test10/group2.exp index 9c9cb65..ea0926c 100644 --- a/pengine/test10/group2.exp +++ b/pengine/test10/group2.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,59 +35,59 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -96,7 +96,7 @@ - + @@ -105,29 +105,29 @@ - + - + - + - + - + - + @@ -136,7 +136,7 @@ - + @@ -145,29 +145,29 @@ - + - + - + - + - + - + @@ -176,7 +176,7 @@ - + @@ -185,26 +185,26 @@ - + - + - + - + - + @@ -213,7 +213,7 @@ - + diff --git a/pengine/test10/group3.exp b/pengine/test10/group3.exp index c78ebae..175802c 100644 --- a/pengine/test10/group3.exp +++ b/pengine/test10/group3.exp @@ -1,28 +1,28 @@ - + - + - + - + - + - + @@ -30,26 +30,26 @@ - + - + - + - + - + @@ -58,7 +58,7 @@ - + @@ -67,29 +67,29 @@ - + - + - + - + - + - + @@ -98,7 +98,7 @@ - + @@ -107,29 +107,29 @@ - + - + - + - + - + - + @@ -138,7 +138,7 @@ - + @@ -147,59 +147,59 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -208,7 +208,7 @@ - + @@ -217,29 +217,29 @@ - + - + - + - + - + - + @@ -248,7 +248,7 @@ - + @@ -257,29 +257,29 @@ - + - + - + - + - + - + @@ -288,7 +288,7 @@ - + diff --git a/pengine/test10/group4.exp b/pengine/test10/group4.exp index 2f4f9ff..a720782 100644 --- a/pengine/test10/group4.exp +++ b/pengine/test10/group4.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/pengine/test10/group5.dot b/pengine/test10/group5.dot index e17a7f7..6f524bd 100644 --- a/pengine/test10/group5.dot +++ b/pengine/test10/group5.dot @@ -1,11 +1,9 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc1_monitor_0 node2" -> "child_rsc1_start_0 node2" [ style = bold] "child_rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1_start_0 node2" -> "child_rsc2_start_0 node2" [ style = bold] "child_rsc1_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"child_rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1_stop_0 node1" -> "child_rsc1_start_0 node2" [ style = bold] "child_rsc1_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] @@ -14,7 +12,6 @@ "child_rsc2_start_0 node2" -> "child_rsc3_start_0 node2" [ style = bold] "child_rsc2_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"child_rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc2_stop_0 node1" -> "child_rsc1_stop_0 node1" [ style = bold] "child_rsc2_stop_0 node1" -> "child_rsc2_start_0 node2" [ style = bold] "child_rsc2_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] @@ -23,7 +20,6 @@ "child_rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc3_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"child_rsc3_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc3_stop_0 node1" -> "child_rsc2_stop_0 node1" [ style = bold] "child_rsc3_stop_0 node1" -> "child_rsc3_start_0 node2" [ style = bold] "child_rsc3_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] @@ -32,7 +28,6 @@ "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" -> "rsc2_start_0" [ style = bold] "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" ] "rsc2_running_0" -> "rsc3_start_0 node2" [ style = bold] @@ -53,7 +48,6 @@ "rsc3_monitor_0 node2" -> "rsc3_start_0 node2" [ 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" -> "rsc2_stop_0" [ 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/group5.exp b/pengine/test10/group5.exp index c2c2edc..cb3480d 100644 --- a/pengine/test10/group5.exp +++ b/pengine/test10/group5.exp @@ -1,36 +1,36 @@ - + - + - + - + - + - + @@ -39,111 +39,111 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -152,45 +152,45 @@ - + - + - + - + - + - + - + - + - + @@ -199,42 +199,42 @@ - + - + - + - + - + - + - + - + @@ -243,26 +243,26 @@ - + - + - + - + - + @@ -271,36 +271,11 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/group5.summary b/pengine/test10/group5.summary index 7b158c0..2d9975e 100644 --- a/pengine/test10/group5.summary +++ b/pengine/test10/group5.summary @@ -29,7 +29,6 @@ Executing cluster transition: * Resource action: child_rsc1 stop on node1 * Pseudo action: rsc2_stopped_0 * Resource action: rsc1 stop on node1 - * Pseudo action: all_stopped * Resource action: rsc1 start on node2 * Pseudo action: rsc2_start_0 * Resource action: child_rsc1 start on node2 diff --git a/pengine/test10/group6.dot b/pengine/test10/group6.dot index fb15b68..101763f 100644 --- a/pengine/test10/group6.dot +++ b/pengine/test10/group6.dot @@ -1,11 +1,9 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc1_monitor_0 node2" -> "child_rsc1_start_0 node2" [ style = bold] "child_rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1_start_0 node2" -> "child_rsc2_start_0 node2" [ style = bold] "child_rsc1_start_0 node2" -> "rsc1_running_0" [ style = bold] "child_rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"child_rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1_stop_0 node1" -> "child_rsc1_start_0 node2" [ style = bold] "child_rsc1_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] @@ -14,7 +12,6 @@ "child_rsc2_start_0 node2" -> "child_rsc3_start_0 node2" [ style = bold] "child_rsc2_start_0 node2" -> "rsc1_running_0" [ style = bold] "child_rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"child_rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc2_stop_0 node1" -> "child_rsc1_stop_0 node1" [ style = bold] "child_rsc2_stop_0 node1" -> "child_rsc2_start_0 node2" [ style = bold] "child_rsc2_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] @@ -23,7 +20,6 @@ "child_rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc3_start_0 node2" -> "rsc1_running_0" [ style = bold] "child_rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"child_rsc3_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc3_stop_0 node1" -> "child_rsc2_stop_0 node1" [ style = bold] "child_rsc3_stop_0 node1" -> "child_rsc3_start_0 node2" [ style = bold] "child_rsc3_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] @@ -33,7 +29,6 @@ "child_rsc4_start_0 node2" -> "child_rsc5_start_0 node2" [ style = bold] "child_rsc4_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"child_rsc4_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc4_stop_0 node1" -> "child_rsc4_start_0 node2" [ style = bold] "child_rsc4_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] @@ -42,7 +37,6 @@ "child_rsc5_start_0 node2" -> "child_rsc6_start_0 node2" [ style = bold] "child_rsc5_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc5_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"child_rsc5_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc5_stop_0 node1" -> "child_rsc4_stop_0 node1" [ style = bold] "child_rsc5_stop_0 node1" -> "child_rsc5_start_0 node2" [ style = bold] "child_rsc5_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] @@ -51,7 +45,6 @@ "child_rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc6_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc6_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"child_rsc6_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc6_stop_0 node1" -> "child_rsc5_stop_0 node1" [ style = bold] "child_rsc6_stop_0 node1" -> "child_rsc6_start_0 node2" [ style = bold] "child_rsc6_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] diff --git a/pengine/test10/group6.exp b/pengine/test10/group6.exp index 1b1f906..a74b155 100644 --- a/pengine/test10/group6.exp +++ b/pengine/test10/group6.exp @@ -1,108 +1,108 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -111,45 +111,45 @@ - + - + - + - + - + - + - + - + - + @@ -158,42 +158,42 @@ - + - + - + - + - + - + - + - + @@ -202,28 +202,28 @@ - + - + - + - + - + - + @@ -231,78 +231,78 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -311,45 +311,45 @@ - + - + - + - + - + - + - + - + - + @@ -358,74 +358,46 @@ - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/group6.summary b/pengine/test10/group6.summary index 9d43e66..1bae0a3 100644 --- a/pengine/test10/group6.summary +++ b/pengine/test10/group6.summary @@ -35,7 +35,6 @@ Executing cluster transition: * Resource action: child_rsc3 stop on node1 * Resource action: child_rsc2 stop on node1 * Resource action: child_rsc1 stop on node1 - * Pseudo action: all_stopped * Pseudo action: rsc1_stopped_0 * Pseudo action: rsc1_start_0 * Resource action: child_rsc1 start on node2 diff --git a/pengine/test10/group7.exp b/pengine/test10/group7.exp index def4718..70b1a4f 100644 --- a/pengine/test10/group7.exp +++ b/pengine/test10/group7.exp @@ -1,26 +1,26 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -47,28 +47,28 @@ - + - + - + - + - + - + @@ -76,29 +76,29 @@ - + - + - + - + - + - + @@ -107,7 +107,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -125,32 +125,32 @@ - + - + - + - + - + - + - + @@ -159,7 +159,7 @@ - + @@ -168,7 +168,7 @@ - + @@ -177,32 +177,32 @@ - + - + - + - + - + - + - + @@ -211,7 +211,7 @@ - + @@ -220,7 +220,7 @@ - + @@ -229,62 +229,62 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -293,7 +293,7 @@ - + @@ -302,7 +302,7 @@ - + @@ -311,32 +311,32 @@ - + - + - + - + - + - + - + @@ -345,7 +345,7 @@ - + @@ -354,7 +354,7 @@ - + @@ -363,32 +363,32 @@ - + - + - + - + - + - + - + @@ -397,7 +397,7 @@ - + @@ -406,7 +406,7 @@ - + diff --git a/pengine/test10/group8.exp b/pengine/test10/group8.exp index 3e1fb1a..3d94dce 100644 --- a/pengine/test10/group8.exp +++ b/pengine/test10/group8.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,28 +23,28 @@ - + - + - + - + - + - + @@ -52,23 +52,23 @@ - + - + - + - + @@ -77,26 +77,26 @@ - + - + - + - + - + @@ -105,26 +105,26 @@ - + - + - + - + - + @@ -133,7 +133,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -151,7 +151,7 @@ - + diff --git a/pengine/test10/group9.dot b/pengine/test10/group9.dot index 085f816..d3c3d0e 100644 --- a/pengine/test10/group9.dot +++ b/pengine/test10/group9.dot @@ -1,5 +1,4 @@ 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] @@ -32,7 +31,6 @@ "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" ] @@ -40,7 +38,6 @@ "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] @@ -50,7 +47,6 @@ "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" ] @@ -59,7 +55,6 @@ "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] @@ -68,7 +63,6 @@ "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] diff --git a/pengine/test10/group9.exp b/pengine/test10/group9.exp index 62d2a40..cf026e6 100644 --- a/pengine/test10/group9.exp +++ b/pengine/test10/group9.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,16 +28,16 @@ - + - + - + @@ -45,37 +45,37 @@ - + - + - + - + - + - + - + @@ -84,7 +84,7 @@ - + @@ -94,16 +94,16 @@ - + - + - + @@ -119,51 +119,51 @@ - + - + - + - + - + - + - + - + - + - + @@ -172,7 +172,7 @@ - + @@ -181,19 +181,19 @@ - + - + - + - + @@ -201,59 +201,59 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -263,13 +263,13 @@ - + - + @@ -278,7 +278,7 @@ - + @@ -288,19 +288,19 @@ - + - + - + - + @@ -316,80 +316,55 @@ - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/group9.summary b/pengine/test10/group9.summary index 1ef9d10..06fe484 100644 --- a/pengine/test10/group9.summary +++ b/pengine/test10/group9.summary @@ -40,7 +40,6 @@ Executing cluster transition: * Resource action: rsc4 start on node1 * Resource action: rsc5 start on node1 * Resource action: rsc6 stop on node1 - * Pseudo action: all_stopped * Pseudo action: foo_running_0 * Pseudo action: bar_stopped_0 * Pseudo action: bar_start_0 diff --git a/pengine/test10/guest-node-cleanup.dot b/pengine/test10/guest-node-cleanup.dot index 45fe4be..f00d201 100644 --- a/pengine/test10/guest-node-cleanup.dot +++ b/pengine/test10/guest-node-cleanup.dot @@ -1,6 +1,4 @@ digraph "g" { -"all_stopped" -> "lxc1_start_0 rhel7-1" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "container1_monitor_0 rhel7-1" -> "container1_start_0 rhel7-1" [ style = bold] "container1_monitor_0 rhel7-1" -> "lxc1_stop_0 rhel7-1" [ style = bold] "container1_monitor_0 rhel7-1" [ style=bold color="green" fontcolor="black"] @@ -38,7 +36,6 @@ digraph "g" { "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_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"] @@ -47,18 +44,15 @@ digraph "g" { "lxc1_start_0 rhel7-1" -> "lxc-ms_start_0 lxc1" [ style = bold] "lxc1_start_0 rhel7-1" -> "lxc1_monitor_30000 rhel7-1" [ style = bold] "lxc1_start_0 rhel7-1" [ style=bold color="green" fontcolor="black"] -"lxc1_stop_0 rhel7-1" -> "all_stopped" [ style = bold] "lxc1_stop_0 rhel7-1" -> "lxc1_start_0 rhel7-1" [ style = bold] "lxc1_stop_0 rhel7-1" -> "stonith 'reboot' lxc1" [ style = bold] "lxc1_stop_0 rhel7-1" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' lxc1" -> "container1_start_0 rhel7-1" [ style = bold] "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_promote_0 lxc1" [ style = bold] +"stonith 'reboot' lxc1" -> "lxc-ms_start_0 lxc1" [ style = bold] "stonith 'reboot' lxc1" -> "lxc-ms_stop_0 lxc1" [ style = bold] -"stonith 'reboot' lxc1" -> "stonith_complete" [ style = bold] +"stonith 'reboot' lxc1" -> "lxc1_start_0 rhel7-1" [ style = bold] "stonith 'reboot' lxc1" [ style=bold color="green" fontcolor="orange"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "container1_start_0 rhel7-1" [ style = bold] -"stonith_complete" -> "lxc-ms_promote_0 lxc1" [ style = bold] -"stonith_complete" -> "lxc-ms_start_0 lxc1" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/guest-node-cleanup.exp b/pengine/test10/guest-node-cleanup.exp index 9503a03..110dcdd 100644 --- a/pengine/test10/guest-node-cleanup.exp +++ b/pengine/test10/guest-node-cleanup.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,108 +26,108 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -135,116 +135,116 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -254,7 +254,7 @@ - + @@ -267,13 +267,13 @@ - + - + @@ -282,37 +282,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/guest-node-cleanup.summary b/pengine/test10/guest-node-cleanup.summary index 6378f48..5244a10 100644 --- a/pengine/test10/guest-node-cleanup.summary +++ b/pengine/test10/guest-node-cleanup.summary @@ -23,17 +23,15 @@ Executing cluster transition: * Pseudo action: lxc-ms-master_demote_0 * Resource action: lxc1 stop on rhel7-1 * Pseudo action: stonith-lxc1-reboot on lxc1 - * Pseudo action: stonith_complete * Resource action: container1 start on rhel7-1 * Pseudo action: lxc-ms_demote_0 * Pseudo action: lxc-ms-master_demoted_0 * Pseudo action: lxc-ms-master_stop_0 + * Resource action: lxc1 start on rhel7-1 + * Resource action: lxc1 monitor=30000 on rhel7-1 * Pseudo action: lxc-ms_stop_0 * Pseudo action: lxc-ms-master_stopped_0 * Pseudo action: lxc-ms-master_start_0 - * Pseudo action: all_stopped - * Resource action: lxc1 start on rhel7-1 - * Resource action: lxc1 monitor=30000 on rhel7-1 * Resource action: lxc-ms start on lxc1 * Pseudo action: lxc-ms-master_running_0 * Pseudo action: lxc-ms-master_promote_0 diff --git a/pengine/test10/guest-node-host-dies.dot b/pengine/test10/guest-node-host-dies.dot index c50e071..9cdfaf7 100644 --- a/pengine/test10/guest-node-host-dies.dot +++ b/pengine/test10/guest-node-host-dies.dot @@ -3,17 +3,11 @@ digraph "g" { "Fencing_start_0 rhel7-4" -> "Fencing_monitor_120000 rhel7-4" [ style = bold] "Fencing_start_0 rhel7-4" [ style=bold color="green" fontcolor="black"] "Fencing_stop_0 rhel7-4" -> "Fencing_start_0 rhel7-4" [ style = bold] -"Fencing_stop_0 rhel7-4" -> "all_stopped" [ style = bold] "Fencing_stop_0 rhel7-4" [ style=bold color="green" fontcolor="black"] -"all_stopped" -> "Fencing_start_0 rhel7-4" [ style = bold] -"all_stopped" -> "lxc1_start_0 rhel7-2" [ style = bold] -"all_stopped" -> "lxc2_start_0 rhel7-3" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "container1_start_0 rhel7-2" -> "lxc-ms_promote_0 lxc1" [ style = bold] "container1_start_0 rhel7-2" -> "lxc-ms_start_0 lxc1" [ style = bold] "container1_start_0 rhel7-2" -> "lxc1_start_0 rhel7-2" [ style = bold] "container1_start_0 rhel7-2" [ style=bold color="green" fontcolor="black"] -"container1_stop_0 rhel7-1" -> "all_stopped" [ style = bold] "container1_stop_0 rhel7-1" -> "container1_start_0 rhel7-2" [ style = bold] "container1_stop_0 rhel7-1" -> "rsc_rhel7-1_start_0 rhel7-5" [ style = bold] "container1_stop_0 rhel7-1" -> "stonith 'reboot' lxc1" [ style = bold] @@ -21,7 +15,6 @@ digraph "g" { "container2_start_0 rhel7-3" -> "lxc-ms_start_0 lxc2" [ style = bold] "container2_start_0 rhel7-3" -> "lxc2_start_0 rhel7-3" [ style = bold] "container2_start_0 rhel7-3" [ style=bold color="green" fontcolor="black"] -"container2_stop_0 rhel7-1" -> "all_stopped" [ style = bold] "container2_stop_0 rhel7-1" -> "container2_start_0 rhel7-3" [ style = bold] "container2_stop_0 rhel7-1" -> "rsc_rhel7-1_start_0 rhel7-5" [ style = bold] "container2_stop_0 rhel7-1" -> "stonith 'reboot' lxc2" [ style = bold] @@ -62,11 +55,9 @@ digraph "g" { "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"] @@ -81,7 +72,6 @@ digraph "g" { "lxc1_start_0 rhel7-2" -> "lxc-ms_start_0 lxc1" [ style = bold] "lxc1_start_0 rhel7-2" -> "lxc1_monitor_30000 rhel7-2" [ style = bold] "lxc1_start_0 rhel7-2" [ style=bold color="green" fontcolor="black"] -"lxc1_stop_0 rhel7-1" -> "all_stopped" [ style = bold] "lxc1_stop_0 rhel7-1" -> "container1_stop_0 rhel7-1" [ style = bold] "lxc1_stop_0 rhel7-1" -> "lxc1_start_0 rhel7-2" [ style = bold] "lxc1_stop_0 rhel7-1" [ style=bold color="green" fontcolor="orange"] @@ -96,36 +86,47 @@ digraph "g" { "lxc2_start_0 rhel7-3" -> "lxc-ms_start_0 lxc2" [ style = bold] "lxc2_start_0 rhel7-3" -> "lxc2_monitor_30000 rhel7-3" [ style = bold] "lxc2_start_0 rhel7-3" [ style=bold color="green" fontcolor="black"] -"lxc2_stop_0 rhel7-1" -> "all_stopped" [ style = bold] "lxc2_stop_0 rhel7-1" -> "container2_stop_0 rhel7-1" [ style = bold] "lxc2_stop_0 rhel7-1" -> "lxc2_start_0 rhel7-3" [ style = bold] "lxc2_stop_0 rhel7-1" [ style=bold color="green" fontcolor="orange"] "rsc_rhel7-1_monitor_5000 rhel7-5" [ style=bold color="green" fontcolor="black"] "rsc_rhel7-1_start_0 rhel7-5" -> "rsc_rhel7-1_monitor_5000 rhel7-5" [ style = bold] "rsc_rhel7-1_start_0 rhel7-5" [ style=bold color="green" fontcolor="black"] -"rsc_rhel7-1_stop_0 rhel7-1" -> "all_stopped" [ style = bold] "rsc_rhel7-1_stop_0 rhel7-1" -> "rsc_rhel7-1_start_0 rhel7-5" [ style = bold] "rsc_rhel7-1_stop_0 rhel7-1" [ style=bold color="green" fontcolor="orange"] +"stonith 'reboot' lxc1" -> "Fencing_start_0 rhel7-4" [ style = bold] +"stonith 'reboot' lxc1" -> "container1_start_0 rhel7-2" [ style = bold] +"stonith 'reboot' lxc1" -> "container2_start_0 rhel7-3" [ style = bold] "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_promote_0 lxc1" [ style = bold] +"stonith 'reboot' lxc1" -> "lxc-ms_start_0 lxc1" [ style = bold] +"stonith 'reboot' lxc1" -> "lxc-ms_start_0 lxc2" [ style = bold] "stonith 'reboot' lxc1" -> "lxc-ms_stop_0 lxc1" [ style = bold] -"stonith 'reboot' lxc1" -> "stonith_complete" [ style = bold] +"stonith 'reboot' lxc1" -> "lxc1_start_0 rhel7-2" [ style = bold] +"stonith 'reboot' lxc1" -> "lxc2_start_0 rhel7-3" [ style = bold] +"stonith 'reboot' lxc1" -> "rsc_rhel7-1_start_0 rhel7-5" [ style = bold] "stonith 'reboot' lxc1" [ style=bold color="green" fontcolor="orange"] +"stonith 'reboot' lxc2" -> "Fencing_start_0 rhel7-4" [ style = bold] +"stonith 'reboot' lxc2" -> "container1_start_0 rhel7-2" [ style = bold] +"stonith 'reboot' lxc2" -> "container2_start_0 rhel7-3" [ style = bold] "stonith 'reboot' lxc2" -> "lxc-ms-master_stop_0" [ style = bold] +"stonith 'reboot' lxc2" -> "lxc-ms_promote_0 lxc1" [ style = bold] +"stonith 'reboot' lxc2" -> "lxc-ms_start_0 lxc1" [ style = bold] +"stonith 'reboot' lxc2" -> "lxc-ms_start_0 lxc2" [ style = bold] "stonith 'reboot' lxc2" -> "lxc-ms_stop_0 lxc2" [ style = bold] -"stonith 'reboot' lxc2" -> "stonith_complete" [ style = bold] +"stonith 'reboot' lxc2" -> "lxc1_start_0 rhel7-2" [ style = bold] +"stonith 'reboot' lxc2" -> "lxc2_start_0 rhel7-3" [ style = bold] +"stonith 'reboot' lxc2" -> "rsc_rhel7-1_start_0 rhel7-5" [ style = bold] "stonith 'reboot' lxc2" [ style=bold color="green" fontcolor="orange"] +"stonith 'reboot' rhel7-1" -> "container1_start_0 rhel7-2" [ style = bold] "stonith 'reboot' rhel7-1" -> "container1_stop_0 rhel7-1" [ style = bold] +"stonith 'reboot' rhel7-1" -> "container2_start_0 rhel7-3" [ style = bold] "stonith 'reboot' rhel7-1" -> "container2_stop_0 rhel7-1" [ style = bold] +"stonith 'reboot' rhel7-1" -> "lxc-ms_promote_0 lxc1" [ style = bold] +"stonith 'reboot' rhel7-1" -> "lxc-ms_start_0 lxc1" [ style = bold] +"stonith 'reboot' rhel7-1" -> "lxc-ms_start_0 lxc2" [ style = bold] +"stonith 'reboot' rhel7-1" -> "rsc_rhel7-1_start_0 rhel7-5" [ style = bold] "stonith 'reboot' rhel7-1" -> "rsc_rhel7-1_stop_0 rhel7-1" [ style = bold] -"stonith 'reboot' rhel7-1" -> "stonith_complete" [ style = bold] "stonith 'reboot' rhel7-1" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "container1_start_0 rhel7-2" [ style = bold] -"stonith_complete" -> "container2_start_0 rhel7-3" [ 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" -> "rsc_rhel7-1_start_0 rhel7-5" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/guest-node-host-dies.exp b/pengine/test10/guest-node-host-dies.exp index b5a34ea..4974c2a 100644 --- a/pengine/test10/guest-node-host-dies.exp +++ b/pengine/test10/guest-node-host-dies.exp @@ -1,7 +1,7 @@ - + @@ -10,17 +10,20 @@ - + - + - + + + + @@ -33,48 +36,54 @@ - + - + - + - + - + + + + - + - + - + + + + - + @@ -86,23 +95,29 @@ - + - + + + + - + + + + - + @@ -111,29 +126,35 @@ - + - + - + + + + - + + + + - + @@ -142,170 +163,188 @@ - + - + - + - + - + - + - + - + + + + + + + - + - + - + - + - + - + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + - + - + - + + + + - + - + - + - + - + - + - + @@ -313,147 +352,150 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + @@ -461,7 +503,7 @@ - + @@ -470,7 +512,7 @@ - + @@ -479,7 +521,7 @@ - + @@ -488,48 +530,51 @@ - + - + - + - + + + + - + - + - + - + - + - + @@ -537,7 +582,7 @@ - + @@ -546,7 +591,7 @@ - + @@ -555,7 +600,7 @@ - + @@ -564,7 +609,7 @@ - + @@ -573,13 +618,13 @@ - + - + @@ -588,66 +633,12 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/guest-node-host-dies.summary b/pengine/test10/guest-node-host-dies.summary index 9813d2b..591b857 100644 --- a/pengine/test10/guest-node-host-dies.summary +++ b/pengine/test10/guest-node-host-dies.summary @@ -40,28 +40,26 @@ Executing cluster transition: * Pseudo action: container2_stop_0 * Pseudo action: stonith-lxc2-reboot on lxc2 * Pseudo action: stonith-lxc1-reboot on lxc1 - * Pseudo action: stonith_complete + * Resource action: Fencing start on rhel7-4 + * Resource action: Fencing monitor=120000 on rhel7-4 * Resource action: rsc_rhel7-1 start on rhel7-5 * Resource action: container1 start on rhel7-2 * Resource action: container2 start on rhel7-3 * Pseudo action: lxc-ms_demote_0 * Pseudo action: lxc-ms-master_demoted_0 * Pseudo action: lxc-ms-master_stop_0 + * Resource action: lxc1 start on rhel7-2 + * Resource action: lxc2 start on rhel7-3 * Resource action: rsc_rhel7-1 monitor=5000 on rhel7-5 * Pseudo action: lxc-ms_stop_0 * Pseudo action: lxc-ms_stop_0 * Pseudo action: lxc-ms-master_stopped_0 * Pseudo action: lxc-ms-master_start_0 - * Pseudo action: all_stopped - * Resource action: Fencing start on rhel7-4 - * Resource action: Fencing monitor=120000 on rhel7-4 - * Resource action: lxc1 start on rhel7-2 - * Resource action: lxc2 start on rhel7-3 + * Resource action: lxc1 monitor=30000 on rhel7-2 + * Resource action: lxc2 monitor=30000 on rhel7-3 * Resource action: lxc-ms start on lxc1 * Resource action: lxc-ms start on lxc2 * Pseudo action: lxc-ms-master_running_0 - * Resource action: lxc1 monitor=30000 on rhel7-2 - * Resource action: lxc2 monitor=30000 on rhel7-3 * Resource action: lxc-ms monitor=10000 on lxc2 * Pseudo action: lxc-ms-master_promote_0 * Resource action: lxc-ms promote on lxc1 diff --git a/pengine/test10/honor_stonith_rsc_order1.exp b/pengine/test10/honor_stonith_rsc_order1.exp index 081a50f..84774cd 100644 --- a/pengine/test10/honor_stonith_rsc_order1.exp +++ b/pengine/test10/honor_stonith_rsc_order1.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,52 +23,52 @@ - + - + - + - + - + - + - + - + - + - + @@ -76,23 +76,23 @@ - + - + - + - + @@ -101,20 +101,20 @@ - + - + - + diff --git a/pengine/test10/honor_stonith_rsc_order2.exp b/pengine/test10/honor_stonith_rsc_order2.exp index 15e798f..5bbd3aa 100644 --- a/pengine/test10/honor_stonith_rsc_order2.exp +++ b/pengine/test10/honor_stonith_rsc_order2.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,58 +23,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -82,23 +82,23 @@ - + - + - + - + @@ -107,26 +107,26 @@ - + - + - + - + - + @@ -135,26 +135,26 @@ - + - + - + - + - + @@ -163,20 +163,20 @@ - + - + - + diff --git a/pengine/test10/honor_stonith_rsc_order3.exp b/pengine/test10/honor_stonith_rsc_order3.exp index c59ccf1..5990381 100644 --- a/pengine/test10/honor_stonith_rsc_order3.exp +++ b/pengine/test10/honor_stonith_rsc_order3.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,83 +23,83 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -108,23 +108,23 @@ - + - + - + - + @@ -133,23 +133,23 @@ - + - + - + - + @@ -158,53 +158,53 @@ - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/honor_stonith_rsc_order4.exp b/pengine/test10/honor_stonith_rsc_order4.exp index a42ec95..35ddb3e 100644 --- a/pengine/test10/honor_stonith_rsc_order4.exp +++ b/pengine/test10/honor_stonith_rsc_order4.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,20 +26,20 @@ - + - + - + @@ -48,20 +48,20 @@ - + - + - + diff --git a/pengine/test10/ignore_stonith_rsc_order1.exp b/pengine/test10/ignore_stonith_rsc_order1.exp index c45a687..9063bc6 100644 --- a/pengine/test10/ignore_stonith_rsc_order1.exp +++ b/pengine/test10/ignore_stonith_rsc_order1.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,20 +26,20 @@ - + - + - + diff --git a/pengine/test10/ignore_stonith_rsc_order2.exp b/pengine/test10/ignore_stonith_rsc_order2.exp index 76054b8..d942d53 100644 --- a/pengine/test10/ignore_stonith_rsc_order2.exp +++ b/pengine/test10/ignore_stonith_rsc_order2.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,25 +26,25 @@ - + - + - + - + - + @@ -52,23 +52,23 @@ - + - + - + - + @@ -77,26 +77,26 @@ - + - + - + - + - + diff --git a/pengine/test10/ignore_stonith_rsc_order3.exp b/pengine/test10/ignore_stonith_rsc_order3.exp index 922498e..111e656 100644 --- a/pengine/test10/ignore_stonith_rsc_order3.exp +++ b/pengine/test10/ignore_stonith_rsc_order3.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,55 +23,55 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -79,23 +79,23 @@ - + - + - + - + @@ -104,26 +104,26 @@ - + - + - + - + - + diff --git a/pengine/test10/ignore_stonith_rsc_order4.exp b/pengine/test10/ignore_stonith_rsc_order4.exp index 7439950..b3ebda1 100644 --- a/pengine/test10/ignore_stonith_rsc_order4.exp +++ b/pengine/test10/ignore_stonith_rsc_order4.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,80 +23,80 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -105,23 +105,23 @@ - + - + - + - + @@ -130,31 +130,31 @@ - + - + - + - + - + - + diff --git a/pengine/test10/inc0.exp b/pengine/test10/inc0.exp index 5d90858..b10e195 100644 --- a/pengine/test10/inc0.exp +++ b/pengine/test10/inc0.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,7 +23,7 @@ - + @@ -32,20 +32,20 @@ - + - + - + @@ -54,7 +54,7 @@ - + @@ -63,20 +63,20 @@ - + - + - + @@ -85,7 +85,7 @@ - + @@ -94,20 +94,20 @@ - + - + - + @@ -116,7 +116,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -134,7 +134,7 @@ - + @@ -143,64 +143,64 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/inc1.exp b/pengine/test10/inc1.exp index 45b9cb5..5cc60dc 100644 --- a/pengine/test10/inc1.exp +++ b/pengine/test10/inc1.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,20 +35,20 @@ - + - + - + @@ -57,7 +57,7 @@ - + @@ -66,20 +66,20 @@ - + - + - + @@ -88,7 +88,7 @@ - + @@ -97,20 +97,20 @@ - + - + - + @@ -119,7 +119,7 @@ - + @@ -128,20 +128,20 @@ - + - + - + @@ -150,7 +150,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -168,7 +168,7 @@ - + @@ -177,92 +177,92 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -271,7 +271,7 @@ - + diff --git a/pengine/test10/inc10.dot b/pengine/test10/inc10.dot index 7490acd..2a17d3c 100644 --- a/pengine/test10/inc10.dot +++ b/pengine/test10/inc10.dot @@ -3,11 +3,8 @@ "DoFencing_stop_0" -> "child_DoFencing:2_stop_0 xen-2" [ 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:2_stop_0 xen-2" -> "DoFencing_stopped_0" [ style = bold] -"child_DoFencing:2_stop_0 xen-2" -> "all_stopped" [ style = bold] "child_DoFencing:2_stop_0 xen-2" [ style=bold color="green" fontcolor="black" ] -"ocfs2-clone_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "ocfs2-clone_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "ocfs2-clone_confirmed-pre_notify_stop_0" -> "ocfs2-clone_post_notify_stopped_0" [ style = bold] "ocfs2-clone_confirmed-pre_notify_stop_0" -> "ocfs2-clone_stop_0" [ style = bold] @@ -38,7 +35,6 @@ "ocfs2:1_pre_notify_stop_0 xen-2" [ style=bold color="green" fontcolor="black"] "ocfs2:1_pre_notify_stop_0 xen-3" -> "ocfs2-clone_confirmed-pre_notify_stop_0" [ style = bold] "ocfs2:1_pre_notify_stop_0 xen-3" [ style=bold color="green" fontcolor="black" ] -"ocfs2:1_stop_0 xen-2" -> "all_stopped" [ style = bold] "ocfs2:1_stop_0 xen-2" -> "ocfs2-clone_stopped_0" [ style = bold] "ocfs2:1_stop_0 xen-2" [ style=bold color="green" fontcolor="black"] "ocfs2:3_post_notify_stopped_0 xen-1" -> "ocfs2-clone_confirmed-post_notify_stopped_0" [ style = bold] diff --git a/pengine/test10/inc10.exp b/pengine/test10/inc10.exp index 742d124..c6931b7 100644 --- a/pengine/test10/inc10.exp +++ b/pengine/test10/inc10.exp @@ -1,35 +1,35 @@ - + - + - + - + - + - + @@ -37,171 +37,171 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -209,46 +209,28 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/inc10.summary b/pengine/test10/inc10.summary index 053a9ba..b6bdaf0 100644 --- a/pengine/test10/inc10.summary +++ b/pengine/test10/inc10.summary @@ -30,7 +30,6 @@ Executing cluster transition: * Resource action: ocfs2:3 notify on xen-1 * Resource action: ocfs2:0 notify on xen-4 * Pseudo action: ocfs2-clone_confirmed-post_notify_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Node xen-2 (e3aa8547-3d52-47df-a8a3-ca94538a5282): standby diff --git a/pengine/test10/inc11.exp b/pengine/test10/inc11.exp index 508ad5c..924747d 100644 --- a/pengine/test10/inc11.exp +++ b/pengine/test10/inc11.exp @@ -1,26 +1,26 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -47,20 +47,20 @@ - + - + - + @@ -69,7 +69,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -87,36 +87,36 @@ - + - + - + - + - + - + @@ -125,7 +125,7 @@ - + @@ -134,7 +134,7 @@ - + @@ -143,70 +143,70 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/inc12.dot b/pengine/test10/inc12.dot index 3693998..f48751a 100644 --- a/pengine/test10/inc12.dot +++ b/pengine/test10/inc12.dot @@ -7,25 +7,19 @@ "DoFencing_stop_0" -> "child_DoFencing:5_stop_0 c001n07" [ 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_stop_0 c001n02" -> "DoFencing_stopped_0" [ style = bold] -"child_DoFencing:1_stop_0 c001n02" -> "all_stopped" [ style = bold] "child_DoFencing:1_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "child_DoFencing:1_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_stop_0 c001n04" -> "DoFencing_stopped_0" [ style = bold] -"child_DoFencing:2_stop_0 c001n04" -> "all_stopped" [ style = bold] "child_DoFencing:2_stop_0 c001n04" -> "do_shutdown c001n04" [ style = bold] "child_DoFencing:2_stop_0 c001n04" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:3_stop_0 c001n05" -> "DoFencing_stopped_0" [ style = bold] -"child_DoFencing:3_stop_0 c001n05" -> "all_stopped" [ style = bold] "child_DoFencing:3_stop_0 c001n05" -> "do_shutdown c001n05" [ style = bold] "child_DoFencing:3_stop_0 c001n05" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:4_stop_0 c001n06" -> "DoFencing_stopped_0" [ style = bold] -"child_DoFencing:4_stop_0 c001n06" -> "all_stopped" [ style = bold] "child_DoFencing:4_stop_0 c001n06" -> "do_shutdown c001n06" [ style = bold] "child_DoFencing:4_stop_0 c001n06" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:5_stop_0 c001n07" -> "DoFencing_stopped_0" [ style = bold] -"child_DoFencing:5_stop_0 c001n07" -> "all_stopped" [ style = bold] "child_DoFencing:5_stop_0 c001n07" -> "do_shutdown c001n07" [ style = bold] "child_DoFencing:5_stop_0 c001n07" [ style=bold color="green" fontcolor="black" ] "do_shutdown c001n02" -> "do_shutdown c001n03" [ style = bold] @@ -45,12 +39,10 @@ "group-1_stop_0" -> "ocf_192.168.100.183_stop_0 c001n02" [ style = bold] "group-1_stop_0" [ style=bold color="green" fontcolor="orange" ] "group-1_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"heartbeat_192.168.100.182_stop_0 c001n02" -> "all_stopped" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n02" -> "group-1_stopped_0" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n02" -> "ocf_192.168.100.181_stop_0 c001n02" [ style = bold] "heartbeat_192.168.100.182_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] -"lsb_dummy_stop_0 c001n04" -> "all_stopped" [ style = bold] "lsb_dummy_stop_0 c001n04" -> "do_shutdown c001n04" [ style = bold] "lsb_dummy_stop_0 c001n04" [ style=bold color="green" fontcolor="black" ] "master_rsc_1_stop_0" -> "master_rsc_1_stopped_0" [ style = bold] @@ -66,71 +58,53 @@ "master_rsc_1_stop_0" -> "ocf_msdummy:9_stop_0 c001n07" [ 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_stop_0 c001n02" -> "all_stopped" [ style = bold] "ocf_192.168.100.181_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "ocf_192.168.100.181_stop_0 c001n02" -> "group-1_stopped_0" [ style = bold] "ocf_192.168.100.181_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] -"ocf_192.168.100.183_stop_0 c001n02" -> "all_stopped" [ style = bold] "ocf_192.168.100.183_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "ocf_192.168.100.183_stop_0 c001n02" -> "group-1_stopped_0" [ style = bold] "ocf_192.168.100.183_stop_0 c001n02" -> "heartbeat_192.168.100.182_stop_0 c001n02" [ style = bold] "ocf_192.168.100.183_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] -"ocf_msdummy:10_stop_0 c001n02" -> "all_stopped" [ style = bold] "ocf_msdummy:10_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "ocf_msdummy:10_stop_0 c001n02" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:10_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] -"ocf_msdummy:11_stop_0 c001n02" -> "all_stopped" [ style = bold] "ocf_msdummy:11_stop_0 c001n02" -> "do_shutdown c001n02" [ style = bold] "ocf_msdummy:11_stop_0 c001n02" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:11_stop_0 c001n02" [ style=bold color="green" fontcolor="black" ] -"ocf_msdummy:2_stop_0 c001n04" -> "all_stopped" [ style = bold] "ocf_msdummy:2_stop_0 c001n04" -> "do_shutdown c001n04" [ style = bold] "ocf_msdummy:2_stop_0 c001n04" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:2_stop_0 c001n04" [ style=bold color="green" fontcolor="black" ] -"ocf_msdummy:3_stop_0 c001n04" -> "all_stopped" [ style = bold] "ocf_msdummy:3_stop_0 c001n04" -> "do_shutdown c001n04" [ style = bold] "ocf_msdummy:3_stop_0 c001n04" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:3_stop_0 c001n04" [ style=bold color="green" fontcolor="black" ] -"ocf_msdummy:4_stop_0 c001n05" -> "all_stopped" [ style = bold] "ocf_msdummy:4_stop_0 c001n05" -> "do_shutdown c001n05" [ style = bold] "ocf_msdummy:4_stop_0 c001n05" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:4_stop_0 c001n05" [ style=bold color="green" fontcolor="black" ] -"ocf_msdummy:5_stop_0 c001n05" -> "all_stopped" [ style = bold] "ocf_msdummy:5_stop_0 c001n05" -> "do_shutdown c001n05" [ style = bold] "ocf_msdummy:5_stop_0 c001n05" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:5_stop_0 c001n05" [ style=bold color="green" fontcolor="black" ] -"ocf_msdummy:6_stop_0 c001n06" -> "all_stopped" [ style = bold] "ocf_msdummy:6_stop_0 c001n06" -> "do_shutdown c001n06" [ style = bold] "ocf_msdummy:6_stop_0 c001n06" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:6_stop_0 c001n06" [ style=bold color="green" fontcolor="black" ] -"ocf_msdummy:7_stop_0 c001n06" -> "all_stopped" [ style = bold] "ocf_msdummy:7_stop_0 c001n06" -> "do_shutdown c001n06" [ style = bold] "ocf_msdummy:7_stop_0 c001n06" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:7_stop_0 c001n06" [ style=bold color="green" fontcolor="black" ] -"ocf_msdummy:8_stop_0 c001n07" -> "all_stopped" [ style = bold] "ocf_msdummy:8_stop_0 c001n07" -> "do_shutdown c001n07" [ style = bold] "ocf_msdummy:8_stop_0 c001n07" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:8_stop_0 c001n07" [ style=bold color="green" fontcolor="black" ] -"ocf_msdummy:9_stop_0 c001n07" -> "all_stopped" [ style = bold] "ocf_msdummy:9_stop_0 c001n07" -> "do_shutdown c001n07" [ style = bold] "ocf_msdummy:9_stop_0 c001n07" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:9_stop_0 c001n07" [ 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" [ style=bold color="green" fontcolor="black" ] -"rsc_c001n03_stop_0 c001n05" -> "all_stopped" [ style = bold] "rsc_c001n03_stop_0 c001n05" -> "do_shutdown c001n05" [ style = bold] "rsc_c001n03_stop_0 c001n05" [ style=bold color="green" fontcolor="black" ] -"rsc_c001n04_stop_0 c001n04" -> "all_stopped" [ style = bold] "rsc_c001n04_stop_0 c001n04" -> "do_shutdown c001n04" [ style = bold] "rsc_c001n04_stop_0 c001n04" [ style=bold color="green" fontcolor="black" ] -"rsc_c001n05_stop_0 c001n05" -> "all_stopped" [ style = bold] "rsc_c001n05_stop_0 c001n05" -> "do_shutdown c001n05" [ style = bold] "rsc_c001n05_stop_0 c001n05" [ style=bold color="green" fontcolor="black" ] -"rsc_c001n06_stop_0 c001n06" -> "all_stopped" [ style = bold] "rsc_c001n06_stop_0 c001n06" -> "do_shutdown c001n06" [ style = bold] "rsc_c001n06_stop_0 c001n06" [ style=bold color="green" fontcolor="black" ] -"rsc_c001n07_stop_0 c001n07" -> "all_stopped" [ style = bold] "rsc_c001n07_stop_0 c001n07" -> "do_shutdown c001n07" [ style = bold] "rsc_c001n07_stop_0 c001n07" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/inc12.exp b/pengine/test10/inc12.exp index 93de58d..1cb0f2a 100644 --- a/pengine/test10/inc12.exp +++ b/pengine/test10/inc12.exp @@ -1,28 +1,28 @@ - + - + - + - + - + - + @@ -30,23 +30,23 @@ - + - + - + - + @@ -55,29 +55,29 @@ - + - + - + - + - + @@ -86,7 +86,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -113,7 +113,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -131,7 +131,7 @@ - + @@ -140,99 +140,99 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -240,179 +240,179 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -420,7 +420,7 @@ - + @@ -429,22 +429,22 @@ - + - + - + - + - + @@ -453,22 +453,22 @@ - + - + - + - + - + @@ -477,25 +477,25 @@ - + - + - + - + - + - + @@ -504,25 +504,25 @@ - + - + - + - + - + - + @@ -531,25 +531,25 @@ - + - + - + - + - + - + @@ -558,109 +558,25 @@ - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/inc12.summary b/pengine/test10/inc12.summary index 97a834f..f86da9a 100644 --- a/pengine/test10/inc12.summary +++ b/pengine/test10/inc12.summary @@ -100,7 +100,6 @@ Executing cluster transition: * Cluster action: do_shutdown on c001n04 * Resource action: ocf_192.168.100.181 stop on c001n02 * Cluster action: do_shutdown on c001n02 - * Pseudo action: all_stopped * Pseudo action: group-1_stopped_0 * Cluster action: do_shutdown on c001n03 diff --git a/pengine/test10/inc2.dot b/pengine/test10/inc2.dot index 34d55a8..456f21f 100644 --- a/pengine/test10/inc2.dot +++ b/pengine/test10/inc2.dot @@ -1,5 +1,4 @@ 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] @@ -8,7 +7,6 @@ "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" ] @@ -16,13 +14,11 @@ "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" -> "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" ] diff --git a/pengine/test10/inc2.exp b/pengine/test10/inc2.exp index 51bef01..19b9b1a 100644 --- a/pengine/test10/inc2.exp +++ b/pengine/test10/inc2.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,36 +19,36 @@ - + - + - + - + - + - + @@ -57,36 +57,36 @@ - + - + - + - + - + - + @@ -95,20 +95,20 @@ - + - + - + @@ -117,28 +117,28 @@ - + - + - + - + - + - + @@ -146,64 +146,46 @@ - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/inc2.summary b/pengine/test10/inc2.summary index b3049be..221d008 100644 --- a/pengine/test10/inc2.summary +++ b/pengine/test10/inc2.summary @@ -26,7 +26,6 @@ Executing cluster transition: * Resource action: child_rsc1:4 stop on node1 * Pseudo action: rsc1_stopped_0 * Pseudo action: rsc1_start_0 - * Pseudo action: all_stopped * Resource action: child_rsc1:2 start on node2 * Resource action: child_rsc1:3 start on node2 * Pseudo action: rsc1_running_0 diff --git a/pengine/test10/inc3.dot b/pengine/test10/inc3.dot index e04a654..8e5b063 100644 --- a/pengine/test10/inc3.dot +++ b/pengine/test10/inc3.dot @@ -1,5 +1,4 @@ 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] @@ -8,7 +7,6 @@ "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" ] @@ -16,13 +14,11 @@ "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" -> "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] @@ -35,7 +31,6 @@ "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" ] @@ -43,7 +38,6 @@ "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" ] diff --git a/pengine/test10/inc3.exp b/pengine/test10/inc3.exp index baa921f..55f01b6 100644 --- a/pengine/test10/inc3.exp +++ b/pengine/test10/inc3.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,36 +19,36 @@ - + - + - + - + - + - + @@ -57,36 +57,36 @@ - + - + - + - + - + - + @@ -95,20 +95,20 @@ - + - + - + @@ -117,85 +117,85 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -204,7 +204,7 @@ - + @@ -213,7 +213,7 @@ - + @@ -222,36 +222,36 @@ - + - + - + - + - + - + @@ -260,36 +260,36 @@ - + - + - + - + - + - + @@ -298,25 +298,25 @@ - + - + - + - + - + @@ -324,73 +324,49 @@ - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/inc3.summary b/pengine/test10/inc3.summary index 5ceab72..cf80d83 100644 --- a/pengine/test10/inc3.summary +++ b/pengine/test10/inc3.summary @@ -43,7 +43,6 @@ Executing cluster transition: * Resource action: child_rsc1:4 stop on node1 * Pseudo action: rsc1_stopped_0 * Pseudo action: rsc1_start_0 - * Pseudo action: all_stopped * Resource action: child_rsc1:2 start on node2 * Resource action: child_rsc1:3 start on node2 * Pseudo action: rsc1_running_0 diff --git a/pengine/test10/inc4.dot b/pengine/test10/inc4.dot index 9f70f8a..250052f 100644 --- a/pengine/test10/inc4.dot +++ b/pengine/test10/inc4.dot @@ -1,5 +1,4 @@ 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] @@ -9,7 +8,6 @@ "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" ] @@ -17,14 +15,12 @@ "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" -> "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" ] @@ -39,7 +35,6 @@ "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" ] @@ -47,7 +42,6 @@ "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] diff --git a/pengine/test10/inc4.exp b/pengine/test10/inc4.exp index b7c160e..ccc77d4 100644 --- a/pengine/test10/inc4.exp +++ b/pengine/test10/inc4.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,39 +19,39 @@ - + - + - + - + - + - + - + @@ -60,42 +60,42 @@ - + - + - + - + - + - + - + - + @@ -104,20 +104,20 @@ - + - + - + @@ -126,85 +126,85 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -213,7 +213,7 @@ - + @@ -222,7 +222,7 @@ - + @@ -231,39 +231,39 @@ - + - + - + - + - + - + - + @@ -272,39 +272,39 @@ - + - + - + - + - + - + - + @@ -313,25 +313,25 @@ - + - + - + - + - + @@ -339,73 +339,49 @@ - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/inc4.summary b/pengine/test10/inc4.summary index 3b3f10b..7f85670 100644 --- a/pengine/test10/inc4.summary +++ b/pengine/test10/inc4.summary @@ -43,7 +43,6 @@ Executing cluster transition: * Resource action: child_rsc1:2 stop on node1 * Pseudo action: rsc1_stopped_0 * Pseudo action: rsc1_start_0 - * Pseudo action: all_stopped * Resource action: child_rsc1:2 start on node2 * Resource action: child_rsc1:3 start on node2 * Pseudo action: rsc1_running_0 diff --git a/pengine/test10/inc5.dot b/pengine/test10/inc5.dot index c9fa119..dad7dd3 100644 --- a/pengine/test10/inc5.dot +++ b/pengine/test10/inc5.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc1:0_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc1:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc1:2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] @@ -10,7 +9,6 @@ "child_rsc2:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc2:1_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc2:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"child_rsc2:1_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc2:1_stop_0 node1" -> "child_rsc2:1_start_0 node2" [ style = bold] "child_rsc2:1_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] @@ -28,7 +26,6 @@ "child_rsc4:1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc4:1_start_0 node2" -> "rsc4_running_0" [ style = bold] "child_rsc4:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"child_rsc4:1_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc4:1_stop_0 node1" -> "child_rsc4:1_start_0 node2" [ style = bold] "child_rsc4:1_stop_0 node1" -> "rsc4_stopped_0" [ style = bold] "child_rsc4:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] @@ -42,7 +39,6 @@ "child_rsc5:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc5:1_start_0 node1" -> "rsc5_running_0" [ style = bold] "child_rsc5:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"child_rsc5:1_stop_0 node2" -> "all_stopped" [ style = bold] "child_rsc5:1_stop_0 node2" -> "child_rsc5:1_start_0 node1" [ style = bold] "child_rsc5:1_stop_0 node2" -> "rsc5_stopped_0" [ style = bold] "child_rsc5:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] @@ -60,7 +56,6 @@ "child_rsc7:1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc7:1_start_0 node1" -> "rsc7_running_0" [ style = bold] "child_rsc7:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"child_rsc7:1_stop_0 node2" -> "all_stopped" [ style = bold] "child_rsc7:1_stop_0 node2" -> "child_rsc7:1_start_0 node1" [ style = bold] "child_rsc7:1_stop_0 node2" -> "rsc7_stopped_0" [ style = bold] "child_rsc7:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/inc5.exp b/pengine/test10/inc5.exp index 89e064f..0d19405 100644 --- a/pengine/test10/inc5.exp +++ b/pengine/test10/inc5.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,36 +46,36 @@ - + - + - + - + - + - + @@ -84,7 +84,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -102,22 +102,22 @@ - + - + - + - + @@ -125,46 +125,46 @@ - + - + - + - + - + - + - + - + - + - + @@ -173,7 +173,7 @@ - + @@ -182,7 +182,7 @@ - + @@ -191,7 +191,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -209,36 +209,36 @@ - + - + - + - + - + - + @@ -247,7 +247,7 @@ - + @@ -256,7 +256,7 @@ - + @@ -265,22 +265,22 @@ - + - + - + - + @@ -288,46 +288,46 @@ - + - + - + - + - + - + - + - + - + - + @@ -336,36 +336,36 @@ - + - + - + - + - + - + @@ -374,7 +374,7 @@ - + @@ -383,7 +383,7 @@ - + @@ -392,22 +392,22 @@ - + - + - + - + @@ -415,46 +415,46 @@ - + - + - + - + - + - + - + - + - + - + @@ -463,7 +463,7 @@ - + @@ -472,7 +472,7 @@ - + @@ -481,7 +481,7 @@ - + @@ -490,7 +490,7 @@ - + @@ -499,36 +499,36 @@ - + - + - + - + - + - + @@ -537,7 +537,7 @@ - + @@ -546,7 +546,7 @@ - + @@ -555,22 +555,22 @@ - + - + - + - + @@ -578,46 +578,46 @@ - + - + - + - + - + - + - + - + - + - + @@ -626,7 +626,7 @@ - + @@ -635,7 +635,7 @@ - + @@ -644,33 +644,11 @@ - + - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/inc5.summary b/pengine/test10/inc5.summary index 93e0d8e..c3c859e 100644 --- a/pengine/test10/inc5.summary +++ b/pengine/test10/inc5.summary @@ -90,7 +90,6 @@ Executing cluster transition: * Resource action: child_rsc7:1 stop on node2 * Pseudo action: rsc7_stopped_0 * Pseudo action: rsc7_start_0 - * Pseudo action: all_stopped * Resource action: child_rsc2:1 start on node2 * Pseudo action: rsc2_running_0 * Resource action: child_rsc4:1 start on node2 diff --git a/pengine/test10/inc6.dot b/pengine/test10/inc6.dot index ef43074..4fc47a8 100644 --- a/pengine/test10/inc6.dot +++ b/pengine/test10/inc6.dot @@ -1,38 +1,31 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_rsc2:1_start_0 node2" -> "rsc2_running_0" [ style = bold] "child_rsc2:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"child_rsc2:1_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc2:1_stop_0 node1" -> "child_rsc2:1_start_0 node2" [ style = bold] "child_rsc2:1_stop_0 node1" -> "rsc2_stopped_0" [ style = bold] "child_rsc2:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc4:1_start_0 node2" -> "rsc4_running_0" [ style = bold] "child_rsc4:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"child_rsc4:1_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc4:1_stop_0 node1" -> "child_rsc4:1_start_0 node2" [ style = bold] "child_rsc4:1_stop_0 node1" -> "rsc4_stopped_0" [ style = bold] "child_rsc4:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc5:1_start_0 node1" -> "rsc5_running_0" [ style = bold] "child_rsc5:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"child_rsc5:1_stop_0 node2" -> "all_stopped" [ style = bold] "child_rsc5:1_stop_0 node2" -> "child_rsc5:1_start_0 node1" [ style = bold] "child_rsc5:1_stop_0 node2" -> "rsc5_stopped_0" [ style = bold] "child_rsc5:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc6:0_start_0 node1" -> "rsc6_running_0" [ style = bold] "child_rsc6:0_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"child_rsc6:0_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc6:0_stop_0 node1" -> "child_rsc6:0_start_0 node1" [ style = bold] "child_rsc6:0_stop_0 node1" -> "rsc6_stopped_0" [ style = bold] "child_rsc6:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "child_rsc6:1_start_0 node2" -> "rsc6_running_0" [ style = bold] "child_rsc6:1_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"child_rsc6:1_stop_0 node2" -> "all_stopped" [ style = bold] "child_rsc6:1_stop_0 node2" -> "child_rsc6:1_start_0 node2" [ style = bold] "child_rsc6:1_stop_0 node2" -> "rsc6_stopped_0" [ style = bold] "child_rsc6:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "child_rsc7:1_start_0 node1" -> "rsc7_running_0" [ style = bold] "child_rsc7:1_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"child_rsc7:1_stop_0 node2" -> "all_stopped" [ style = bold] "child_rsc7:1_stop_0 node2" -> "child_rsc7:1_start_0 node1" [ style = bold] "child_rsc7:1_stop_0 node2" -> "rsc7_stopped_0" [ style = bold] "child_rsc7:1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/inc6.exp b/pengine/test10/inc6.exp index c4e4326..1d9f979 100644 --- a/pengine/test10/inc6.exp +++ b/pengine/test10/inc6.exp @@ -1,51 +1,51 @@ - + - + - + - + - + - + - + - + - + @@ -53,78 +53,78 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -132,193 +132,193 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -326,84 +326,84 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -411,55 +411,28 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/inc6.summary b/pengine/test10/inc6.summary index 99f3702..a46ac3c 100644 --- a/pengine/test10/inc6.summary +++ b/pengine/test10/inc6.summary @@ -62,7 +62,6 @@ Executing cluster transition: * Resource action: child_rsc5:1 stop on node2 * Pseudo action: rsc5_stopped_0 * Pseudo action: rsc5_start_0 - * Pseudo action: all_stopped * Resource action: child_rsc5:1 start on node1 * Pseudo action: rsc5_running_0 * Pseudo action: rsc6_start_0 diff --git a/pengine/test10/inc7.exp b/pengine/test10/inc7.exp index e4d1058..42102a5 100644 --- a/pengine/test10/inc7.exp +++ b/pengine/test10/inc7.exp @@ -1,26 +1,26 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -47,20 +47,20 @@ - + - + - + @@ -69,7 +69,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -87,20 +87,20 @@ - + - + - + @@ -109,7 +109,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -127,20 +127,20 @@ - + - + - + @@ -149,7 +149,7 @@ - + @@ -158,7 +158,7 @@ - + @@ -167,20 +167,20 @@ - + - + - + @@ -189,7 +189,7 @@ - + @@ -198,7 +198,7 @@ - + @@ -207,20 +207,20 @@ - + - + - + @@ -229,7 +229,7 @@ - + @@ -238,7 +238,7 @@ - + @@ -247,104 +247,104 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -353,7 +353,7 @@ - + @@ -362,7 +362,7 @@ - + @@ -371,23 +371,23 @@ - + - + - + - + @@ -396,7 +396,7 @@ - + @@ -405,7 +405,7 @@ - + @@ -414,23 +414,23 @@ - + - + - + - + @@ -439,7 +439,7 @@ - + @@ -448,7 +448,7 @@ - + @@ -457,23 +457,23 @@ - + - + - + - + @@ -482,7 +482,7 @@ - + @@ -491,7 +491,7 @@ - + @@ -500,23 +500,23 @@ - + - + - + - + @@ -525,7 +525,7 @@ - + @@ -534,7 +534,7 @@ - + @@ -543,85 +543,85 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/inc8.exp b/pengine/test10/inc8.exp index 0ae4bc7..29f6bc6 100644 --- a/pengine/test10/inc8.exp +++ b/pengine/test10/inc8.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -71,7 +71,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -98,7 +98,7 @@ - + @@ -107,7 +107,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -125,20 +125,20 @@ - + - + - + @@ -147,7 +147,7 @@ - + @@ -156,20 +156,20 @@ - + - + - + @@ -178,7 +178,7 @@ - + @@ -187,7 +187,7 @@ - + @@ -196,7 +196,7 @@ - + @@ -205,7 +205,7 @@ - + @@ -214,7 +214,7 @@ - + @@ -223,7 +223,7 @@ - + @@ -232,7 +232,7 @@ - + @@ -241,58 +241,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/inc9.dot b/pengine/test10/inc9.dot index f4d6649..b4085a0 100644 --- a/pengine/test10/inc9.dot +++ b/pengine/test10/inc9.dot @@ -1,12 +1,8 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] -"child_rsc1:1_stop_0 node1" -> "all_stopped" [ style = bold] "child_rsc1:1_stop_0 node1" -> "rsc1_stopped_0" [ style = bold] "child_rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="black"] -"child_rsc1:1_stop_0 node2" -> "all_stopped" [ 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_rsc1:2_stop_0 node1" -> "all_stopped" [ 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"] "rsc1_stop_0" -> "child_rsc1:1_stop_0 node1" [ style = bold] diff --git a/pengine/test10/inc9.exp b/pengine/test10/inc9.exp index 506c27b..017cf13 100644 --- a/pengine/test10/inc9.exp +++ b/pengine/test10/inc9.exp @@ -1,89 +1,70 @@ - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/inc9.summary b/pengine/test10/inc9.summary index 3c35aee..1e6fc9c 100644 --- a/pengine/test10/inc9.summary +++ b/pengine/test10/inc9.summary @@ -19,7 +19,6 @@ Executing cluster transition: * Resource action: child_rsc1:2 stop on node1 * Resource action: child_rsc1:1 stop on node2 * Pseudo action: rsc1_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/interleave-0.exp b/pengine/test10/interleave-0.exp index 888a0e8..0c86a30 100644 --- a/pengine/test10/interleave-0.exp +++ b/pengine/test10/interleave-0.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -145,7 +145,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -226,7 +226,7 @@ - + @@ -235,7 +235,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -271,7 +271,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -289,7 +289,7 @@ - + @@ -298,7 +298,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -316,7 +316,7 @@ - + @@ -325,7 +325,7 @@ - + @@ -334,7 +334,7 @@ - + @@ -343,7 +343,7 @@ - + @@ -352,7 +352,7 @@ - + @@ -361,7 +361,7 @@ - + @@ -370,7 +370,7 @@ - + @@ -379,7 +379,7 @@ - + @@ -388,7 +388,7 @@ - + @@ -397,7 +397,7 @@ - + @@ -406,7 +406,7 @@ - + @@ -415,7 +415,7 @@ - + @@ -424,7 +424,7 @@ - + @@ -433,7 +433,7 @@ - + @@ -442,7 +442,7 @@ - + @@ -451,7 +451,7 @@ - + @@ -460,7 +460,7 @@ - + @@ -469,7 +469,7 @@ - + @@ -478,7 +478,7 @@ - + @@ -487,7 +487,7 @@ - + @@ -496,7 +496,7 @@ - + @@ -505,7 +505,7 @@ - + @@ -514,7 +514,7 @@ - + @@ -523,7 +523,7 @@ - + @@ -532,7 +532,7 @@ - + @@ -541,7 +541,7 @@ - + @@ -550,7 +550,7 @@ - + @@ -559,7 +559,7 @@ - + @@ -568,7 +568,7 @@ - + @@ -577,7 +577,7 @@ - + @@ -586,7 +586,7 @@ - + @@ -595,7 +595,7 @@ - + @@ -604,7 +604,7 @@ - + @@ -613,7 +613,7 @@ - + @@ -622,7 +622,7 @@ - + @@ -631,7 +631,7 @@ - + @@ -640,7 +640,7 @@ - + @@ -649,7 +649,7 @@ - + @@ -658,7 +658,7 @@ - + @@ -667,7 +667,7 @@ - + @@ -676,7 +676,7 @@ - + @@ -685,7 +685,7 @@ - + @@ -694,7 +694,7 @@ - + @@ -703,7 +703,7 @@ - + @@ -712,7 +712,7 @@ - + @@ -721,7 +721,7 @@ - + @@ -730,7 +730,7 @@ - + @@ -739,33 +739,33 @@ - + - + - + - + - + @@ -774,7 +774,7 @@ - + @@ -783,7 +783,7 @@ - + @@ -792,7 +792,7 @@ - + @@ -801,7 +801,7 @@ - + @@ -810,7 +810,7 @@ - + @@ -819,7 +819,7 @@ - + @@ -828,7 +828,7 @@ - + @@ -837,33 +837,33 @@ - + - + - + - + - + @@ -872,7 +872,7 @@ - + @@ -881,7 +881,7 @@ - + @@ -890,7 +890,7 @@ - + @@ -899,7 +899,7 @@ - + @@ -908,7 +908,7 @@ - + @@ -917,7 +917,7 @@ - + @@ -926,7 +926,7 @@ - + @@ -935,33 +935,33 @@ - + - + - + - + - + @@ -970,7 +970,7 @@ - + @@ -979,7 +979,7 @@ - + @@ -988,7 +988,7 @@ - + @@ -997,7 +997,7 @@ - + @@ -1006,7 +1006,7 @@ - + @@ -1015,7 +1015,7 @@ - + @@ -1024,7 +1024,7 @@ - + @@ -1033,33 +1033,33 @@ - + - + - + - + - + @@ -1068,7 +1068,7 @@ - + @@ -1077,7 +1077,7 @@ - + @@ -1086,7 +1086,7 @@ - + @@ -1095,7 +1095,7 @@ - + @@ -1104,7 +1104,7 @@ - + @@ -1113,7 +1113,7 @@ - + @@ -1122,7 +1122,7 @@ - + @@ -1131,33 +1131,33 @@ - + - + - + - + - + @@ -1166,7 +1166,7 @@ - + @@ -1175,7 +1175,7 @@ - + @@ -1184,7 +1184,7 @@ - + @@ -1193,7 +1193,7 @@ - + @@ -1202,7 +1202,7 @@ - + @@ -1211,7 +1211,7 @@ - + @@ -1220,7 +1220,7 @@ - + @@ -1229,33 +1229,33 @@ - + - + - + - + - + @@ -1264,7 +1264,7 @@ - + @@ -1273,7 +1273,7 @@ - + @@ -1282,7 +1282,7 @@ - + @@ -1291,7 +1291,7 @@ - + @@ -1300,7 +1300,7 @@ - + @@ -1309,7 +1309,7 @@ - + @@ -1318,7 +1318,7 @@ - + @@ -1327,33 +1327,33 @@ - + - + - + - + - + @@ -1362,7 +1362,7 @@ - + @@ -1371,7 +1371,7 @@ - + @@ -1380,7 +1380,7 @@ - + @@ -1389,7 +1389,7 @@ - + @@ -1398,7 +1398,7 @@ - + @@ -1407,7 +1407,7 @@ - + @@ -1416,7 +1416,7 @@ - + @@ -1425,33 +1425,33 @@ - + - + - + - + - + @@ -1460,7 +1460,7 @@ - + @@ -1469,7 +1469,7 @@ - + @@ -1478,7 +1478,7 @@ - + @@ -1487,7 +1487,7 @@ - + @@ -1496,7 +1496,7 @@ - + @@ -1505,7 +1505,7 @@ - + @@ -1514,7 +1514,7 @@ - + @@ -1523,238 +1523,238 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/interleave-1.exp b/pengine/test10/interleave-1.exp index 888a0e8..0c86a30 100644 --- a/pengine/test10/interleave-1.exp +++ b/pengine/test10/interleave-1.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -145,7 +145,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -226,7 +226,7 @@ - + @@ -235,7 +235,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -271,7 +271,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -289,7 +289,7 @@ - + @@ -298,7 +298,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -316,7 +316,7 @@ - + @@ -325,7 +325,7 @@ - + @@ -334,7 +334,7 @@ - + @@ -343,7 +343,7 @@ - + @@ -352,7 +352,7 @@ - + @@ -361,7 +361,7 @@ - + @@ -370,7 +370,7 @@ - + @@ -379,7 +379,7 @@ - + @@ -388,7 +388,7 @@ - + @@ -397,7 +397,7 @@ - + @@ -406,7 +406,7 @@ - + @@ -415,7 +415,7 @@ - + @@ -424,7 +424,7 @@ - + @@ -433,7 +433,7 @@ - + @@ -442,7 +442,7 @@ - + @@ -451,7 +451,7 @@ - + @@ -460,7 +460,7 @@ - + @@ -469,7 +469,7 @@ - + @@ -478,7 +478,7 @@ - + @@ -487,7 +487,7 @@ - + @@ -496,7 +496,7 @@ - + @@ -505,7 +505,7 @@ - + @@ -514,7 +514,7 @@ - + @@ -523,7 +523,7 @@ - + @@ -532,7 +532,7 @@ - + @@ -541,7 +541,7 @@ - + @@ -550,7 +550,7 @@ - + @@ -559,7 +559,7 @@ - + @@ -568,7 +568,7 @@ - + @@ -577,7 +577,7 @@ - + @@ -586,7 +586,7 @@ - + @@ -595,7 +595,7 @@ - + @@ -604,7 +604,7 @@ - + @@ -613,7 +613,7 @@ - + @@ -622,7 +622,7 @@ - + @@ -631,7 +631,7 @@ - + @@ -640,7 +640,7 @@ - + @@ -649,7 +649,7 @@ - + @@ -658,7 +658,7 @@ - + @@ -667,7 +667,7 @@ - + @@ -676,7 +676,7 @@ - + @@ -685,7 +685,7 @@ - + @@ -694,7 +694,7 @@ - + @@ -703,7 +703,7 @@ - + @@ -712,7 +712,7 @@ - + @@ -721,7 +721,7 @@ - + @@ -730,7 +730,7 @@ - + @@ -739,33 +739,33 @@ - + - + - + - + - + @@ -774,7 +774,7 @@ - + @@ -783,7 +783,7 @@ - + @@ -792,7 +792,7 @@ - + @@ -801,7 +801,7 @@ - + @@ -810,7 +810,7 @@ - + @@ -819,7 +819,7 @@ - + @@ -828,7 +828,7 @@ - + @@ -837,33 +837,33 @@ - + - + - + - + - + @@ -872,7 +872,7 @@ - + @@ -881,7 +881,7 @@ - + @@ -890,7 +890,7 @@ - + @@ -899,7 +899,7 @@ - + @@ -908,7 +908,7 @@ - + @@ -917,7 +917,7 @@ - + @@ -926,7 +926,7 @@ - + @@ -935,33 +935,33 @@ - + - + - + - + - + @@ -970,7 +970,7 @@ - + @@ -979,7 +979,7 @@ - + @@ -988,7 +988,7 @@ - + @@ -997,7 +997,7 @@ - + @@ -1006,7 +1006,7 @@ - + @@ -1015,7 +1015,7 @@ - + @@ -1024,7 +1024,7 @@ - + @@ -1033,33 +1033,33 @@ - + - + - + - + - + @@ -1068,7 +1068,7 @@ - + @@ -1077,7 +1077,7 @@ - + @@ -1086,7 +1086,7 @@ - + @@ -1095,7 +1095,7 @@ - + @@ -1104,7 +1104,7 @@ - + @@ -1113,7 +1113,7 @@ - + @@ -1122,7 +1122,7 @@ - + @@ -1131,33 +1131,33 @@ - + - + - + - + - + @@ -1166,7 +1166,7 @@ - + @@ -1175,7 +1175,7 @@ - + @@ -1184,7 +1184,7 @@ - + @@ -1193,7 +1193,7 @@ - + @@ -1202,7 +1202,7 @@ - + @@ -1211,7 +1211,7 @@ - + @@ -1220,7 +1220,7 @@ - + @@ -1229,33 +1229,33 @@ - + - + - + - + - + @@ -1264,7 +1264,7 @@ - + @@ -1273,7 +1273,7 @@ - + @@ -1282,7 +1282,7 @@ - + @@ -1291,7 +1291,7 @@ - + @@ -1300,7 +1300,7 @@ - + @@ -1309,7 +1309,7 @@ - + @@ -1318,7 +1318,7 @@ - + @@ -1327,33 +1327,33 @@ - + - + - + - + - + @@ -1362,7 +1362,7 @@ - + @@ -1371,7 +1371,7 @@ - + @@ -1380,7 +1380,7 @@ - + @@ -1389,7 +1389,7 @@ - + @@ -1398,7 +1398,7 @@ - + @@ -1407,7 +1407,7 @@ - + @@ -1416,7 +1416,7 @@ - + @@ -1425,33 +1425,33 @@ - + - + - + - + - + @@ -1460,7 +1460,7 @@ - + @@ -1469,7 +1469,7 @@ - + @@ -1478,7 +1478,7 @@ - + @@ -1487,7 +1487,7 @@ - + @@ -1496,7 +1496,7 @@ - + @@ -1505,7 +1505,7 @@ - + @@ -1514,7 +1514,7 @@ - + @@ -1523,238 +1523,238 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/interleave-2.exp b/pengine/test10/interleave-2.exp index 888a0e8..0c86a30 100644 --- a/pengine/test10/interleave-2.exp +++ b/pengine/test10/interleave-2.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -145,7 +145,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -226,7 +226,7 @@ - + @@ -235,7 +235,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -271,7 +271,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -289,7 +289,7 @@ - + @@ -298,7 +298,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -316,7 +316,7 @@ - + @@ -325,7 +325,7 @@ - + @@ -334,7 +334,7 @@ - + @@ -343,7 +343,7 @@ - + @@ -352,7 +352,7 @@ - + @@ -361,7 +361,7 @@ - + @@ -370,7 +370,7 @@ - + @@ -379,7 +379,7 @@ - + @@ -388,7 +388,7 @@ - + @@ -397,7 +397,7 @@ - + @@ -406,7 +406,7 @@ - + @@ -415,7 +415,7 @@ - + @@ -424,7 +424,7 @@ - + @@ -433,7 +433,7 @@ - + @@ -442,7 +442,7 @@ - + @@ -451,7 +451,7 @@ - + @@ -460,7 +460,7 @@ - + @@ -469,7 +469,7 @@ - + @@ -478,7 +478,7 @@ - + @@ -487,7 +487,7 @@ - + @@ -496,7 +496,7 @@ - + @@ -505,7 +505,7 @@ - + @@ -514,7 +514,7 @@ - + @@ -523,7 +523,7 @@ - + @@ -532,7 +532,7 @@ - + @@ -541,7 +541,7 @@ - + @@ -550,7 +550,7 @@ - + @@ -559,7 +559,7 @@ - + @@ -568,7 +568,7 @@ - + @@ -577,7 +577,7 @@ - + @@ -586,7 +586,7 @@ - + @@ -595,7 +595,7 @@ - + @@ -604,7 +604,7 @@ - + @@ -613,7 +613,7 @@ - + @@ -622,7 +622,7 @@ - + @@ -631,7 +631,7 @@ - + @@ -640,7 +640,7 @@ - + @@ -649,7 +649,7 @@ - + @@ -658,7 +658,7 @@ - + @@ -667,7 +667,7 @@ - + @@ -676,7 +676,7 @@ - + @@ -685,7 +685,7 @@ - + @@ -694,7 +694,7 @@ - + @@ -703,7 +703,7 @@ - + @@ -712,7 +712,7 @@ - + @@ -721,7 +721,7 @@ - + @@ -730,7 +730,7 @@ - + @@ -739,33 +739,33 @@ - + - + - + - + - + @@ -774,7 +774,7 @@ - + @@ -783,7 +783,7 @@ - + @@ -792,7 +792,7 @@ - + @@ -801,7 +801,7 @@ - + @@ -810,7 +810,7 @@ - + @@ -819,7 +819,7 @@ - + @@ -828,7 +828,7 @@ - + @@ -837,33 +837,33 @@ - + - + - + - + - + @@ -872,7 +872,7 @@ - + @@ -881,7 +881,7 @@ - + @@ -890,7 +890,7 @@ - + @@ -899,7 +899,7 @@ - + @@ -908,7 +908,7 @@ - + @@ -917,7 +917,7 @@ - + @@ -926,7 +926,7 @@ - + @@ -935,33 +935,33 @@ - + - + - + - + - + @@ -970,7 +970,7 @@ - + @@ -979,7 +979,7 @@ - + @@ -988,7 +988,7 @@ - + @@ -997,7 +997,7 @@ - + @@ -1006,7 +1006,7 @@ - + @@ -1015,7 +1015,7 @@ - + @@ -1024,7 +1024,7 @@ - + @@ -1033,33 +1033,33 @@ - + - + - + - + - + @@ -1068,7 +1068,7 @@ - + @@ -1077,7 +1077,7 @@ - + @@ -1086,7 +1086,7 @@ - + @@ -1095,7 +1095,7 @@ - + @@ -1104,7 +1104,7 @@ - + @@ -1113,7 +1113,7 @@ - + @@ -1122,7 +1122,7 @@ - + @@ -1131,33 +1131,33 @@ - + - + - + - + - + @@ -1166,7 +1166,7 @@ - + @@ -1175,7 +1175,7 @@ - + @@ -1184,7 +1184,7 @@ - + @@ -1193,7 +1193,7 @@ - + @@ -1202,7 +1202,7 @@ - + @@ -1211,7 +1211,7 @@ - + @@ -1220,7 +1220,7 @@ - + @@ -1229,33 +1229,33 @@ - + - + - + - + - + @@ -1264,7 +1264,7 @@ - + @@ -1273,7 +1273,7 @@ - + @@ -1282,7 +1282,7 @@ - + @@ -1291,7 +1291,7 @@ - + @@ -1300,7 +1300,7 @@ - + @@ -1309,7 +1309,7 @@ - + @@ -1318,7 +1318,7 @@ - + @@ -1327,33 +1327,33 @@ - + - + - + - + - + @@ -1362,7 +1362,7 @@ - + @@ -1371,7 +1371,7 @@ - + @@ -1380,7 +1380,7 @@ - + @@ -1389,7 +1389,7 @@ - + @@ -1398,7 +1398,7 @@ - + @@ -1407,7 +1407,7 @@ - + @@ -1416,7 +1416,7 @@ - + @@ -1425,33 +1425,33 @@ - + - + - + - + - + @@ -1460,7 +1460,7 @@ - + @@ -1469,7 +1469,7 @@ - + @@ -1478,7 +1478,7 @@ - + @@ -1487,7 +1487,7 @@ - + @@ -1496,7 +1496,7 @@ - + @@ -1505,7 +1505,7 @@ - + @@ -1514,7 +1514,7 @@ - + @@ -1523,238 +1523,238 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/interleave-3.exp b/pengine/test10/interleave-3.exp index 888a0e8..0c86a30 100644 --- a/pengine/test10/interleave-3.exp +++ b/pengine/test10/interleave-3.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -145,7 +145,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -226,7 +226,7 @@ - + @@ -235,7 +235,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -271,7 +271,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -289,7 +289,7 @@ - + @@ -298,7 +298,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -316,7 +316,7 @@ - + @@ -325,7 +325,7 @@ - + @@ -334,7 +334,7 @@ - + @@ -343,7 +343,7 @@ - + @@ -352,7 +352,7 @@ - + @@ -361,7 +361,7 @@ - + @@ -370,7 +370,7 @@ - + @@ -379,7 +379,7 @@ - + @@ -388,7 +388,7 @@ - + @@ -397,7 +397,7 @@ - + @@ -406,7 +406,7 @@ - + @@ -415,7 +415,7 @@ - + @@ -424,7 +424,7 @@ - + @@ -433,7 +433,7 @@ - + @@ -442,7 +442,7 @@ - + @@ -451,7 +451,7 @@ - + @@ -460,7 +460,7 @@ - + @@ -469,7 +469,7 @@ - + @@ -478,7 +478,7 @@ - + @@ -487,7 +487,7 @@ - + @@ -496,7 +496,7 @@ - + @@ -505,7 +505,7 @@ - + @@ -514,7 +514,7 @@ - + @@ -523,7 +523,7 @@ - + @@ -532,7 +532,7 @@ - + @@ -541,7 +541,7 @@ - + @@ -550,7 +550,7 @@ - + @@ -559,7 +559,7 @@ - + @@ -568,7 +568,7 @@ - + @@ -577,7 +577,7 @@ - + @@ -586,7 +586,7 @@ - + @@ -595,7 +595,7 @@ - + @@ -604,7 +604,7 @@ - + @@ -613,7 +613,7 @@ - + @@ -622,7 +622,7 @@ - + @@ -631,7 +631,7 @@ - + @@ -640,7 +640,7 @@ - + @@ -649,7 +649,7 @@ - + @@ -658,7 +658,7 @@ - + @@ -667,7 +667,7 @@ - + @@ -676,7 +676,7 @@ - + @@ -685,7 +685,7 @@ - + @@ -694,7 +694,7 @@ - + @@ -703,7 +703,7 @@ - + @@ -712,7 +712,7 @@ - + @@ -721,7 +721,7 @@ - + @@ -730,7 +730,7 @@ - + @@ -739,33 +739,33 @@ - + - + - + - + - + @@ -774,7 +774,7 @@ - + @@ -783,7 +783,7 @@ - + @@ -792,7 +792,7 @@ - + @@ -801,7 +801,7 @@ - + @@ -810,7 +810,7 @@ - + @@ -819,7 +819,7 @@ - + @@ -828,7 +828,7 @@ - + @@ -837,33 +837,33 @@ - + - + - + - + - + @@ -872,7 +872,7 @@ - + @@ -881,7 +881,7 @@ - + @@ -890,7 +890,7 @@ - + @@ -899,7 +899,7 @@ - + @@ -908,7 +908,7 @@ - + @@ -917,7 +917,7 @@ - + @@ -926,7 +926,7 @@ - + @@ -935,33 +935,33 @@ - + - + - + - + - + @@ -970,7 +970,7 @@ - + @@ -979,7 +979,7 @@ - + @@ -988,7 +988,7 @@ - + @@ -997,7 +997,7 @@ - + @@ -1006,7 +1006,7 @@ - + @@ -1015,7 +1015,7 @@ - + @@ -1024,7 +1024,7 @@ - + @@ -1033,33 +1033,33 @@ - + - + - + - + - + @@ -1068,7 +1068,7 @@ - + @@ -1077,7 +1077,7 @@ - + @@ -1086,7 +1086,7 @@ - + @@ -1095,7 +1095,7 @@ - + @@ -1104,7 +1104,7 @@ - + @@ -1113,7 +1113,7 @@ - + @@ -1122,7 +1122,7 @@ - + @@ -1131,33 +1131,33 @@ - + - + - + - + - + @@ -1166,7 +1166,7 @@ - + @@ -1175,7 +1175,7 @@ - + @@ -1184,7 +1184,7 @@ - + @@ -1193,7 +1193,7 @@ - + @@ -1202,7 +1202,7 @@ - + @@ -1211,7 +1211,7 @@ - + @@ -1220,7 +1220,7 @@ - + @@ -1229,33 +1229,33 @@ - + - + - + - + - + @@ -1264,7 +1264,7 @@ - + @@ -1273,7 +1273,7 @@ - + @@ -1282,7 +1282,7 @@ - + @@ -1291,7 +1291,7 @@ - + @@ -1300,7 +1300,7 @@ - + @@ -1309,7 +1309,7 @@ - + @@ -1318,7 +1318,7 @@ - + @@ -1327,33 +1327,33 @@ - + - + - + - + - + @@ -1362,7 +1362,7 @@ - + @@ -1371,7 +1371,7 @@ - + @@ -1380,7 +1380,7 @@ - + @@ -1389,7 +1389,7 @@ - + @@ -1398,7 +1398,7 @@ - + @@ -1407,7 +1407,7 @@ - + @@ -1416,7 +1416,7 @@ - + @@ -1425,33 +1425,33 @@ - + - + - + - + - + @@ -1460,7 +1460,7 @@ - + @@ -1469,7 +1469,7 @@ - + @@ -1478,7 +1478,7 @@ - + @@ -1487,7 +1487,7 @@ - + @@ -1496,7 +1496,7 @@ - + @@ -1505,7 +1505,7 @@ - + @@ -1514,7 +1514,7 @@ - + @@ -1523,238 +1523,238 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/interleave-pseudo-stop.dot b/pengine/test10/interleave-pseudo-stop.dot index 5b3d272..3c72b67 100644 --- a/pengine/test10/interleave-pseudo-stop.dot +++ b/pengine/test10/interleave-pseudo-stop.dot @@ -1,11 +1,8 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] -"configstoreclone:0_confirmed-post_notify_stonith_0" -> "all_stopped" [ style = bold] "configstoreclone:0_confirmed-post_notify_stonith_0" [ style=bold color="green" fontcolor="orange" ] "configstoreclone:0_post_notify_stonith_0" -> "configstoreclone:0_confirmed-post_notify_stonith_0" [ style = bold] "configstoreclone:0_post_notify_stonith_0" -> "configstoreclone:1_post_notify_stonith_0 node2" [ style = bold] "configstoreclone:0_post_notify_stonith_0" [ style=bold color="green" fontcolor="orange" ] -"configstoreclone:0_stop_0 node1" -> "all_stopped" [ style = bold] "configstoreclone:0_stop_0 node1" -> "configstorecloneset_stopped_0" [ style = bold] "configstoreclone:0_stop_0 node1" -> "evmsclone:0_stop_0 node1" [ style = bold] "configstoreclone:0_stop_0 node1" [ style=bold color="green" fontcolor="orange" ] @@ -14,7 +11,6 @@ digraph "g" { "configstoreclone:1_post_notify_stonith_0 node2" [ style=bold color="green" fontcolor="black"] "configstoreclone:1_pre_notify_stop_0 node2" -> "configstorecloneset_confirmed-pre_notify_stop_0" [ style = bold] "configstoreclone:1_pre_notify_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"configstorecloneset_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "configstorecloneset_confirmed-post_notify_stopped_0" -> "evmscloneset_stop_0" [ style = bold] "configstorecloneset_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "configstorecloneset_confirmed-pre_notify_stop_0" -> "configstorecloneset_post_notify_stopped_0" [ style = bold] @@ -31,12 +27,10 @@ digraph "g" { "configstorecloneset_stop_0" [ style=bold color="green" fontcolor="orange" ] "configstorecloneset_stopped_0" -> "configstorecloneset_post_notify_stopped_0" [ style = bold] "configstorecloneset_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"evmsclone:0_confirmed-post_notify_stonith_0" -> "all_stopped" [ style = bold] "evmsclone:0_confirmed-post_notify_stonith_0" [ style=bold color="green" fontcolor="orange" ] "evmsclone:0_post_notify_stonith_0" -> "evmsclone:0_confirmed-post_notify_stonith_0" [ style = bold] "evmsclone:0_post_notify_stonith_0" -> "evmsclone:1_post_notify_stonith_0 node2" [ style = bold] "evmsclone:0_post_notify_stonith_0" [ style=bold color="green" fontcolor="orange" ] -"evmsclone:0_stop_0 node1" -> "all_stopped" [ style = bold] "evmsclone:0_stop_0 node1" -> "evmscloneset_stopped_0" [ style = bold] "evmsclone:0_stop_0 node1" [ style=bold color="green" fontcolor="orange" ] "evmsclone:1_post_notify_stonith_0 node2" -> "evmsclone:0_confirmed-post_notify_stonith_0" [ style = bold] @@ -44,7 +38,6 @@ digraph "g" { "evmsclone:1_post_notify_stonith_0 node2" [ style=bold color="green" fontcolor="black"] "evmsclone:1_pre_notify_stop_0 node2" -> "evmscloneset_confirmed-pre_notify_stop_0" [ style = bold] "evmsclone:1_pre_notify_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"evmscloneset_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "evmscloneset_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "evmscloneset_confirmed-pre_notify_stop_0" -> "evmscloneset_post_notify_stopped_0" [ style = bold] "evmscloneset_confirmed-pre_notify_stop_0" -> "evmscloneset_stop_0" [ style = bold] @@ -60,12 +53,10 @@ digraph "g" { "evmscloneset_stop_0" [ style=bold color="green" fontcolor="orange" ] "evmscloneset_stopped_0" -> "evmscloneset_post_notify_stopped_0" [ style = bold] "evmscloneset_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"imagestoreclone:0_confirmed-post_notify_stonith_0" -> "all_stopped" [ style = bold] "imagestoreclone:0_confirmed-post_notify_stonith_0" [ style=bold color="green" fontcolor="orange" ] "imagestoreclone:0_post_notify_stonith_0" -> "imagestoreclone:0_confirmed-post_notify_stonith_0" [ style = bold] "imagestoreclone:0_post_notify_stonith_0" -> "imagestoreclone:1_post_notify_stonith_0 node2" [ style = bold] "imagestoreclone:0_post_notify_stonith_0" [ style=bold color="green" fontcolor="orange" ] -"imagestoreclone:0_stop_0 node1" -> "all_stopped" [ style = bold] "imagestoreclone:0_stop_0 node1" -> "evmsclone:0_stop_0 node1" [ style = bold] "imagestoreclone:0_stop_0 node1" -> "imagestorecloneset_stopped_0" [ style = bold] "imagestoreclone:0_stop_0 node1" [ style=bold color="green" fontcolor="orange" ] @@ -74,7 +65,6 @@ digraph "g" { "imagestoreclone:1_post_notify_stonith_0 node2" [ style=bold color="green" fontcolor="black"] "imagestoreclone:1_pre_notify_stop_0 node2" -> "imagestorecloneset_confirmed-pre_notify_stop_0" [ style = bold] "imagestoreclone:1_pre_notify_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"imagestorecloneset_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "imagestorecloneset_confirmed-post_notify_stopped_0" -> "evmscloneset_stop_0" [ style = bold] "imagestorecloneset_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_confirmed-pre_notify_stop_0" -> "imagestorecloneset_post_notify_stopped_0" [ style = bold] @@ -100,13 +90,9 @@ digraph "g" { "stonith 'reboot' node1" -> "imagestoreclone:0_post_notify_stonith_0" [ style = bold] "stonith 'reboot' node1" -> "imagestoreclone:0_stop_0 node1" [ style = bold] "stonith 'reboot' node1" -> "imagestorecloneset_stop_0" [ style = bold] -"stonith 'reboot' node1" -> "stonith_complete" [ style = bold] "stonith 'reboot' node1" -> "stonithclone:0_stop_0 node1" [ style = bold] "stonith 'reboot' node1" -> "stonithcloneset_stop_0" [ style = bold] "stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] -"stonithclone:0_stop_0 node1" -> "all_stopped" [ style = bold] "stonithclone:0_stop_0 node1" -> "stonithcloneset_stopped_0" [ style = bold] "stonithclone:0_stop_0 node1" [ style=bold color="green" fontcolor="orange" ] "stonithcloneset_stop_0" -> "stonithclone:0_stop_0 node1" [ style = bold] diff --git a/pengine/test10/interleave-pseudo-stop.exp b/pengine/test10/interleave-pseudo-stop.exp index 97faf46..0d47453 100644 --- a/pengine/test10/interleave-pseudo-stop.exp +++ b/pengine/test10/interleave-pseudo-stop.exp @@ -1,7 +1,7 @@ - + @@ -10,28 +10,28 @@ - + - + - + - + - + @@ -43,51 +43,51 @@ - + - + - + - + - + - + - + - + - + @@ -99,7 +99,7 @@ - + @@ -108,64 +108,64 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -173,22 +173,22 @@ - + - + - + - + @@ -197,63 +197,63 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -265,7 +265,7 @@ - + @@ -274,58 +274,58 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -333,22 +333,22 @@ - + - + - + - + @@ -357,57 +357,57 @@ - + - + - + - + - + - + - + - + - + - + @@ -419,7 +419,7 @@ - + @@ -428,58 +428,58 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -487,22 +487,22 @@ - + - + - + - + @@ -511,66 +511,12 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/interleave-pseudo-stop.summary b/pengine/test10/interleave-pseudo-stop.summary index ee3fa29..9c4cc2b 100644 --- a/pengine/test10/interleave-pseudo-stop.summary +++ b/pengine/test10/interleave-pseudo-stop.summary @@ -40,7 +40,6 @@ Executing cluster transition: * Pseudo action: configstoreclone:0_post_notify_stop_0 * Pseudo action: configstorecloneset_confirmed-pre_notify_stop_0 * Pseudo action: configstorecloneset_stop_0 - * Pseudo action: stonith_complete * Pseudo action: stonithclone:0_stop_0 * Pseudo action: stonithcloneset_stopped_0 * Pseudo action: imagestoreclone:0_stop_0 @@ -62,7 +61,6 @@ Executing cluster transition: * Resource action: evmsclone:1 notify on node2 * Pseudo action: evmsclone:0_notified_0 * Pseudo action: evmscloneset_confirmed-post_notify_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ node2 ] diff --git a/pengine/test10/interleave-restart.dot b/pengine/test10/interleave-restart.dot index a4c725f..e208e5f 100644 --- a/pengine/test10/interleave-restart.dot +++ b/pengine/test10/interleave-restart.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "configstoreclone:0_monitor_20000 node1" [ style=bold color="green" fontcolor="black" ] "configstoreclone:0_post_notify_running_0 node1" -> "configstorecloneset_confirmed-post_notify_running_0" [ style = bold] "configstoreclone:0_post_notify_running_0 node1" [ style=bold color="green" fontcolor="black"] @@ -8,7 +7,6 @@ digraph "g" { "configstoreclone:0_start_0 node1" -> "configstoreclone:0_monitor_20000 node1" [ style = bold] "configstoreclone:0_start_0 node1" -> "configstorecloneset_running_0" [ style = bold] "configstoreclone:0_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"configstoreclone:0_stop_0 node1" -> "all_stopped" [ style = bold] "configstoreclone:0_stop_0 node1" -> "configstoreclone:0_start_0 node1" [ style = bold] "configstoreclone:0_stop_0 node1" -> "configstorecloneset_stopped_0" [ style = bold] "configstoreclone:0_stop_0 node1" -> "evmsclone:0_stop_0 node1" [ style = bold] @@ -25,7 +23,6 @@ digraph "g" { "configstoreclone:2_start_0 " [ style=dashed color="red" fontcolor="black"] "configstorecloneset_confirmed-post_notify_running_0" -> "configstoreclone:0_monitor_20000 node1" [ style = bold] "configstorecloneset_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange" ] -"configstorecloneset_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "configstorecloneset_confirmed-post_notify_stopped_0" -> "configstorecloneset_pre_notify_start_0" [ style = bold] "configstorecloneset_confirmed-post_notify_stopped_0" -> "evmscloneset_stop_0" [ style = bold] "configstorecloneset_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] @@ -70,7 +67,6 @@ digraph "g" { "evmsclone:0_start_0 node1" -> "imagestoreclone:0_start_0 node1" [ style = bold] "evmsclone:0_start_0 node1" -> "imagestoreclone:2_start_0 " [ style = dashed] "evmsclone:0_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"evmsclone:0_stop_0 node1" -> "all_stopped" [ style = bold] "evmsclone:0_stop_0 node1" -> "evmsclone:0_start_0 node1" [ style = bold] "evmsclone:0_stop_0 node1" -> "evmscloneset_stopped_0" [ style = bold] "evmsclone:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] @@ -85,7 +81,6 @@ digraph "g" { "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-post_notify_stopped_0" -> "all_stopped" [ style = bold] "evmscloneset_confirmed-post_notify_stopped_0" -> "evmscloneset_pre_notify_start_0" [ style = bold] "evmscloneset_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "evmscloneset_confirmed-pre_notify_start_0" -> "evmscloneset_post_notify_running_0" [ style = bold] @@ -127,7 +122,6 @@ digraph "g" { "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 node1" -> "all_stopped" [ style = bold] "imagestoreclone:0_stop_0 node1" -> "evmsclone:0_stop_0 node1" [ style = bold] "imagestoreclone:0_stop_0 node1" -> "imagestoreclone:0_start_0 node1" [ style = bold] "imagestoreclone:0_stop_0 node1" -> "imagestorecloneset_stopped_0" [ style = bold] @@ -144,7 +138,6 @@ digraph "g" { "imagestoreclone:2_start_0 " [ style=dashed color="red" fontcolor="black"] "imagestorecloneset_confirmed-post_notify_running_0" -> "imagestoreclone:0_monitor_20000 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" -> "evmscloneset_stop_0" [ 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" ] diff --git a/pengine/test10/interleave-restart.exp b/pengine/test10/interleave-restart.exp index fb6eaca..d5ffbb3 100644 --- a/pengine/test10/interleave-restart.exp +++ b/pengine/test10/interleave-restart.exp @@ -1,85 +1,85 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -89,7 +89,7 @@ - + @@ -102,67 +102,67 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -170,7 +170,7 @@ - + @@ -179,225 +179,225 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -410,64 +410,64 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -475,231 +475,231 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -712,64 +712,64 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -777,148 +777,121 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/interleave-restart.summary b/pengine/test10/interleave-restart.summary index c151581..bff5f34 100644 --- a/pengine/test10/interleave-restart.summary +++ b/pengine/test10/interleave-restart.summary @@ -55,7 +55,6 @@ Executing cluster transition: * Resource action: evmsclone:1 notify on node2 * Pseudo action: evmscloneset_confirmed-post_notify_stopped_0 * Pseudo action: evmscloneset_pre_notify_start_0 - * Pseudo action: all_stopped * Resource action: evmsclone:1 notify on node2 * Pseudo action: evmscloneset_confirmed-pre_notify_start_0 * Pseudo action: evmscloneset_start_0 diff --git a/pengine/test10/interleave-stop.dot b/pengine/test10/interleave-stop.dot index d7b9093..d8e1190 100644 --- a/pengine/test10/interleave-stop.dot +++ b/pengine/test10/interleave-stop.dot @@ -1,8 +1,6 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "configstoreclone:0_pre_notify_stop_0 node1" -> "configstorecloneset_confirmed-pre_notify_stop_0" [ style = bold] "configstoreclone:0_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"configstoreclone:0_stop_0 node1" -> "all_stopped" [ style = bold] "configstoreclone:0_stop_0 node1" -> "configstorecloneset_stopped_0" [ style = bold] "configstoreclone:0_stop_0 node1" -> "evmsclone:0_stop_0 node1" [ style = bold] "configstoreclone:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] @@ -10,7 +8,6 @@ digraph "g" { "configstoreclone:1_post_notify_stopped_0 node2" [ style=bold color="green" fontcolor="black"] "configstoreclone:1_pre_notify_stop_0 node2" -> "configstorecloneset_confirmed-pre_notify_stop_0" [ style = bold] "configstoreclone:1_pre_notify_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"configstorecloneset_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "configstorecloneset_confirmed-post_notify_stopped_0" -> "evmscloneset_stop_0" [ style = bold] "configstorecloneset_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "configstorecloneset_confirmed-pre_notify_stop_0" -> "configstorecloneset_post_notify_stopped_0" [ style = bold] @@ -30,14 +27,12 @@ digraph "g" { "configstorecloneset_stopped_0" [ style=bold color="green" fontcolor="orange" ] "evmsclone:0_pre_notify_stop_0 node1" -> "evmscloneset_confirmed-pre_notify_stop_0" [ style = bold] "evmsclone:0_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"evmsclone:0_stop_0 node1" -> "all_stopped" [ style = bold] "evmsclone:0_stop_0 node1" -> "evmscloneset_stopped_0" [ style = bold] "evmsclone:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "evmsclone:1_post_notify_stopped_0 node2" -> "evmscloneset_confirmed-post_notify_stopped_0" [ style = bold] "evmsclone:1_post_notify_stopped_0 node2" [ style=bold color="green" fontcolor="black"] "evmsclone:1_pre_notify_stop_0 node2" -> "evmscloneset_confirmed-pre_notify_stop_0" [ style = bold] "evmsclone:1_pre_notify_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"evmscloneset_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "evmscloneset_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "evmscloneset_confirmed-pre_notify_stop_0" -> "evmscloneset_post_notify_stopped_0" [ style = bold] "evmscloneset_confirmed-pre_notify_stop_0" -> "evmscloneset_stop_0" [ style = bold] @@ -56,7 +51,6 @@ digraph "g" { "evmscloneset_stopped_0" [ style=bold color="green" fontcolor="orange" ] "imagestoreclone:0_pre_notify_stop_0 node1" -> "imagestorecloneset_confirmed-pre_notify_stop_0" [ style = bold] "imagestoreclone:0_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"imagestoreclone:0_stop_0 node1" -> "all_stopped" [ style = bold] "imagestoreclone:0_stop_0 node1" -> "evmsclone:0_stop_0 node1" [ style = bold] "imagestoreclone:0_stop_0 node1" -> "imagestorecloneset_stopped_0" [ style = bold] "imagestoreclone:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] @@ -64,7 +58,6 @@ digraph "g" { "imagestoreclone:1_post_notify_stopped_0 node2" [ style=bold color="green" fontcolor="black"] "imagestoreclone:1_pre_notify_stop_0 node2" -> "imagestorecloneset_confirmed-pre_notify_stop_0" [ style = bold] "imagestoreclone:1_pre_notify_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"imagestorecloneset_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "imagestorecloneset_confirmed-post_notify_stopped_0" -> "evmscloneset_stop_0" [ style = bold] "imagestorecloneset_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_confirmed-pre_notify_stop_0" -> "imagestorecloneset_post_notify_stopped_0" [ style = bold] @@ -82,7 +75,6 @@ digraph "g" { "imagestorecloneset_stop_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_stopped_0" -> "imagestorecloneset_post_notify_stopped_0" [ style = bold] "imagestorecloneset_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"stonithclone:0_stop_0 node1" -> "all_stopped" [ style = bold] "stonithclone:0_stop_0 node1" -> "stonithcloneset_stopped_0" [ style = bold] "stonithclone:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "stonithcloneset_stop_0" -> "stonithclone:0_stop_0 node1" [ style = bold] diff --git a/pengine/test10/interleave-stop.exp b/pengine/test10/interleave-stop.exp index 35a8428..64f2f10 100644 --- a/pengine/test10/interleave-stop.exp +++ b/pengine/test10/interleave-stop.exp @@ -1,35 +1,35 @@ - + - + - + - + - + - + @@ -37,113 +37,113 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -151,140 +151,140 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -292,134 +292,134 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -427,58 +427,28 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/interleave-stop.summary b/pengine/test10/interleave-stop.summary index 529e33a..117c9fe 100644 --- a/pengine/test10/interleave-stop.summary +++ b/pengine/test10/interleave-stop.summary @@ -52,7 +52,6 @@ Executing cluster transition: * Pseudo action: evmscloneset_post_notify_stopped_0 * Resource action: evmsclone:1 notify on node2 * Pseudo action: evmscloneset_confirmed-post_notify_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Node node1 (f6d93040-a9ad-4745-a647-57ed32444ca8): standby diff --git a/pengine/test10/isolation-clone.exp b/pengine/test10/isolation-clone.exp index b3df0fa..52e6f6b 100644 --- a/pengine/test10/isolation-clone.exp +++ b/pengine/test10/isolation-clone.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,7 +36,7 @@ - + @@ -45,33 +45,33 @@ - + - + - + - + - + @@ -80,7 +80,7 @@ - + @@ -89,40 +89,40 @@ - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/isolation-restart-all.dot b/pengine/test10/isolation-restart-all.dot index 4c0df12..6870375 100644 --- a/pengine/test10/isolation-restart-all.dot +++ b/pengine/test10/isolation-restart-all.dot @@ -1,9 +1,7 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "fake_monitor_60000 rhel7-auto5" [ style=bold color="green" fontcolor="black"] "fake_start_0 rhel7-auto5" -> "fake_monitor_60000 rhel7-auto5" [ style = bold] "fake_start_0 rhel7-auto5" [ style=bold color="green" fontcolor="black"] -"fake_stop_0 rhel7-auto5" -> "all_stopped" [ style = bold] "fake_stop_0 rhel7-auto5" -> "fake_start_0 rhel7-auto5" [ style = bold] "fake_stop_0 rhel7-auto5" [ style=bold color="green" fontcolor="black"] "g1:0_monitor_10000 rhel7-auto5" [ style=bold color="green" fontcolor="black"] @@ -11,7 +9,6 @@ "g1:0_start_0 rhel7-auto5" -> "g2:0_start_0 rhel7-auto5" [ style = bold] "g1:0_start_0 rhel7-auto5" -> "mygroup:0_running_0" [ style = bold] "g1:0_start_0 rhel7-auto5" [ style=bold color="green" fontcolor="black"] -"g1:0_stop_0 rhel7-auto5" -> "all_stopped" [ style = bold] "g1:0_stop_0 rhel7-auto5" -> "g1:0_start_0 rhel7-auto5" [ style = bold] "g1:0_stop_0 rhel7-auto5" -> "mygroup:0_stopped_0" [ style = bold] "g1:0_stop_0 rhel7-auto5" [ style=bold color="green" fontcolor="black"] @@ -20,7 +17,6 @@ "g1:1_start_0 rhel7-auto5" -> "g2:1_start_0 rhel7-auto5" [ style = bold] "g1:1_start_0 rhel7-auto5" -> "mygroup:1_running_0" [ style = bold] "g1:1_start_0 rhel7-auto5" [ style=bold color="green" fontcolor="black"] -"g1:1_stop_0 rhel7-auto5" -> "all_stopped" [ style = bold] "g1:1_stop_0 rhel7-auto5" -> "g1:1_start_0 rhel7-auto5" [ style = bold] "g1:1_stop_0 rhel7-auto5" -> "mygroup:1_stopped_0" [ style = bold] "g1:1_stop_0 rhel7-auto5" [ style=bold color="green" fontcolor="black"] @@ -28,7 +24,6 @@ "g2:0_start_0 rhel7-auto5" -> "g2:0_monitor_10000 rhel7-auto5" [ style = bold] "g2:0_start_0 rhel7-auto5" -> "mygroup:0_running_0" [ style = bold] "g2:0_start_0 rhel7-auto5" [ style=bold color="green" fontcolor="black"] -"g2:0_stop_0 rhel7-auto5" -> "all_stopped" [ style = bold] "g2:0_stop_0 rhel7-auto5" -> "g1:0_stop_0 rhel7-auto5" [ style = bold] "g2:0_stop_0 rhel7-auto5" -> "g2:0_start_0 rhel7-auto5" [ style = bold] "g2:0_stop_0 rhel7-auto5" -> "mygroup:0_stopped_0" [ style = bold] @@ -37,7 +32,6 @@ "g2:1_start_0 rhel7-auto5" -> "g2:1_monitor_10000 rhel7-auto5" [ style = bold] "g2:1_start_0 rhel7-auto5" -> "mygroup:1_running_0" [ style = bold] "g2:1_start_0 rhel7-auto5" [ style=bold color="green" fontcolor="black"] -"g2:1_stop_0 rhel7-auto5" -> "all_stopped" [ style = bold] "g2:1_stop_0 rhel7-auto5" -> "g1:1_stop_0 rhel7-auto5" [ style = bold] "g2:1_stop_0 rhel7-auto5" -> "g2:1_start_0 rhel7-auto5" [ style = bold] "g2:1_stop_0 rhel7-auto5" -> "mygroup:1_stopped_0" [ style = bold] @@ -69,7 +63,6 @@ "iso_mem1_start_0 rhel7-auto5" -> "iso_mem1_monitor_60000 rhel7-auto5" [ style = bold] "iso_mem1_start_0 rhel7-auto5" -> "iso_mem2_start_0 rhel7-auto5" [ style = bold] "iso_mem1_start_0 rhel7-auto5" [ style=bold color="green" fontcolor="black"] -"iso_mem1_stop_0 rhel7-auto5" -> "all_stopped" [ style = bold] "iso_mem1_stop_0 rhel7-auto5" -> "group_of_containers_stopped_0" [ style = bold] "iso_mem1_stop_0 rhel7-auto5" -> "iso_mem1_start_0 rhel7-auto5" [ style = bold] "iso_mem1_stop_0 rhel7-auto5" [ style=bold color="green" fontcolor="black"] @@ -77,7 +70,6 @@ "iso_mem2_start_0 rhel7-auto5" -> "group_of_containers_running_0" [ style = bold] "iso_mem2_start_0 rhel7-auto5" -> "iso_mem2_monitor_60000 rhel7-auto5" [ style = bold] "iso_mem2_start_0 rhel7-auto5" [ style=bold color="green" fontcolor="black"] -"iso_mem2_stop_0 rhel7-auto5" -> "all_stopped" [ style = bold] "iso_mem2_stop_0 rhel7-auto5" -> "group_of_containers_stopped_0" [ style = bold] "iso_mem2_stop_0 rhel7-auto5" -> "iso_mem1_stop_0 rhel7-auto5" [ style = bold] "iso_mem2_stop_0 rhel7-auto5" -> "iso_mem2_start_0 rhel7-auto5" [ style = bold] @@ -134,7 +126,6 @@ "replicated:0_start_0 rhel7-auto5" -> "replicated-clone_running_0" [ style = bold] "replicated:0_start_0 rhel7-auto5" -> "replicated:0_monitor_10000 rhel7-auto5" [ style = bold] "replicated:0_start_0 rhel7-auto5" [ style=bold color="green" fontcolor="black"] -"replicated:0_stop_0 rhel7-auto5" -> "all_stopped" [ style = bold] "replicated:0_stop_0 rhel7-auto5" -> "replicated-clone_stopped_0" [ style = bold] "replicated:0_stop_0 rhel7-auto5" -> "replicated:0_start_0 rhel7-auto5" [ style = bold] "replicated:0_stop_0 rhel7-auto5" [ style=bold color="green" fontcolor="black"] @@ -142,7 +133,6 @@ "replicated:1_start_0 rhel7-auto5" -> "replicated-clone_running_0" [ style = bold] "replicated:1_start_0 rhel7-auto5" -> "replicated:1_monitor_10000 rhel7-auto5" [ style = bold] "replicated:1_start_0 rhel7-auto5" [ style=bold color="green" fontcolor="black"] -"replicated:1_stop_0 rhel7-auto5" -> "all_stopped" [ style = bold] "replicated:1_stop_0 rhel7-auto5" -> "replicated-clone_stopped_0" [ style = bold] "replicated:1_stop_0 rhel7-auto5" -> "replicated:1_start_0 rhel7-auto5" [ style = bold] "replicated:1_stop_0 rhel7-auto5" [ style=bold color="green" fontcolor="black"] @@ -151,7 +141,6 @@ "s1_start_0 rhel7-auto5" -> "s1_monitor_10000 rhel7-auto5" [ style = bold] "s1_start_0 rhel7-auto5" -> "s2_start_0 rhel7-auto5" [ style = bold] "s1_start_0 rhel7-auto5" [ style=bold color="green" fontcolor="black"] -"s1_stop_0 rhel7-auto5" -> "all_stopped" [ style = bold] "s1_stop_0 rhel7-auto5" -> "group_is_container_stopped_0" [ style = bold] "s1_stop_0 rhel7-auto5" -> "s1_start_0 rhel7-auto5" [ style = bold] "s1_stop_0 rhel7-auto5" [ style=bold color="green" fontcolor="black"] @@ -159,7 +148,6 @@ "s2_start_0 rhel7-auto5" -> "group_is_container_running_0" [ style = bold] "s2_start_0 rhel7-auto5" -> "s2_monitor_10000 rhel7-auto5" [ style = bold] "s2_start_0 rhel7-auto5" [ style=bold color="green" fontcolor="black"] -"s2_stop_0 rhel7-auto5" -> "all_stopped" [ style = bold] "s2_stop_0 rhel7-auto5" -> "group_is_container_stopped_0" [ style = bold] "s2_stop_0 rhel7-auto5" -> "s1_stop_0 rhel7-auto5" [ style = bold] "s2_stop_0 rhel7-auto5" -> "s2_start_0 rhel7-auto5" [ style = bold] diff --git a/pengine/test10/isolation-restart-all.exp b/pengine/test10/isolation-restart-all.exp index 3e09183..78c3bc6 100644 --- a/pengine/test10/isolation-restart-all.exp +++ b/pengine/test10/isolation-restart-all.exp @@ -1,7 +1,7 @@ - + @@ -10,14 +10,14 @@ - + - + @@ -30,36 +30,36 @@ - + - + - + - + - + - + @@ -72,36 +72,36 @@ - + - + - + - + - + - + @@ -114,31 +114,31 @@ - + - + - + - + - + - + @@ -146,55 +146,55 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -202,63 +202,63 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -271,39 +271,39 @@ - + - + - + - + - + - + - + @@ -316,102 +316,102 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -424,39 +424,39 @@ - + - + - + - + - + - + - + @@ -469,102 +469,102 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -577,39 +577,39 @@ - + - + - + - + - + - + - + @@ -622,31 +622,31 @@ - + - + - + - + - + - + @@ -654,55 +654,55 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -710,63 +710,63 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -779,39 +779,39 @@ - + - + - + - + - + - + - + @@ -824,49 +824,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/isolation-restart-all.summary b/pengine/test10/isolation-restart-all.summary index 595c254..d1979fa 100644 --- a/pengine/test10/isolation-restart-all.summary +++ b/pengine/test10/isolation-restart-all.summary @@ -73,7 +73,6 @@ Executing cluster transition: * Resource action: iso_mem1 monitor=60000 on rhel7-auto5 * Resource action: iso_mem2 start on rhel7-auto5 * Resource action: iso_mem2 monitor=60000 on rhel7-auto5 - * Pseudo action: all_stopped * Pseudo action: group_is_container_running_0 * Pseudo action: mygroup:0_stopped_0 * Pseudo action: mygroup:1_stopped_0 diff --git a/pengine/test10/isolation-start-all.exp b/pengine/test10/isolation-start-all.exp index 49fc58f..0363477 100644 --- a/pengine/test10/isolation-start-all.exp +++ b/pengine/test10/isolation-start-all.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,77 +23,77 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -101,25 +101,25 @@ - + - + - + - + - + @@ -127,250 +127,250 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -378,25 +378,25 @@ - + - + - + - + - + @@ -404,56 +404,56 @@ - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/load-stopped-loop-2.dot b/pengine/test10/load-stopped-loop-2.dot index 2252dcf..fa96fa5 100644 --- a/pengine/test10/load-stopped-loop-2.dot +++ b/pengine/test10/load-stopped-loop-2.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "load_stopped_xfc0 xfc0" -> "xu-test3_start_0 xfc0" [ style = bold] "load_stopped_xfc0 xfc0" -> "xu-test7_migrate_to_0 xfc1" [ style = bold] "load_stopped_xfc0 xfc0" -> "xu-test7_start_0 xfc0" [ style = bold] @@ -24,7 +23,6 @@ digraph "g" { "xu-test12_monitor_10000 xfc3" [ style=bold color="green" fontcolor="black"] "xu-test12_start_0 xfc3" -> "xu-test12_monitor_10000 xfc3" [ style = bold] "xu-test12_start_0 xfc3" [ style=bold color="green" fontcolor="orange"] -"xu-test12_stop_0 xfc2" -> "all_stopped" [ style = bold] "xu-test12_stop_0 xfc2" -> "load_stopped_xfc2 xfc2" [ style = bold] "xu-test12_stop_0 xfc2" -> "xu-test12_start_0 xfc3" [ style = bold] "xu-test12_stop_0 xfc2" [ style=bold color="green" fontcolor="black"] @@ -39,7 +37,6 @@ digraph "g" { "xu-test2_monitor_10000 xfc1" [ style=bold color="green" fontcolor="black"] "xu-test2_start_0 xfc1" -> "xu-test2_monitor_10000 xfc1" [ style = bold] "xu-test2_start_0 xfc1" [ style=bold color="green" fontcolor="orange"] -"xu-test2_stop_0 xfc3" -> "all_stopped" [ style = bold] "xu-test2_stop_0 xfc3" -> "load_stopped_xfc3 xfc3" [ style = bold] "xu-test2_stop_0 xfc3" -> "xu-test2_start_0 xfc1" [ style = bold] "xu-test2_stop_0 xfc3" [ style=bold color="green" fontcolor="black"] @@ -51,7 +48,6 @@ digraph "g" { "xu-test3_monitor_10000 xfc0" [ style=bold color="green" fontcolor="black"] "xu-test3_start_0 xfc0" -> "xu-test3_monitor_10000 xfc0" [ style = bold] "xu-test3_start_0 xfc0" [ style=bold color="green" fontcolor="orange"] -"xu-test3_stop_0 xfc1" -> "all_stopped" [ style = bold] "xu-test3_stop_0 xfc1" -> "load_stopped_xfc1 xfc1" [ style = bold] "xu-test3_stop_0 xfc1" -> "xu-test3_start_0 xfc0" [ style = bold] "xu-test3_stop_0 xfc1" [ style=bold color="green" fontcolor="black"] @@ -63,7 +59,6 @@ digraph "g" { "xu-test4_monitor_10000 xfc2" [ style=bold color="green" fontcolor="black"] "xu-test4_start_0 xfc2" -> "xu-test4_monitor_10000 xfc2" [ style = bold] "xu-test4_start_0 xfc2" [ style=bold color="green" fontcolor="orange"] -"xu-test4_stop_0 xfc0" -> "all_stopped" [ style = bold] "xu-test4_stop_0 xfc0" -> "load_stopped_xfc0 xfc0" [ style = bold] "xu-test4_stop_0 xfc0" -> "xu-test4_start_0 xfc2" [ style = bold] "xu-test4_stop_0 xfc0" [ style=bold color="green" fontcolor="black"] @@ -75,7 +70,6 @@ digraph "g" { "xu-test5_monitor_10000 xfc3" [ style=bold color="green" fontcolor="black"] "xu-test5_start_0 xfc3" -> "xu-test5_monitor_10000 xfc3" [ style = bold] "xu-test5_start_0 xfc3" [ style=bold color="green" fontcolor="orange"] -"xu-test5_stop_0 xfc2" -> "all_stopped" [ style = bold] "xu-test5_stop_0 xfc2" -> "load_stopped_xfc2 xfc2" [ style = bold] "xu-test5_stop_0 xfc2" -> "xu-test5_start_0 xfc3" [ style = bold] "xu-test5_stop_0 xfc2" [ style=bold color="green" fontcolor="black"] @@ -87,7 +81,6 @@ digraph "g" { "xu-test6_monitor_10000 xfc1" [ style=bold color="green" fontcolor="black"] "xu-test6_start_0 xfc1" -> "xu-test6_monitor_10000 xfc1" [ style = bold] "xu-test6_start_0 xfc1" [ style=bold color="green" fontcolor="orange"] -"xu-test6_stop_0 xfc3" -> "all_stopped" [ style = bold] "xu-test6_stop_0 xfc3" -> "load_stopped_xfc3 xfc3" [ style = bold] "xu-test6_stop_0 xfc3" -> "xu-test6_start_0 xfc1" [ style = bold] "xu-test6_stop_0 xfc3" [ style=bold color="green" fontcolor="black"] @@ -99,7 +92,6 @@ digraph "g" { "xu-test7_monitor_10000 xfc0" [ style=bold color="green" fontcolor="black"] "xu-test7_start_0 xfc0" -> "xu-test7_monitor_10000 xfc0" [ style = bold] "xu-test7_start_0 xfc0" [ style=bold color="green" fontcolor="orange"] -"xu-test7_stop_0 xfc1" -> "all_stopped" [ style = bold] "xu-test7_stop_0 xfc1" -> "load_stopped_xfc1 xfc1" [ style = bold] "xu-test7_stop_0 xfc1" -> "xu-test7_start_0 xfc0" [ style = bold] "xu-test7_stop_0 xfc1" [ style=bold color="green" fontcolor="black"] @@ -111,7 +103,6 @@ digraph "g" { "xu-test9_monitor_10000 xfc2" [ style=bold color="green" fontcolor="black"] "xu-test9_start_0 xfc2" -> "xu-test9_monitor_10000 xfc2" [ style = bold] "xu-test9_start_0 xfc2" [ style=bold color="green" fontcolor="orange"] -"xu-test9_stop_0 xfc0" -> "all_stopped" [ style = bold] "xu-test9_stop_0 xfc0" -> "load_stopped_xfc0 xfc0" [ style = bold] "xu-test9_stop_0 xfc0" -> "xu-test9_start_0 xfc2" [ style = bold] "xu-test9_stop_0 xfc0" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/load-stopped-loop-2.exp b/pengine/test10/load-stopped-loop-2.exp index f6315cb..d5c0ca3 100644 --- a/pengine/test10/load-stopped-loop-2.exp +++ b/pengine/test10/load-stopped-loop-2.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,64 +23,64 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -89,64 +89,64 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -155,64 +155,64 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -221,64 +221,64 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -287,374 +287,341 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/load-stopped-loop-2.summary b/pengine/test10/load-stopped-loop-2.summary index d4fbf14..f26cdb9 100644 --- a/pengine/test10/load-stopped-loop-2.summary +++ b/pengine/test10/load-stopped-loop-2.summary @@ -75,7 +75,6 @@ Executing cluster transition: * Resource action: xu-test6 stop on xfc3 * Resource action: xu-test7 monitor=10000 on xfc0 * Pseudo action: load_stopped_xfc3 - * Pseudo action: all_stopped * Pseudo action: xu-test12_start_0 * Pseudo action: xu-test5_start_0 * Pseudo action: xu-test6_start_0 diff --git a/pengine/test10/load-stopped-loop.dot b/pengine/test10/load-stopped-loop.dot index 28079d4..a72f67a 100644 --- a/pengine/test10/load-stopped-loop.dot +++ b/pengine/test10/load-stopped-loop.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "license.anbriz.vds-ok.com-vm_migrate_from_0 v03-a" -> "license.anbriz.vds-ok.com-vm_start_0 v03-a" [ style = bold] "license.anbriz.vds-ok.com-vm_migrate_from_0 v03-a" -> "license.anbriz.vds-ok.com-vm_stop_0 v03-b" [ style = bold] "license.anbriz.vds-ok.com-vm_migrate_from_0 v03-a" [ style=bold color="green" fontcolor="black"] @@ -8,7 +7,6 @@ digraph "g" { "license.anbriz.vds-ok.com-vm_monitor_10000 v03-a" [ style=bold color="green" fontcolor="black"] "license.anbriz.vds-ok.com-vm_start_0 v03-a" -> "license.anbriz.vds-ok.com-vm_monitor_10000 v03-a" [ style = bold] "license.anbriz.vds-ok.com-vm_start_0 v03-a" [ style=bold color="green" fontcolor="orange"] -"license.anbriz.vds-ok.com-vm_stop_0 v03-b" -> "all_stopped" [ style = bold] "license.anbriz.vds-ok.com-vm_stop_0 v03-b" -> "license.anbriz.vds-ok.com-vm_start_0 v03-a" [ style = bold] "license.anbriz.vds-ok.com-vm_stop_0 v03-b" -> "load_stopped_v03-b v03-b" [ style = bold] "license.anbriz.vds-ok.com-vm_stop_0 v03-b" [ style=bold color="green" fontcolor="black"] @@ -22,13 +20,11 @@ digraph "g" { "stonith-v03-a_monitor_60000 v03-b" [ style=bold color="green" fontcolor="black"] "stonith-v03-a_start_0 v03-b" -> "stonith-v03-a_monitor_60000 v03-b" [ style = bold] "stonith-v03-a_start_0 v03-b" [ style=bold color="green" fontcolor="black"] -"stonith-v03-a_stop_0 v03-b" -> "all_stopped" [ style = bold] "stonith-v03-a_stop_0 v03-b" -> "stonith-v03-a_start_0 v03-b" [ style = bold] "stonith-v03-a_stop_0 v03-b" [ style=bold color="green" fontcolor="black"] "stonith-v03-b_monitor_60000 v03-a" [ style=bold color="green" fontcolor="black"] "stonith-v03-b_start_0 v03-a" -> "stonith-v03-b_monitor_60000 v03-a" [ style = bold] "stonith-v03-b_start_0 v03-a" [ style=bold color="green" fontcolor="black"] -"stonith-v03-b_stop_0 v03-a" -> "all_stopped" [ style = bold] "stonith-v03-b_stop_0 v03-a" -> "stonith-v03-b_start_0 v03-a" [ style = bold] "stonith-v03-b_stop_0 v03-a" [ style=bold color="green" fontcolor="black"] "terminal0.anbriz.vds-ok.com-vm_migrate_from_0 v03-b" -> "terminal0.anbriz.vds-ok.com-vm_start_0 v03-b" [ style = bold] @@ -39,7 +35,6 @@ digraph "g" { "terminal0.anbriz.vds-ok.com-vm_monitor_10000 v03-b" [ style=bold color="green" fontcolor="black"] "terminal0.anbriz.vds-ok.com-vm_start_0 v03-b" -> "terminal0.anbriz.vds-ok.com-vm_monitor_10000 v03-b" [ style = bold] "terminal0.anbriz.vds-ok.com-vm_start_0 v03-b" [ style=bold color="green" fontcolor="orange"] -"terminal0.anbriz.vds-ok.com-vm_stop_0 v03-a" -> "all_stopped" [ style = bold] "terminal0.anbriz.vds-ok.com-vm_stop_0 v03-a" -> "load_stopped_v03-a v03-a" [ style = bold] "terminal0.anbriz.vds-ok.com-vm_stop_0 v03-a" -> "terminal0.anbriz.vds-ok.com-vm_start_0 v03-b" [ style = bold] "terminal0.anbriz.vds-ok.com-vm_stop_0 v03-a" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/load-stopped-loop.exp b/pengine/test10/load-stopped-loop.exp index 2d12452..0b852f0 100644 --- a/pengine/test10/load-stopped-loop.exp +++ b/pengine/test10/load-stopped-loop.exp @@ -1,7 +1,7 @@ - + @@ -17,13 +17,13 @@ - + - + @@ -39,13 +39,13 @@ - + - + @@ -61,13 +61,13 @@ - + - + @@ -83,13 +83,13 @@ - + - + @@ -105,13 +105,13 @@ - + - + @@ -127,13 +127,13 @@ - + - + @@ -142,14 +142,14 @@ - + - + @@ -162,13 +162,13 @@ - + - + @@ -177,14 +177,14 @@ - + - + @@ -197,26 +197,26 @@ - + - + - + - + @@ -225,147 +225,147 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -373,46 +373,25 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/load-stopped-loop.summary b/pengine/test10/load-stopped-loop.summary index 93e675d..076386e 100644 --- a/pengine/test10/load-stopped-loop.summary +++ b/pengine/test10/load-stopped-loop.summary @@ -183,7 +183,6 @@ Executing cluster transition: * Resource action: terminal0.anbriz.vds-ok.com-vm migrate_from on v03-b * Resource action: terminal0.anbriz.vds-ok.com-vm stop on v03-a * Pseudo action: load_stopped_v03-a - * Pseudo action: all_stopped * Pseudo action: license.anbriz.vds-ok.com-vm_start_0 * Pseudo action: terminal0.anbriz.vds-ok.com-vm_start_0 * Resource action: vd01-d.cdev.ttc.prague.cz.vds-ok.com-vm start on v03-a diff --git a/pengine/test10/location-sets-templates.exp b/pengine/test10/location-sets-templates.exp index ad8ea50..4a3b39a 100644 --- a/pengine/test10/location-sets-templates.exp +++ b/pengine/test10/location-sets-templates.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,23 +35,23 @@ - + - + - + - + @@ -60,7 +60,7 @@ - + @@ -69,23 +69,23 @@ - + - + - + - + @@ -94,7 +94,7 @@ - + @@ -103,23 +103,23 @@ - + - + - + - + @@ -128,7 +128,7 @@ - + @@ -137,23 +137,23 @@ - + - + - + - + @@ -162,7 +162,7 @@ - + @@ -171,23 +171,23 @@ - + - + - + - + @@ -196,7 +196,7 @@ - + diff --git a/pengine/test10/managed-0.exp b/pengine/test10/managed-0.exp index ee9667c..137ae92 100644 --- a/pengine/test10/managed-0.exp +++ b/pengine/test10/managed-0.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -145,7 +145,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -226,7 +226,7 @@ - + @@ -235,7 +235,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -271,7 +271,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -289,7 +289,7 @@ - + @@ -298,7 +298,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -316,7 +316,7 @@ - + @@ -325,7 +325,7 @@ - + @@ -334,7 +334,7 @@ - + @@ -343,7 +343,7 @@ - + @@ -352,7 +352,7 @@ - + @@ -361,7 +361,7 @@ - + @@ -370,7 +370,7 @@ - + @@ -379,7 +379,7 @@ - + @@ -388,7 +388,7 @@ - + @@ -397,7 +397,7 @@ - + @@ -406,7 +406,7 @@ - + @@ -415,7 +415,7 @@ - + @@ -424,7 +424,7 @@ - + @@ -433,7 +433,7 @@ - + @@ -442,7 +442,7 @@ - + @@ -451,7 +451,7 @@ - + @@ -460,7 +460,7 @@ - + @@ -469,7 +469,7 @@ - + @@ -478,7 +478,7 @@ - + @@ -487,7 +487,7 @@ - + @@ -496,7 +496,7 @@ - + @@ -505,7 +505,7 @@ - + @@ -514,7 +514,7 @@ - + @@ -523,7 +523,7 @@ - + @@ -532,7 +532,7 @@ - + @@ -541,7 +541,7 @@ - + @@ -550,7 +550,7 @@ - + @@ -559,7 +559,7 @@ - + @@ -568,7 +568,7 @@ - + @@ -577,7 +577,7 @@ - + @@ -586,7 +586,7 @@ - + @@ -595,7 +595,7 @@ - + @@ -604,7 +604,7 @@ - + @@ -613,7 +613,7 @@ - + @@ -622,7 +622,7 @@ - + @@ -631,7 +631,7 @@ - + @@ -640,7 +640,7 @@ - + @@ -649,7 +649,7 @@ - + @@ -658,7 +658,7 @@ - + @@ -667,7 +667,7 @@ - + @@ -676,7 +676,7 @@ - + @@ -685,7 +685,7 @@ - + @@ -694,7 +694,7 @@ - + @@ -703,7 +703,7 @@ - + @@ -712,7 +712,7 @@ - + @@ -721,7 +721,7 @@ - + diff --git a/pengine/test10/managed-1.exp b/pengine/test10/managed-1.exp index ee9667c..137ae92 100644 --- a/pengine/test10/managed-1.exp +++ b/pengine/test10/managed-1.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -145,7 +145,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -226,7 +226,7 @@ - + @@ -235,7 +235,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -271,7 +271,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -289,7 +289,7 @@ - + @@ -298,7 +298,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -316,7 +316,7 @@ - + @@ -325,7 +325,7 @@ - + @@ -334,7 +334,7 @@ - + @@ -343,7 +343,7 @@ - + @@ -352,7 +352,7 @@ - + @@ -361,7 +361,7 @@ - + @@ -370,7 +370,7 @@ - + @@ -379,7 +379,7 @@ - + @@ -388,7 +388,7 @@ - + @@ -397,7 +397,7 @@ - + @@ -406,7 +406,7 @@ - + @@ -415,7 +415,7 @@ - + @@ -424,7 +424,7 @@ - + @@ -433,7 +433,7 @@ - + @@ -442,7 +442,7 @@ - + @@ -451,7 +451,7 @@ - + @@ -460,7 +460,7 @@ - + @@ -469,7 +469,7 @@ - + @@ -478,7 +478,7 @@ - + @@ -487,7 +487,7 @@ - + @@ -496,7 +496,7 @@ - + @@ -505,7 +505,7 @@ - + @@ -514,7 +514,7 @@ - + @@ -523,7 +523,7 @@ - + @@ -532,7 +532,7 @@ - + @@ -541,7 +541,7 @@ - + @@ -550,7 +550,7 @@ - + @@ -559,7 +559,7 @@ - + @@ -568,7 +568,7 @@ - + @@ -577,7 +577,7 @@ - + @@ -586,7 +586,7 @@ - + @@ -595,7 +595,7 @@ - + @@ -604,7 +604,7 @@ - + @@ -613,7 +613,7 @@ - + @@ -622,7 +622,7 @@ - + @@ -631,7 +631,7 @@ - + @@ -640,7 +640,7 @@ - + @@ -649,7 +649,7 @@ - + @@ -658,7 +658,7 @@ - + @@ -667,7 +667,7 @@ - + @@ -676,7 +676,7 @@ - + @@ -685,7 +685,7 @@ - + @@ -694,7 +694,7 @@ - + @@ -703,7 +703,7 @@ - + @@ -712,7 +712,7 @@ - + @@ -721,7 +721,7 @@ - + diff --git a/pengine/test10/managed-2.exp b/pengine/test10/managed-2.exp index 8afe373..5708498 100644 --- a/pengine/test10/managed-2.exp +++ b/pengine/test10/managed-2.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -145,7 +145,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -226,7 +226,7 @@ - + @@ -235,7 +235,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -271,7 +271,7 @@ - + @@ -280,7 +280,7 @@ - + @@ -289,7 +289,7 @@ - + @@ -298,7 +298,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -316,7 +316,7 @@ - + @@ -325,7 +325,7 @@ - + @@ -334,7 +334,7 @@ - + @@ -343,7 +343,7 @@ - + @@ -352,7 +352,7 @@ - + @@ -361,7 +361,7 @@ - + @@ -370,7 +370,7 @@ - + @@ -379,7 +379,7 @@ - + @@ -388,7 +388,7 @@ - + @@ -397,7 +397,7 @@ - + @@ -406,7 +406,7 @@ - + @@ -415,7 +415,7 @@ - + @@ -424,7 +424,7 @@ - + @@ -433,7 +433,7 @@ - + @@ -442,7 +442,7 @@ - + @@ -451,7 +451,7 @@ - + @@ -460,7 +460,7 @@ - + @@ -469,7 +469,7 @@ - + @@ -478,7 +478,7 @@ - + @@ -487,7 +487,7 @@ - + @@ -496,7 +496,7 @@ - + @@ -505,7 +505,7 @@ - + @@ -514,7 +514,7 @@ - + @@ -523,7 +523,7 @@ - + @@ -532,7 +532,7 @@ - + @@ -541,7 +541,7 @@ - + @@ -550,7 +550,7 @@ - + @@ -559,7 +559,7 @@ - + @@ -568,7 +568,7 @@ - + @@ -577,7 +577,7 @@ - + @@ -586,7 +586,7 @@ - + @@ -595,7 +595,7 @@ - + @@ -604,7 +604,7 @@ - + @@ -613,7 +613,7 @@ - + @@ -622,7 +622,7 @@ - + @@ -631,7 +631,7 @@ - + @@ -640,7 +640,7 @@ - + @@ -649,7 +649,7 @@ - + @@ -658,7 +658,7 @@ - + @@ -667,7 +667,7 @@ - + @@ -676,7 +676,7 @@ - + @@ -685,7 +685,7 @@ - + @@ -694,7 +694,7 @@ - + @@ -703,7 +703,7 @@ - + @@ -712,7 +712,7 @@ - + @@ -721,7 +721,7 @@ - + @@ -730,7 +730,7 @@ - + @@ -739,7 +739,7 @@ - + @@ -748,7 +748,7 @@ - + @@ -757,7 +757,7 @@ - + @@ -766,7 +766,7 @@ - + @@ -775,7 +775,7 @@ - + @@ -784,7 +784,7 @@ - + @@ -793,7 +793,7 @@ - + @@ -802,7 +802,7 @@ - + @@ -811,7 +811,7 @@ - + @@ -820,7 +820,7 @@ - + @@ -829,7 +829,7 @@ - + @@ -838,7 +838,7 @@ - + @@ -847,7 +847,7 @@ - + @@ -856,7 +856,7 @@ - + @@ -865,7 +865,7 @@ - + @@ -874,7 +874,7 @@ - + @@ -883,7 +883,7 @@ - + @@ -892,7 +892,7 @@ - + @@ -901,7 +901,7 @@ - + @@ -910,7 +910,7 @@ - + @@ -919,7 +919,7 @@ - + @@ -928,7 +928,7 @@ - + @@ -937,7 +937,7 @@ - + @@ -946,7 +946,7 @@ - + @@ -955,7 +955,7 @@ - + @@ -964,7 +964,7 @@ - + @@ -973,7 +973,7 @@ - + @@ -982,7 +982,7 @@ - + @@ -991,7 +991,7 @@ - + @@ -1000,7 +1000,7 @@ - + @@ -1009,7 +1009,7 @@ - + @@ -1018,7 +1018,7 @@ - + @@ -1027,7 +1027,7 @@ - + diff --git a/pengine/test10/master-0.exp b/pengine/test10/master-0.exp index 410b0fa..22c2847 100644 --- a/pengine/test10/master-0.exp +++ b/pengine/test10/master-0.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,7 +23,7 @@ - + @@ -32,20 +32,20 @@ - + - + - + @@ -54,7 +54,7 @@ - + @@ -63,20 +63,20 @@ - + - + - + @@ -85,7 +85,7 @@ - + @@ -94,20 +94,20 @@ - + - + - + @@ -116,7 +116,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -134,7 +134,7 @@ - + @@ -143,64 +143,64 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/master-1.exp b/pengine/test10/master-1.exp index 7d2f1e5..81badd1 100644 --- a/pengine/test10/master-1.exp +++ b/pengine/test10/master-1.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,7 +23,7 @@ - + @@ -32,36 +32,36 @@ - + - + - + - + - + - + @@ -70,7 +70,7 @@ - + @@ -79,20 +79,20 @@ - + - + - + @@ -101,7 +101,7 @@ - + @@ -110,20 +110,20 @@ - + - + - + @@ -132,7 +132,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -159,88 +159,88 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/master-10.exp b/pengine/test10/master-10.exp index 320391c..29ba0fa 100644 --- a/pengine/test10/master-10.exp +++ b/pengine/test10/master-10.exp @@ -1,97 +1,97 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -100,7 +100,7 @@ - + @@ -109,78 +109,78 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -189,7 +189,7 @@ - + @@ -198,78 +198,78 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -278,7 +278,7 @@ - + @@ -287,97 +287,97 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -386,7 +386,7 @@ - + @@ -395,7 +395,7 @@ - + @@ -404,7 +404,7 @@ - + @@ -413,163 +413,163 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -577,67 +577,67 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/master-11.exp b/pengine/test10/master-11.exp index 02acb64..15abe6d 100644 --- a/pengine/test10/master-11.exp +++ b/pengine/test10/master-11.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,20 +35,20 @@ - + - + - + @@ -57,7 +57,7 @@ - + @@ -66,36 +66,36 @@ - + - + - + - + - + - + @@ -104,7 +104,7 @@ - + @@ -113,64 +113,64 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/master-12.exp b/pengine/test10/master-12.exp index 571d338..6606f4e 100644 --- a/pengine/test10/master-12.exp +++ b/pengine/test10/master-12.exp @@ -1,32 +1,32 @@ - + - + - + - + - + diff --git a/pengine/test10/master-13.exp b/pengine/test10/master-13.exp index 94b8d59..cc1e1b8 100644 --- a/pengine/test10/master-13.exp +++ b/pengine/test10/master-13.exp @@ -1,78 +1,78 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -82,7 +82,7 @@ - + @@ -97,78 +97,78 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -178,7 +178,7 @@ - + @@ -193,58 +193,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -252,190 +252,190 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/master-2.exp b/pengine/test10/master-2.exp index 3174cf8..75c61d9 100644 --- a/pengine/test10/master-2.exp +++ b/pengine/test10/master-2.exp @@ -1,75 +1,75 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -78,7 +78,7 @@ - + @@ -87,59 +87,59 @@ - + - + - + - + - + - + - + - + - + @@ -148,7 +148,7 @@ - + @@ -157,59 +157,59 @@ - + - + - + - + - + - + - + - + - + @@ -218,7 +218,7 @@ - + @@ -227,75 +227,75 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -304,7 +304,7 @@ - + @@ -313,7 +313,7 @@ - + @@ -322,7 +322,7 @@ - + @@ -331,163 +331,163 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -495,67 +495,67 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/master-3.exp b/pengine/test10/master-3.exp index 7d2f1e5..81badd1 100644 --- a/pengine/test10/master-3.exp +++ b/pengine/test10/master-3.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,7 +23,7 @@ - + @@ -32,36 +32,36 @@ - + - + - + - + - + - + @@ -70,7 +70,7 @@ - + @@ -79,20 +79,20 @@ - + - + - + @@ -101,7 +101,7 @@ - + @@ -110,20 +110,20 @@ - + - + - + @@ -132,7 +132,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -159,88 +159,88 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/master-4.exp b/pengine/test10/master-4.exp index ee273e6..0f78eba 100644 --- a/pengine/test10/master-4.exp +++ b/pengine/test10/master-4.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,20 +82,20 @@ - + - + - + @@ -105,7 +105,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -165,7 +165,7 @@ - + @@ -174,7 +174,7 @@ - + @@ -183,7 +183,7 @@ - + @@ -192,7 +192,7 @@ - + @@ -201,7 +201,7 @@ - + @@ -210,7 +210,7 @@ - + @@ -219,7 +219,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -237,7 +237,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -264,7 +264,7 @@ - + @@ -273,7 +273,7 @@ - + @@ -282,19 +282,19 @@ - + - + - + diff --git a/pengine/test10/master-5.exp b/pengine/test10/master-5.exp index 9188bb5..f623e82 100644 --- a/pengine/test10/master-5.exp +++ b/pengine/test10/master-5.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -145,7 +145,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -217,7 +217,7 @@ - + @@ -226,7 +226,7 @@ - + @@ -235,7 +235,7 @@ - + diff --git a/pengine/test10/master-6.exp b/pengine/test10/master-6.exp index 6bfa184..aaee72d 100644 --- a/pengine/test10/master-6.exp +++ b/pengine/test10/master-6.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -145,7 +145,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -208,7 +208,7 @@ - + diff --git a/pengine/test10/master-7.dot b/pengine/test10/master-7.dot index 51fcfd8..cd89c08 100644 --- a/pengine/test10/master-7.dot +++ b/pengine/test10/master-7.dot @@ -3,15 +3,12 @@ digraph "g" { "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" ] @@ -35,7 +32,6 @@ digraph "g" { "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] @@ -43,7 +39,6 @@ digraph "g" { "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] @@ -61,7 +56,6 @@ digraph "g" { "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" ] @@ -69,7 +63,6 @@ digraph "g" { "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] @@ -77,13 +70,11 @@ digraph "g" { "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" [ style=bold color="green" fontcolor="black" ] "ocf_msdummy:4_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ] "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" ] @@ -95,25 +86,21 @@ digraph "g" { "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_start_0 c001n03" [ style = bold] "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" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold] +"stonith 'reboot' c001n01" -> "lsb_dummy_start_0 c001n08" [ style = bold] "stonith 'reboot' c001n01" -> "master_rsc_1_stop_0" [ style = bold] +"stonith 'reboot' c001n01" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold] +"stonith 'reboot' c001n01" -> "ocf_192.168.100.183_start_0 c001n02" [ 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_start_0 c001n03" [ 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 33b5d49..05abae6 100644 --- a/pengine/test10/master-7.exp +++ b/pengine/test10/master-7.exp @@ -1,36 +1,36 @@ - + - + - + - + - + - + @@ -42,28 +42,28 @@ - + - + - + - + - + - + @@ -71,88 +71,88 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -161,13 +161,13 @@ - + - + @@ -176,22 +176,22 @@ - + - + - + - + - + @@ -200,93 +200,93 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -295,36 +295,36 @@ - + - + - + - + - + - + @@ -336,7 +336,7 @@ - + @@ -345,13 +345,13 @@ - + - + @@ -360,7 +360,7 @@ - + @@ -369,7 +369,7 @@ - + @@ -378,7 +378,7 @@ - + @@ -387,22 +387,22 @@ - + - + - + - + @@ -414,7 +414,7 @@ - + @@ -423,16 +423,16 @@ - + - + - + @@ -441,13 +441,13 @@ - + - + @@ -456,13 +456,13 @@ - + - + @@ -471,7 +471,7 @@ - + @@ -480,7 +480,7 @@ - + @@ -489,7 +489,7 @@ - + @@ -498,7 +498,7 @@ - + @@ -507,7 +507,7 @@ - + @@ -516,7 +516,7 @@ - + @@ -525,7 +525,7 @@ - + @@ -534,7 +534,7 @@ - + @@ -543,22 +543,22 @@ - + - + - + - + @@ -566,25 +566,25 @@ - + - + - + - + - + @@ -593,63 +593,12 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/master-7.summary b/pengine/test10/master-7.summary index 105966f..db72e40 100644 --- a/pengine/test10/master-7.summary +++ b/pengine/test10/master-7.summary @@ -61,29 +61,27 @@ Executing cluster transition: * Fencing c001n01 (reboot) * Pseudo action: DcIPaddr_stop_0 * Resource action: heartbeat_192.168.100.182 stop on c001n03 + * Resource action: lsb_dummy start on c001n08 * Pseudo action: rsc_c001n01_stop_0 * Pseudo action: DoFencing_stop_0 * Pseudo action: ocf_msdummy:0_demote_0 * Pseudo action: master_rsc_1_demoted_0 * Pseudo action: master_rsc_1_stop_0 - * Pseudo action: stonith_complete * Resource action: DcIPaddr start on c001n03 * Resource action: ocf_192.168.100.181 stop on c001n03 - * Resource action: lsb_dummy start on c001n08 + * Resource action: lsb_dummy monitor=5000 on c001n08 * Resource action: rsc_c001n01 start on c001n03 * Pseudo action: child_DoFencing:0_stop_0 * Pseudo action: DoFencing_stopped_0 * Pseudo action: ocf_msdummy:0_stop_0 * Pseudo action: ocf_msdummy:4_stop_0 * Pseudo action: master_rsc_1_stopped_0 - * Pseudo action: all_stopped * Resource action: DcIPaddr monitor=5000 on c001n03 * Pseudo action: group-1_stopped_0 * Pseudo action: group-1_start_0 * Resource action: ocf_192.168.100.181 start on c001n02 * Resource action: heartbeat_192.168.100.182 start on c001n02 * Resource action: ocf_192.168.100.183 start on c001n02 - * Resource action: lsb_dummy monitor=5000 on c001n08 * Resource action: rsc_c001n01 monitor=5000 on c001n03 * Pseudo action: group-1_running_0 * Resource action: ocf_192.168.100.181 monitor=5000 on c001n02 diff --git a/pengine/test10/master-8.dot b/pengine/test10/master-8.dot index 2df01e0..58909fe 100644 --- a/pengine/test10/master-8.dot +++ b/pengine/test10/master-8.dot @@ -3,15 +3,12 @@ digraph "g" { "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" ] @@ -35,7 +32,6 @@ digraph "g" { "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] @@ -43,7 +39,6 @@ digraph "g" { "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] @@ -66,7 +61,6 @@ digraph "g" { "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" ] @@ -74,7 +68,6 @@ digraph "g" { "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] @@ -87,7 +80,6 @@ digraph "g" { "ocf_msdummy:0_start_0 c001n03" -> "master_rsc_1_running_0" [ style = bold] "ocf_msdummy:0_start_0 c001n03" -> "ocf_msdummy:0_monitor_5000 c001n03" [ style = bold] "ocf_msdummy:0_start_0 c001n03" [ style=bold color="green" fontcolor="black" ] -"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" -> "ocf_msdummy:0_start_0 c001n03" [ style = bold] "ocf_msdummy:0_stop_0 c001n01" [ style=bold color="green" fontcolor="orange" ] @@ -114,25 +106,21 @@ digraph "g" { "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_start_0 c001n03" [ style = bold] "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" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold] +"stonith 'reboot' c001n01" -> "lsb_dummy_start_0 c001n08" [ style = bold] "stonith 'reboot' c001n01" -> "master_rsc_1_stop_0" [ style = bold] +"stonith 'reboot' c001n01" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold] +"stonith 'reboot' c001n01" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold] "stonith 'reboot' c001n01" -> "ocf_msdummy:0_demote_0 c001n01" [ style = bold] +"stonith 'reboot' c001n01" -> "ocf_msdummy:0_start_0 c001n03" [ style = bold] "stonith 'reboot' c001n01" -> "ocf_msdummy:0_stop_0 c001n01" [ style = bold] +"stonith 'reboot' c001n01" -> "rsc_c001n01_start_0 c001n03" [ 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" -> "ocf_msdummy:0_start_0 c001n03" [ 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-8.exp b/pengine/test10/master-8.exp index e680354..477dbf8 100644 --- a/pengine/test10/master-8.exp +++ b/pengine/test10/master-8.exp @@ -1,36 +1,36 @@ - + - + - + - + - + - + @@ -42,28 +42,28 @@ - + - + - + - + - + - + @@ -71,88 +71,88 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -161,13 +161,13 @@ - + - + @@ -176,22 +176,22 @@ - + - + - + - + - + @@ -200,93 +200,93 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -295,36 +295,36 @@ - + - + - + - + - + - + @@ -336,7 +336,7 @@ - + @@ -345,13 +345,13 @@ - + - + @@ -360,7 +360,7 @@ - + @@ -369,7 +369,7 @@ - + @@ -378,7 +378,7 @@ - + @@ -387,22 +387,22 @@ - + - + - + - + @@ -414,42 +414,42 @@ - + - + - + - + - + - + - + - + @@ -458,16 +458,16 @@ - + - + - + @@ -476,13 +476,13 @@ - + - + @@ -491,7 +491,7 @@ - + @@ -500,7 +500,7 @@ - + @@ -509,7 +509,7 @@ - + @@ -518,7 +518,7 @@ - + @@ -527,7 +527,7 @@ - + @@ -536,7 +536,7 @@ - + @@ -545,7 +545,7 @@ - + @@ -554,7 +554,7 @@ - + @@ -563,7 +563,7 @@ - + @@ -572,22 +572,22 @@ - + - + - + - + @@ -595,22 +595,22 @@ - + - + - + - + @@ -619,120 +619,72 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/master-8.summary b/pengine/test10/master-8.summary index 5792e16..1d189c8 100644 --- a/pengine/test10/master-8.summary +++ b/pengine/test10/master-8.summary @@ -61,29 +61,27 @@ Executing cluster transition: * Fencing c001n01 (reboot) * Pseudo action: DcIPaddr_stop_0 * Resource action: heartbeat_192.168.100.182 stop on c001n03 + * Resource action: lsb_dummy start on c001n08 * Pseudo action: rsc_c001n01_stop_0 * Pseudo action: DoFencing_stop_0 * Pseudo action: ocf_msdummy:0_demote_0 * Pseudo action: master_rsc_1_demoted_0 * Pseudo action: master_rsc_1_stop_0 - * Pseudo action: stonith_complete * Resource action: DcIPaddr start on c001n03 * Resource action: ocf_192.168.100.181 stop on c001n03 - * Resource action: lsb_dummy start on c001n08 + * Resource action: lsb_dummy monitor=5000 on c001n08 * Resource action: rsc_c001n01 start on c001n03 * Pseudo action: child_DoFencing:0_stop_0 * Pseudo action: DoFencing_stopped_0 * Pseudo action: ocf_msdummy:0_stop_0 * Pseudo action: master_rsc_1_stopped_0 * Pseudo action: master_rsc_1_start_0 - * Pseudo action: all_stopped * Resource action: DcIPaddr monitor=5000 on c001n03 * Pseudo action: group-1_stopped_0 * Pseudo action: group-1_start_0 * Resource action: ocf_192.168.100.181 start on c001n02 * Resource action: heartbeat_192.168.100.182 start on c001n02 * Resource action: ocf_192.168.100.183 start on c001n02 - * Resource action: lsb_dummy monitor=5000 on c001n08 * Resource action: rsc_c001n01 monitor=5000 on c001n03 * Resource action: ocf_msdummy:0 start on c001n03 * Pseudo action: master_rsc_1_running_0 diff --git a/pengine/test10/master-9.dot b/pengine/test10/master-9.dot index 343bb2d..16e756e 100644 --- a/pengine/test10/master-9.dot +++ b/pengine/test10/master-9.dot @@ -4,10 +4,8 @@ "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" [ 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" ] diff --git a/pengine/test10/master-9.exp b/pengine/test10/master-9.exp index e845751..f2b0ba5 100644 --- a/pengine/test10/master-9.exp +++ b/pengine/test10/master-9.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,7 +23,7 @@ - + @@ -32,7 +32,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -59,22 +59,22 @@ - + - + - + - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -145,7 +145,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -172,7 +172,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -199,19 +199,7 @@ - - - - - - - - - - - - - + diff --git a/pengine/test10/master-9.summary b/pengine/test10/master-9.summary index 9554242..29a23d2 100644 --- a/pengine/test10/master-9.summary +++ b/pengine/test10/master-9.summary @@ -66,7 +66,6 @@ Executing cluster transition: * Resource action: child_DoFencing:1 stop on ibm1 * Pseudo action: DoFencing_stopped_0 * Cluster action: do_shutdown on ibm1 - * Pseudo action: all_stopped Revised cluster status: Node sgi2 (619e8a37-147a-4782-ac11-46afad7c32b8): UNCLEAN (offline) diff --git a/pengine/test10/master-asymmetrical-order.dot b/pengine/test10/master-asymmetrical-order.dot index e088f46..7385f4a 100644 --- a/pengine/test10/master-asymmetrical-order.dot +++ b/pengine/test10/master-asymmetrical-order.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "ms1_demote_0" -> "ms1_demoted_0" [ style = bold] "ms1_demote_0" -> "rsc1:0_demote_0 node1" [ style = bold] "ms1_demote_0" [ style=bold color="green" fontcolor="orange"] @@ -14,10 +13,8 @@ digraph "g" { "rsc1:0_demote_0 node1" -> "ms1_demoted_0" [ style = bold] "rsc1:0_demote_0 node1" -> "rsc1:0_stop_0 node1" [ style = bold] "rsc1:0_demote_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc1:0_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1:0_stop_0 node1" -> "ms1_stopped_0" [ style = bold] "rsc1:0_stop_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc1:1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1:1_stop_0 node2" -> "ms1_stopped_0" [ style = bold] "rsc1:1_stop_0 node2" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/master-asymmetrical-order.exp b/pengine/test10/master-asymmetrical-order.exp index 32ae2e3..82fd9ee 100644 --- a/pengine/test10/master-asymmetrical-order.exp +++ b/pengine/test10/master-asymmetrical-order.exp @@ -1,64 +1,64 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -66,46 +66,31 @@ - + - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/master-asymmetrical-order.summary b/pengine/test10/master-asymmetrical-order.summary index 50f717e..af13024 100644 --- a/pengine/test10/master-asymmetrical-order.summary +++ b/pengine/test10/master-asymmetrical-order.summary @@ -22,7 +22,6 @@ Executing cluster transition: * Resource action: rsc1:0 stop on node1 * Resource action: rsc1:1 stop on node2 * Pseudo action: ms1_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/master-colocation.exp b/pengine/test10/master-colocation.exp index fe7d857..01d69ea 100644 --- a/pengine/test10/master-colocation.exp +++ b/pengine/test10/master-colocation.exp @@ -1,7 +1,7 @@ - + @@ -10,45 +10,45 @@ - + - + - + - + - + - + - + diff --git a/pengine/test10/master-demote-2.dot b/pengine/test10/master-demote-2.dot index f1cddd1..bcf1af9 100644 --- a/pengine/test10/master-demote-2.dot +++ b/pengine/test10/master-demote-2.dot @@ -1,7 +1,6 @@ digraph "g" { "Cancel stateful-1:0_monitor_15000 pcmk-2" -> "stateful-1:0_promote_0 pcmk-2" [ style = bold] "Cancel stateful-1:0_monitor_15000 pcmk-2" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "group-1_running_0" -> "lsb-dummy_start_0 pcmk-2" [ style = bold] "group-1_running_0" [ style=bold color="green" fontcolor="orange"] "group-1_start_0" -> "group-1_running_0" [ style = bold] @@ -49,7 +48,6 @@ digraph "g" { "stateful-1:1_start_0 pcmk-1" -> "master-1_running_0" [ style = bold] "stateful-1:1_start_0 pcmk-1" -> "stateful-1:1_monitor_15000 pcmk-1" [ style = bold] "stateful-1:1_start_0 pcmk-1" [ style=bold color="green" fontcolor="black"] -"stateful-1:1_stop_0 pcmk-1" -> "all_stopped" [ style = bold] "stateful-1:1_stop_0 pcmk-1" -> "master-1_stopped_0" [ style = bold] "stateful-1:1_stop_0 pcmk-1" -> "stateful-1:1_start_0 pcmk-1" [ style = bold] "stateful-1:1_stop_0 pcmk-1" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/master-demote-2.exp b/pengine/test10/master-demote-2.exp index 794e74c..c6aa2b9 100644 --- a/pengine/test10/master-demote-2.exp +++ b/pengine/test10/master-demote-2.exp @@ -1,163 +1,163 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -167,7 +167,7 @@ - + @@ -180,26 +180,26 @@ - + - + - + - + @@ -209,7 +209,7 @@ - + @@ -224,34 +224,34 @@ - + - + - + - + - + - + @@ -260,13 +260,13 @@ - + - + @@ -274,40 +274,28 @@ - + - + - + - + - - - - - - - - - - - - - + diff --git a/pengine/test10/master-demote-2.summary b/pengine/test10/master-demote-2.summary index 02fe055..ef232d3 100644 --- a/pengine/test10/master-demote-2.summary +++ b/pengine/test10/master-demote-2.summary @@ -33,7 +33,6 @@ Executing cluster transition: * Resource action: stateful-1:1 stop on pcmk-1 * Pseudo action: master-1_stopped_0 * Pseudo action: master-1_start_0 - * Pseudo action: all_stopped * Resource action: stateful-1:1 start on pcmk-1 * Pseudo action: master-1_running_0 * Resource action: stateful-1:1 monitor=15000 on pcmk-1 diff --git a/pengine/test10/master-demote-block.exp b/pengine/test10/master-demote-block.exp index 935837b..f7d72b7 100644 --- a/pengine/test10/master-demote-block.exp +++ b/pengine/test10/master-demote-block.exp @@ -1,7 +1,7 @@ - + diff --git a/pengine/test10/master-demote.dot b/pengine/test10/master-demote.dot index 49034ef..aaaf756 100644 --- a/pengine/test10/master-demote.dot +++ b/pengine/test10/master-demote.dot @@ -1,8 +1,6 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "named_address_start_0 cxb1" -> "named_drbd_promote_0" [ style = bold] "named_address_start_0 cxb1" [ style=bold color="green" fontcolor="black" ] -"named_address_stop_0 cxa1" -> "all_stopped" [ style = bold] "named_address_stop_0 cxa1" -> "named_address_start_0 cxb1" [ style = bold] "named_address_stop_0 cxa1" [ style=bold color="green" fontcolor="black" ] "named_drbd_confirmed-post_notify_promoted_0" -> "named_drbd_node:0_monitor_10000 cxb1" [ style = bold] diff --git a/pengine/test10/master-demote.exp b/pengine/test10/master-demote.exp index 91cd0bc..0b36916 100644 --- a/pengine/test10/master-demote.exp +++ b/pengine/test10/master-demote.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,139 +23,139 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -163,40 +163,28 @@ - + - + - + - + - - - - - - - - - - - - - + diff --git a/pengine/test10/master-demote.summary b/pengine/test10/master-demote.summary index b50fb90..065c01d 100644 --- a/pengine/test10/master-demote.summary +++ b/pengine/test10/master-demote.summary @@ -29,7 +29,6 @@ Transition Summary: Executing cluster transition: * Resource action: named_address stop on cxa1 * Pseudo action: named_drbd_pre_notify_promote_0 - * Pseudo action: all_stopped * Resource action: named_address start on cxb1 * Resource action: named_drbd_node:1 notify on cxa1 * Resource action: named_drbd_node:0 notify on cxb1 diff --git a/pengine/test10/master-depend.exp b/pengine/test10/master-depend.exp index c50e7a5..9f3e5f1 100644 --- a/pengine/test10/master-depend.exp +++ b/pengine/test10/master-depend.exp @@ -1,49 +1,49 @@ - + - + - + - + - + - + - + - + @@ -52,49 +52,49 @@ - + - + - + - + - + - + - + - + - + @@ -102,50 +102,50 @@ - + - + - + - + - + - + - + - + - + @@ -154,34 +154,34 @@ - + - + - + - + - + - + @@ -190,7 +190,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -217,7 +217,7 @@ - + diff --git a/pengine/test10/master-dependent-ban.exp b/pengine/test10/master-dependent-ban.exp index caea6e3..a244618 100644 --- a/pengine/test10/master-dependent-ban.exp +++ b/pengine/test10/master-dependent-ban.exp @@ -1,152 +1,152 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -154,38 +154,38 @@ - + - + - + - + - + - + diff --git a/pengine/test10/master-failed-demote-2.dot b/pengine/test10/master-failed-demote-2.dot index feed14d..7666253 100644 --- a/pengine/test10/master-failed-demote-2.dot +++ b/pengine/test10/master-failed-demote-2.dot @@ -3,7 +3,6 @@ digraph "g" { "Cancel stateful-1:1_monitor_20000 dl380g5a" [ style=bold color="green" fontcolor="black" ] "Cancel stateful-2:1_monitor_20000 dl380g5a" -> "stateful-2:1_promote_0 dl380g5a" [ style = bold] "Cancel stateful-2:1_monitor_20000 dl380g5a" [ style=bold color="green" fontcolor="black" ] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "group:0_stop_0" -> "group:0_stopped_0" [ style = bold] "group:0_stop_0" -> "stateful-1:0_stop_0 dl380g5b" [ style = bold] "group:0_stop_0" [ style=bold color="green" fontcolor="orange" ] @@ -22,7 +21,6 @@ digraph "g" { "ms-sf_stop_0" [ style=bold color="green" fontcolor="orange" ] "ms-sf_stopped_0" -> "ms-sf_promote_0" [ style = bold] "ms-sf_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"stateful-1:0_stop_0 dl380g5b" -> "all_stopped" [ style = bold] "stateful-1:0_stop_0 dl380g5b" -> "group:0_stopped_0" [ style = bold] "stateful-1:0_stop_0 dl380g5b" [ style=bold color="green" fontcolor="black" ] "stateful-1:1_monitor_10000 dl380g5a" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/master-failed-demote-2.exp b/pengine/test10/master-failed-demote-2.exp index 0602868..8fa7f8b 100644 --- a/pengine/test10/master-failed-demote-2.exp +++ b/pengine/test10/master-failed-demote-2.exp @@ -1,87 +1,87 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -91,7 +91,7 @@ - + @@ -106,20 +106,20 @@ - + - + - + @@ -129,10 +129,10 @@ - + - + @@ -147,62 +147,49 @@ - + - + - + - + - + - + - + - + - - - - - - - - - - - - - diff --git a/pengine/test10/master-failed-demote-2.summary b/pengine/test10/master-failed-demote-2.summary index f5f535c..d9a4f84 100644 --- a/pengine/test10/master-failed-demote-2.summary +++ b/pengine/test10/master-failed-demote-2.summary @@ -21,7 +21,6 @@ Executing cluster transition: * Pseudo action: ms-sf_stop_0 * Pseudo action: group:0_stop_0 * Resource action: stateful-1:0 stop on dl380g5b - * Pseudo action: all_stopped * Pseudo action: group:0_stopped_0 * Pseudo action: ms-sf_stopped_0 * Pseudo action: ms-sf_promote_0 diff --git a/pengine/test10/master-failed-demote.dot b/pengine/test10/master-failed-demote.dot index ddcb538..ea942af 100644 --- a/pengine/test10/master-failed-demote.dot +++ b/pengine/test10/master-failed-demote.dot @@ -3,7 +3,6 @@ digraph "g" { "Cancel stateful-1:1_monitor_20000 dl380g5a" [ style=bold color="green" fontcolor="black" ] "Cancel stateful-2:1_monitor_20000 dl380g5a" -> "stateful-2:1_promote_0 dl380g5a" [ style = bold] "Cancel stateful-2:1_monitor_20000 dl380g5a" [ style=bold color="green" fontcolor="black" ] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "group:0_stop_0" -> "group:0_stopped_0" [ style = bold] "group:0_stop_0" -> "stateful-1:0_stop_0 dl380g5b" [ style = bold] "group:0_stop_0" [ style=bold color="green" fontcolor="orange" ] @@ -17,7 +16,6 @@ digraph "g" { "ms-sf_confirmed-post_notify_promoted_0" -> "stateful-1:1_monitor_10000 dl380g5a" [ style = bold] "ms-sf_confirmed-post_notify_promoted_0" -> "stateful-2:1_monitor_10000 dl380g5a" [ style = bold] "ms-sf_confirmed-post_notify_promoted_0" [ style=bold color="green" fontcolor="orange" ] -"ms-sf_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "ms-sf_confirmed-post_notify_stopped_0" -> "ms-sf_pre_notify_promote_0" [ style = bold] "ms-sf_confirmed-post_notify_stopped_0" -> "stateful-1:1_monitor_10000 dl380g5a" [ style = bold] "ms-sf_confirmed-post_notify_stopped_0" -> "stateful-2:1_monitor_10000 dl380g5a" [ style = bold] @@ -57,7 +55,6 @@ digraph "g" { "ms-sf_stopped_0" [ style=bold color="green" fontcolor="orange" ] "stateful-1:0_pre_notify_stop_0 dl380g5b" -> "ms-sf_confirmed-pre_notify_stop_0" [ style = bold] "stateful-1:0_pre_notify_stop_0 dl380g5b" [ style=bold color="green" fontcolor="black" ] -"stateful-1:0_stop_0 dl380g5b" -> "all_stopped" [ style = bold] "stateful-1:0_stop_0 dl380g5b" -> "group:0_stopped_0" [ style = bold] "stateful-1:0_stop_0 dl380g5b" [ style=bold color="green" fontcolor="black" ] "stateful-1:1_monitor_10000 dl380g5a" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/master-failed-demote.exp b/pengine/test10/master-failed-demote.exp index 7cbfdfa..f768824 100644 --- a/pengine/test10/master-failed-demote.exp +++ b/pengine/test10/master-failed-demote.exp @@ -1,158 +1,158 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -162,7 +162,7 @@ - + @@ -177,78 +177,78 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -258,10 +258,10 @@ - + - + @@ -276,151 +276,151 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -428,43 +428,28 @@ - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/master-failed-demote.summary b/pengine/test10/master-failed-demote.summary index ec31e42..1e31e17 100644 --- a/pengine/test10/master-failed-demote.summary +++ b/pengine/test10/master-failed-demote.summary @@ -32,7 +32,6 @@ Executing cluster transition: * Resource action: stateful-1:1 notify on dl380g5a * Resource action: stateful-2:1 notify on dl380g5a * Pseudo action: ms-sf_confirmed-post_notify_stopped_0 - * Pseudo action: all_stopped * Pseudo action: ms-sf_pre_notify_promote_0 * Resource action: stateful-1:1 notify on dl380g5a * Resource action: stateful-2:1 notify on dl380g5a diff --git a/pengine/test10/master-group.exp b/pengine/test10/master-group.exp index fe175c5..7652b5e 100644 --- a/pengine/test10/master-group.exp +++ b/pengine/test10/master-group.exp @@ -1,44 +1,44 @@ - + - + - + - + - + - + - + @@ -48,7 +48,7 @@ - + @@ -63,19 +63,19 @@ - + - + - + diff --git a/pengine/test10/master-move.dot b/pengine/test10/master-move.dot index 3c4cc2e..ad916c1 100644 --- a/pengine/test10/master-move.dot +++ b/pengine/test10/master-move.dot @@ -3,13 +3,11 @@ digraph "g" { "Cancel prmDRBD:0_monitor_10000 bl460g1n13" [ style=bold color="green" fontcolor="black"] "Cancel prmDRBD:1_monitor_20000 bl460g1n14" -> "prmDRBD:1_promote_0 bl460g1n14" [ style = bold] "Cancel prmDRBD:1_monitor_20000 bl460g1n14" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "dummy01_monitor_10000 bl460g1n14" [ style=bold color="green" fontcolor="black"] "dummy01_start_0 bl460g1n14" -> "dummy01_monitor_10000 bl460g1n14" [ style = bold] "dummy01_start_0 bl460g1n14" -> "dummy02_start_0 bl460g1n14" [ style = bold] "dummy01_start_0 bl460g1n14" -> "grpDRBD_running_0" [ style = bold] "dummy01_start_0 bl460g1n14" [ style=bold color="green" fontcolor="black"] -"dummy01_stop_0 bl460g1n13" -> "all_stopped" [ style = bold] "dummy01_stop_0 bl460g1n13" -> "dummy01_start_0 bl460g1n14" [ style = bold] "dummy01_stop_0 bl460g1n13" -> "grpDRBD_stopped_0" [ style = bold] "dummy01_stop_0 bl460g1n13" [ style=bold color="green" fontcolor="black"] @@ -18,7 +16,6 @@ digraph "g" { "dummy02_start_0 bl460g1n14" -> "dummy03_start_0 bl460g1n14" [ style = bold] "dummy02_start_0 bl460g1n14" -> "grpDRBD_running_0" [ style = bold] "dummy02_start_0 bl460g1n14" [ style=bold color="green" fontcolor="black"] -"dummy02_stop_0 bl460g1n13" -> "all_stopped" [ style = bold] "dummy02_stop_0 bl460g1n13" -> "dummy01_stop_0 bl460g1n13" [ style = bold] "dummy02_stop_0 bl460g1n13" -> "dummy02_start_0 bl460g1n14" [ style = bold] "dummy02_stop_0 bl460g1n13" -> "grpDRBD_stopped_0" [ style = bold] diff --git a/pengine/test10/master-move.exp b/pengine/test10/master-move.exp index 536e583..b98eb71 100644 --- a/pengine/test10/master-move.exp +++ b/pengine/test10/master-move.exp @@ -1,7 +1,7 @@ - + @@ -10,16 +10,16 @@ - + - + - + @@ -27,56 +27,56 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -86,7 +86,7 @@ - + @@ -99,161 +99,161 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -263,7 +263,7 @@ - + @@ -278,78 +278,78 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -359,7 +359,7 @@ - + @@ -374,58 +374,58 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -433,136 +433,121 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/master-move.summary b/pengine/test10/master-move.summary index e42fa27..29bfbc4 100644 --- a/pengine/test10/master-move.summary +++ b/pengine/test10/master-move.summary @@ -27,7 +27,6 @@ Executing cluster transition: * Resource action: prmDRBD:0 notify on bl460g1n13 * Resource action: prmDRBD:1 notify on bl460g1n14 * Pseudo action: msDRBD_confirmed-pre_notify_demote_0 - * Pseudo action: all_stopped * Pseudo action: grpDRBD_stopped_0 * Pseudo action: msDRBD_demote_0 * Resource action: prmDRBD:0 demote on bl460g1n13 diff --git a/pengine/test10/master-notify.exp b/pengine/test10/master-notify.exp index 7a73136..dd63044 100644 --- a/pengine/test10/master-notify.exp +++ b/pengine/test10/master-notify.exp @@ -1,155 +1,155 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -157,25 +157,25 @@ - + - + - + - + diff --git a/pengine/test10/master-ordering.exp b/pengine/test10/master-ordering.exp index 6e396ac..fe5fa33 100644 --- a/pengine/test10/master-ordering.exp +++ b/pengine/test10/master-ordering.exp @@ -1,7 +1,7 @@ - + @@ -10,33 +10,33 @@ - + - + - + - + - + @@ -45,33 +45,33 @@ - + - + - + - + - + @@ -80,7 +80,7 @@ - + @@ -89,33 +89,33 @@ - + - + - + - + - + @@ -124,33 +124,33 @@ - + - + - + - + - + @@ -159,33 +159,33 @@ - + - + - + - + - + @@ -194,49 +194,49 @@ - + - + - + - + - + - + - + - + - + @@ -244,43 +244,43 @@ - + - + - + - + - + - + - + - + - + @@ -289,7 +289,7 @@ - + @@ -298,7 +298,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -316,33 +316,33 @@ - + - + - + - + - + @@ -351,49 +351,49 @@ - + - + - + - + - + - + - + - + - + @@ -401,43 +401,43 @@ - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/master-partially-demoted-group.dot b/pengine/test10/master-partially-demoted-group.dot index 9124c61..d169665 100644 --- a/pengine/test10/master-partially-demoted-group.dot +++ b/pengine/test10/master-partially-demoted-group.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "cdev-pool-0-drbd_demote_0 sd01-1" -> "cdev-pool-0-drbd_monitor_20000 sd01-1" [ style = bold] "cdev-pool-0-drbd_demote_0 sd01-1" -> "ms-cdev-pool-0-drbd_demoted_0" [ style = bold] "cdev-pool-0-drbd_demote_0 sd01-1" [ style=bold color="green" fontcolor="black"] @@ -42,7 +41,6 @@ digraph "g" { "cdev-pool-0-iscsi-lun-1_start_0 sd01-0" -> "cdev-pool-0-iscsi-export_running_0" [ style = bold] "cdev-pool-0-iscsi-lun-1_start_0 sd01-0" -> "cdev-pool-0-iscsi-lun-1_monitor_10000 sd01-0" [ style = bold] "cdev-pool-0-iscsi-lun-1_start_0 sd01-0" [ style=bold color="green" fontcolor="black"] -"cdev-pool-0-iscsi-lun-1_stop_0 sd01-1" -> "all_stopped" [ style = bold] "cdev-pool-0-iscsi-lun-1_stop_0 sd01-1" -> "cdev-pool-0-iscsi-export_stopped_0" [ style = bold] "cdev-pool-0-iscsi-lun-1_stop_0 sd01-1" -> "cdev-pool-0-iscsi-lun-1_start_0 sd01-0" [ style = bold] "cdev-pool-0-iscsi-lun-1_stop_0 sd01-1" -> "cdev-pool-0-iscsi-target_stop_0 sd01-1" [ style = bold] @@ -52,7 +50,6 @@ digraph "g" { "cdev-pool-0-iscsi-target_start_0 sd01-0" -> "cdev-pool-0-iscsi-lun-1_start_0 sd01-0" [ style = bold] "cdev-pool-0-iscsi-target_start_0 sd01-0" -> "cdev-pool-0-iscsi-target_monitor_10000 sd01-0" [ style = bold] "cdev-pool-0-iscsi-target_start_0 sd01-0" [ style=bold color="green" fontcolor="black"] -"cdev-pool-0-iscsi-target_stop_0 sd01-1" -> "all_stopped" [ style = bold] "cdev-pool-0-iscsi-target_stop_0 sd01-1" -> "cdev-pool-0-iscsi-export_stopped_0" [ style = bold] "cdev-pool-0-iscsi-target_stop_0 sd01-1" -> "cdev-pool-0-iscsi-target_start_0 sd01-0" [ style = bold] "cdev-pool-0-iscsi-target_stop_0 sd01-1" [ style=bold color="green" fontcolor="black"] @@ -150,7 +147,6 @@ digraph "g" { "vip-164_start_0 sd01-0" -> "vip-164_monitor_30000 sd01-0" [ style = bold] "vip-164_start_0 sd01-0" -> "vip-165_start_0 sd01-0" [ style = bold] "vip-164_start_0 sd01-0" [ style=bold color="green" fontcolor="black"] -"vip-164_stop_0 sd01-1" -> "all_stopped" [ style = bold] "vip-164_stop_0 sd01-1" -> "cdev-pool-0-iscsi-vips_stopped_0" [ style = bold] "vip-164_stop_0 sd01-1" -> "vip-164_start_0 sd01-0" [ style = bold] "vip-164_stop_0 sd01-1" [ style=bold color="green" fontcolor="black"] @@ -163,7 +159,6 @@ digraph "g" { "vip-165_start_0 sd01-0" -> "cdev-pool-0-iscsi-vips_running_0" [ style = bold] "vip-165_start_0 sd01-0" -> "vip-165_monitor_30000 sd01-0" [ style = bold] "vip-165_start_0 sd01-0" [ style=bold color="green" fontcolor="black"] -"vip-165_stop_0 sd01-1" -> "all_stopped" [ style = bold] "vip-165_stop_0 sd01-1" -> "cdev-pool-0-iscsi-vips_stopped_0" [ style = bold] "vip-165_stop_0 sd01-1" -> "vip-164_stop_0 sd01-1" [ style = bold] "vip-165_stop_0 sd01-1" -> "vip-165_start_0 sd01-0" [ style = bold] diff --git a/pengine/test10/master-partially-demoted-group.exp b/pengine/test10/master-partially-demoted-group.exp index 32a30fe..8e4cb1e 100644 --- a/pengine/test10/master-partially-demoted-group.exp +++ b/pengine/test10/master-partially-demoted-group.exp @@ -1,381 +1,381 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -384,78 +384,78 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -463,256 +463,256 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -720,142 +720,121 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/master-partially-demoted-group.summary b/pengine/test10/master-partially-demoted-group.summary index 0abf07c..311be85 100644 --- a/pengine/test10/master-partially-demoted-group.summary +++ b/pengine/test10/master-partially-demoted-group.summary @@ -51,7 +51,6 @@ Executing cluster transition: * Pseudo action: cdev-pool-0-iscsi-export_stop_0 * Resource action: cdev-pool-0-iscsi-lun-1 stop on sd01-1 * Resource action: cdev-pool-0-iscsi-target stop on sd01-1 - * Pseudo action: all_stopped * Pseudo action: cdev-pool-0-iscsi-export_stopped_0 * Pseudo action: ms-cdev-pool-0-drbd_demote_0 * Resource action: cdev-pool-0-drbd demote on sd01-1 diff --git a/pengine/test10/master-probed-score.exp b/pengine/test10/master-probed-score.exp index 213be36..f8341fc 100644 --- a/pengine/test10/master-probed-score.exp +++ b/pengine/test10/master-probed-score.exp @@ -1,325 +1,325 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -327,63 +327,63 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -392,7 +392,7 @@ - + @@ -401,696 +401,696 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1099,36 +1099,36 @@ - + - + - + - + - + - + @@ -1137,7 +1137,7 @@ - + @@ -1146,193 +1146,193 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1341,23 +1341,23 @@ - + - + - + - + @@ -1366,66 +1366,66 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -1434,23 +1434,23 @@ - + - + - + - + @@ -1459,113 +1459,113 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1574,23 +1574,23 @@ - + - + - + - + @@ -1599,23 +1599,23 @@ - + - + - + - + @@ -1624,23 +1624,23 @@ - + - + - + - + @@ -1649,23 +1649,23 @@ - + - + - + - + @@ -1674,23 +1674,23 @@ - + - + - + - + @@ -1699,23 +1699,23 @@ - + - + - + - + @@ -1724,23 +1724,23 @@ - + - + - + - + @@ -1749,71 +1749,71 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1822,23 +1822,23 @@ - + - + - + - + @@ -1847,23 +1847,23 @@ - + - + - + - + @@ -1872,23 +1872,23 @@ - + - + - + - + @@ -1897,23 +1897,23 @@ - + - + - + - + @@ -1922,23 +1922,23 @@ - + - + - + - + @@ -1947,23 +1947,23 @@ - + - + - + - + @@ -1972,23 +1972,23 @@ - + - + - + - + @@ -1997,156 +1997,156 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2155,36 +2155,36 @@ - + - + - + - + - + - + @@ -2193,36 +2193,36 @@ - + - + - + - + - + - + @@ -2231,36 +2231,36 @@ - + - + - + - + - + - + @@ -2269,36 +2269,36 @@ - + - + - + - + - + - + @@ -2307,36 +2307,36 @@ - + - + - + - + - + - + @@ -2345,78 +2345,78 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2425,36 +2425,36 @@ - + - + - + - + - + - + @@ -2463,36 +2463,36 @@ - + - + - + - + - + - + @@ -2501,36 +2501,36 @@ - + - + - + - + - + - + @@ -2539,36 +2539,36 @@ - + - + - + - + - + - + @@ -2577,36 +2577,36 @@ - + - + - + - + - + - + @@ -2615,92 +2615,92 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2709,7 +2709,7 @@ - + @@ -2718,26 +2718,26 @@ - + - + - + - + - + @@ -2746,7 +2746,7 @@ - + diff --git a/pengine/test10/master-promotion-constraint.exp b/pengine/test10/master-promotion-constraint.exp index c371c52..78cfd3f 100644 --- a/pengine/test10/master-promotion-constraint.exp +++ b/pengine/test10/master-promotion-constraint.exp @@ -1,20 +1,20 @@ - + - + - + @@ -24,7 +24,7 @@ - + @@ -39,22 +39,22 @@ - + - + - + - + diff --git a/pengine/test10/master-pseudo.dot b/pengine/test10/master-pseudo.dot index 0eac9d6..403dbad 100644 --- a/pengine/test10/master-pseudo.dot +++ b/pengine/test10/master-pseudo.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "drbd_float:0_post_notify_promote_0 sambuca.linbit" -> "ms_drbd_float_confirmed-post_notify_promoted_0" [ style = bold] "drbd_float:0_post_notify_promote_0 sambuca.linbit" [ style=bold color="green" fontcolor="black" ] "drbd_float:0_post_notify_start_0 sambuca.linbit" -> "ms_drbd_float_confirmed-post_notify_running_0" [ style = bold] @@ -13,7 +12,6 @@ digraph "g" { "drbd_float:0_start_0 sambuca.linbit" -> "drbd_float:0_promote_0 sambuca.linbit" [ style = bold] "drbd_float:0_start_0 sambuca.linbit" -> "ms_drbd_float_running_0" [ style = bold] "drbd_float:0_start_0 sambuca.linbit" [ style=bold color="green" fontcolor="black" ] -"drbd_float:0_stop_0 sambuca.linbit" -> "all_stopped" [ style = bold] "drbd_float:0_stop_0 sambuca.linbit" -> "drbd_float:0_start_0 sambuca.linbit" [ style = bold] "drbd_float:0_stop_0 sambuca.linbit" -> "ms_drbd_float_stopped_0" [ style = bold] "drbd_float:0_stop_0 sambuca.linbit" [ style=bold color="green" fontcolor="black" ] @@ -28,7 +26,6 @@ digraph "g" { "ms_drbd_float_confirmed-post_notify_promoted_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_float_confirmed-post_notify_running_0" -> "ms_drbd_float_pre_notify_promote_0" [ style = bold] "ms_drbd_float_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange" ] -"ms_drbd_float_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "ms_drbd_float_confirmed-post_notify_stopped_0" -> "ms_drbd_float_pre_notify_promote_0" [ style = bold] "ms_drbd_float_confirmed-post_notify_stopped_0" -> "ms_drbd_float_pre_notify_start_0" [ style = bold] "ms_drbd_float_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] diff --git a/pengine/test10/master-pseudo.exp b/pengine/test10/master-pseudo.exp index 1ba87e6..29a1070 100644 --- a/pengine/test10/master-pseudo.exp +++ b/pengine/test10/master-pseudo.exp @@ -1,7 +1,7 @@ - + @@ -10,236 +10,236 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -247,155 +247,140 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/master-pseudo.summary b/pengine/test10/master-pseudo.summary index 8f67a68..2e4ec70 100644 --- a/pengine/test10/master-pseudo.summary +++ b/pengine/test10/master-pseudo.summary @@ -26,7 +26,6 @@ Executing cluster transition: * Pseudo action: ms_drbd_float_post_notify_stopped_0 * Pseudo action: ms_drbd_float_confirmed-post_notify_stopped_0 * Pseudo action: ms_drbd_float_pre_notify_start_0 - * Pseudo action: all_stopped * Pseudo action: ms_drbd_float_confirmed-pre_notify_start_0 * Pseudo action: ms_drbd_float_start_0 * Resource action: drbd_float:0 start on sambuca.linbit diff --git a/pengine/test10/master-reattach.exp b/pengine/test10/master-reattach.exp index c4d5272..083b4b6 100644 --- a/pengine/test10/master-reattach.exp +++ b/pengine/test10/master-reattach.exp @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/pengine/test10/master-role.exp b/pengine/test10/master-role.exp index fc925cb..e535e83 100644 --- a/pengine/test10/master-role.exp +++ b/pengine/test10/master-role.exp @@ -1,35 +1,35 @@ - + - + - + - + - + - + diff --git a/pengine/test10/master-score-startup.exp b/pengine/test10/master-score-startup.exp index 4a66b3d..37511ce 100644 --- a/pengine/test10/master-score-startup.exp +++ b/pengine/test10/master-score-startup.exp @@ -1,97 +1,97 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -100,78 +100,78 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -180,142 +180,142 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -323,75 +323,75 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -400,7 +400,7 @@ - + diff --git a/pengine/test10/master-stop.dot b/pengine/test10/master-stop.dot index 8ab6450..5bba640 100644 --- a/pengine/test10/master-stop.dot +++ b/pengine/test10/master-stop.dot @@ -1,6 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] -"dummy:2_stop_0 node3" -> "all_stopped" [ style = bold] "dummy:2_stop_0 node3" -> "m_stopped_0" [ style = bold] "dummy:2_stop_0 node3" [ style=bold color="green" fontcolor="black"] "m_stop_0" -> "dummy:2_stop_0 node3" [ style = bold] diff --git a/pengine/test10/master-stop.exp b/pengine/test10/master-stop.exp index 6de4959..41267d7 100644 --- a/pengine/test10/master-stop.exp +++ b/pengine/test10/master-stop.exp @@ -1,50 +1,38 @@ - + - + - + - + - + - + - - - - - - - - - - - - diff --git a/pengine/test10/master-stop.summary b/pengine/test10/master-stop.summary index 8b861df..2b3dd3d 100644 --- a/pengine/test10/master-stop.summary +++ b/pengine/test10/master-stop.summary @@ -12,7 +12,6 @@ Executing cluster transition: * Pseudo action: m_stop_0 * Resource action: dummy:2 stop on node3 * Pseudo action: m_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 node3 ] diff --git a/pengine/test10/master_monitor_restart.exp b/pengine/test10/master_monitor_restart.exp index cbb549a..a752b99 100644 --- a/pengine/test10/master_monitor_restart.exp +++ b/pengine/test10/master_monitor_restart.exp @@ -1,7 +1,7 @@ - + diff --git a/pengine/test10/migrate-1.dot b/pengine/test10/migrate-1.dot index 650a071..f92b927 100644 --- a/pengine/test10/migrate-1.dot +++ b/pengine/test10/migrate-1.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc3_migrate_from_0 node2" -> "rsc3_start_0 node2" [ style = bold] "rsc3_migrate_from_0 node2" -> "rsc3_stop_0 node1" [ style = bold] "rsc3_migrate_from_0 node2" [ style=bold color="green" fontcolor="black" ] @@ -9,7 +8,6 @@ "rsc3_monitor_0 node2" -> "rsc3_start_0 node2" [ style = bold] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc3_start_0 node2" [ style=bold color="green" fontcolor="orange" ] -"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-1.exp b/pengine/test10/migrate-1.exp index e842659..508213c 100644 --- a/pengine/test10/migrate-1.exp +++ b/pengine/test10/migrate-1.exp @@ -1,81 +1,68 @@ - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - diff --git a/pengine/test10/migrate-1.summary b/pengine/test10/migrate-1.summary index ee3d352..417c518 100644 --- a/pengine/test10/migrate-1.summary +++ b/pengine/test10/migrate-1.summary @@ -13,7 +13,6 @@ Executing cluster transition: * Resource action: rsc3 migrate_to on node1 * Resource action: rsc3 migrate_from on node2 * Resource action: rsc3 stop on node1 - * Pseudo action: all_stopped * Pseudo action: rsc3_start_0 Revised cluster status: diff --git a/pengine/test10/migrate-3.dot b/pengine/test10/migrate-3.dot index a049b5b..17cfd8f 100644 --- a/pengine/test10/migrate-3.dot +++ b/pengine/test10/migrate-3.dot @@ -1,9 +1,7 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc3_monitor_0 node2" -> "rsc3_start_0 node2" [ 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 6e8b041..c4bc782 100644 --- a/pengine/test10/migrate-3.exp +++ b/pengine/test10/migrate-3.exp @@ -1,7 +1,7 @@ - + @@ -11,13 +11,13 @@ - + - + @@ -33,17 +33,4 @@ - - - - - - - - - - - - - diff --git a/pengine/test10/migrate-3.summary b/pengine/test10/migrate-3.summary index 9288be3..1ec79c9 100644 --- a/pengine/test10/migrate-3.summary +++ b/pengine/test10/migrate-3.summary @@ -11,7 +11,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc3 monitor on node2 * Resource action: rsc3 stop on node1 - * Pseudo action: all_stopped * Resource action: rsc3 start on node2 Revised cluster status: diff --git a/pengine/test10/migrate-4.dot b/pengine/test10/migrate-4.dot index 75e6dd3..c8e1db0 100644 --- a/pengine/test10/migrate-4.dot +++ b/pengine/test10/migrate-4.dot @@ -1,7 +1,5 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc3_stop_0 node2" -> "all_stopped" [ style = bold] "rsc3_stop_0 node2" -> "rsc3_start_0 node2" [ style = bold] "rsc3_stop_0 node2" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/migrate-4.exp b/pengine/test10/migrate-4.exp index b4dfe24..15347fc 100644 --- a/pengine/test10/migrate-4.exp +++ b/pengine/test10/migrate-4.exp @@ -1,7 +1,7 @@ - + @@ -21,17 +21,4 @@ - - - - - - - - - - - - - diff --git a/pengine/test10/migrate-4.summary b/pengine/test10/migrate-4.summary index b95521a..17e0d0b 100644 --- a/pengine/test10/migrate-4.summary +++ b/pengine/test10/migrate-4.summary @@ -10,7 +10,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc3 stop on node2 - * Pseudo action: all_stopped * Resource action: rsc3 start on node2 Revised cluster status: diff --git a/pengine/test10/migrate-5.dot b/pengine/test10/migrate-5.dot index 078691a..cd68f86 100644 --- a/pengine/test10/migrate-5.dot +++ b/pengine/test10/migrate-5.dot @@ -1,10 +1,8 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "clone-dom0-iscsi1_stop_0" -> "clone-dom0-iscsi1_stopped_0" [ style = bold] "clone-dom0-iscsi1_stop_0" -> "dom0-iscsi1:1_stop_0" [ style = bold] "clone-dom0-iscsi1_stop_0" [ style=bold color="green" fontcolor="orange" ] "clone-dom0-iscsi1_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"dom0-iscsi1-cnx1:0_stop_0 dom0-02" -> "all_stopped" [ style = bold] "dom0-iscsi1-cnx1:0_stop_0 dom0-02" -> "dom0-iscsi1:1_stopped_0" [ style = bold] "dom0-iscsi1-cnx1:0_stop_0 dom0-02" [ style=bold color="green" fontcolor="black" ] "dom0-iscsi1:1_stop_0" -> "dom0-iscsi1-cnx1:0_stop_0 dom0-02" [ style = bold] @@ -18,7 +16,6 @@ digraph "g" { "domU-test01_migrate_to_0 dom0-02" -> "domU-test01_migrate_from_0 dom0-01" [ style = bold] "domU-test01_migrate_to_0 dom0-02" [ style=bold color="green" fontcolor="black" ] "domU-test01_start_0 dom0-01" [ style=bold color="green" fontcolor="orange" ] -"domU-test01_stop_0 dom0-02" -> "all_stopped" [ style = bold] "domU-test01_stop_0 dom0-02" -> "clone-dom0-iscsi1_stop_0" [ style = dashed] "domU-test01_stop_0 dom0-02" -> "domU-test01_start_0 dom0-01" [ style = bold] "domU-test01_stop_0 dom0-02" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/migrate-5.exp b/pengine/test10/migrate-5.exp index 4840658..313ed17 100644 --- a/pengine/test10/migrate-5.exp +++ b/pengine/test10/migrate-5.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,109 +23,93 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/migrate-5.summary b/pengine/test10/migrate-5.summary index 0a939dd..d0b7aed 100644 --- a/pengine/test10/migrate-5.summary +++ b/pengine/test10/migrate-5.summary @@ -18,7 +18,6 @@ Executing cluster transition: * Resource action: domU-test01 stop on dom0-02 * Pseudo action: dom0-iscsi1:1_stop_0 * Resource action: dom0-iscsi1-cnx1:0 stop on dom0-02 - * Pseudo action: all_stopped * Pseudo action: domU-test01_start_0 * Pseudo action: dom0-iscsi1:1_stopped_0 * Pseudo action: clone-dom0-iscsi1_stopped_0 diff --git a/pengine/test10/migrate-begin.dot b/pengine/test10/migrate-begin.dot index 1927f7f..d4f1a23 100644 --- a/pengine/test10/migrate-begin.dot +++ b/pengine/test10/migrate-begin.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "load_stopped_hex-13 hex-13" -> "test-vm_migrate_to_0 hex-14" [ style = bold] "load_stopped_hex-13 hex-13" -> "test-vm_start_0 hex-13" [ style = bold] "load_stopped_hex-13 hex-13" [ style=bold color="green" fontcolor="orange" ] @@ -10,7 +9,6 @@ digraph "g" { "test-vm_migrate_to_0 hex-14" -> "test-vm_migrate_from_0 hex-13" [ style = bold] "test-vm_migrate_to_0 hex-14" [ style=bold color="green" fontcolor="black" ] "test-vm_start_0 hex-13" [ style=bold color="green" fontcolor="orange" ] -"test-vm_stop_0 hex-14" -> "all_stopped" [ style = bold] "test-vm_stop_0 hex-14" -> "load_stopped_hex-14 hex-14" [ style = bold] "test-vm_stop_0 hex-14" -> "test-vm_start_0 hex-13" [ style = bold] "test-vm_stop_0 hex-14" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/migrate-begin.exp b/pengine/test10/migrate-begin.exp index c4f6c0a..12a8907 100644 --- a/pengine/test10/migrate-begin.exp +++ b/pengine/test10/migrate-begin.exp @@ -1,64 +1,64 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -66,25 +66,13 @@ - + - - - - - - - - - - - - - + diff --git a/pengine/test10/migrate-begin.summary b/pengine/test10/migrate-begin.summary index 56e0f33..705bb1b 100644 --- a/pengine/test10/migrate-begin.summary +++ b/pengine/test10/migrate-begin.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Resource action: test-vm migrate_from on hex-13 * Resource action: test-vm stop on hex-14 * Pseudo action: load_stopped_hex-14 - * Pseudo action: all_stopped * Pseudo action: test-vm_start_0 Revised cluster status: diff --git a/pengine/test10/migrate-both-vms.dot b/pengine/test10/migrate-both-vms.dot index e883754..891bb82 100644 --- a/pengine/test10/migrate-both-vms.dot +++ b/pengine/test10/migrate-both-vms.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "c-fs-bind-libvirt-VM-cvmh_stop_0" -> "c-fs-bind-libvirt-VM-cvmh_stopped_0" [ style = bold] "c-fs-bind-libvirt-VM-cvmh_stop_0" -> "fs-bind-libvirt-VM-cvmh_stop_0 cvmh03" [ style = bold] "c-fs-bind-libvirt-VM-cvmh_stop_0" -> "fs-bind-libvirt-VM-cvmh_stop_0 cvmh04" [ style = bold] @@ -28,20 +27,16 @@ digraph "g" { "c-watch-ib0_stop_0" -> "p-watch-ib0_stop_0 cvmh04" [ style = bold] "c-watch-ib0_stop_0" [ style=bold color="green" fontcolor="orange"] "c-watch-ib0_stopped_0" [ style=bold color="green" fontcolor="orange"] -"fs-bind-libvirt-VM-cvmh_stop_0 cvmh03" -> "all_stopped" [ style = bold] "fs-bind-libvirt-VM-cvmh_stop_0 cvmh03" -> "c-fs-bind-libvirt-VM-cvmh_stopped_0" [ style = bold] "fs-bind-libvirt-VM-cvmh_stop_0 cvmh03" -> "fs-bind-libvirt-VM-cvmh_stop_0 cvmh04" [ style = bold] "fs-bind-libvirt-VM-cvmh_stop_0 cvmh03" -> "p-fs-gpfs_stop_0 cvmh03" [ style = bold] "fs-bind-libvirt-VM-cvmh_stop_0 cvmh03" [ style=bold color="green" fontcolor="black"] -"fs-bind-libvirt-VM-cvmh_stop_0 cvmh04" -> "all_stopped" [ style = bold] "fs-bind-libvirt-VM-cvmh_stop_0 cvmh04" -> "c-fs-bind-libvirt-VM-cvmh_stopped_0" [ style = bold] "fs-bind-libvirt-VM-cvmh_stop_0 cvmh04" -> "p-fs-gpfs_stop_0 cvmh04" [ style = bold] "fs-bind-libvirt-VM-cvmh_stop_0 cvmh04" [ style=bold color="green" fontcolor="black"] -"fs-libvirt-VM-xcm_stop_0 cvmh03" -> "all_stopped" [ style = bold] "fs-libvirt-VM-xcm_stop_0 cvmh03" -> "c-fs-libvirt-VM-xcm_stopped_0" [ style = bold] "fs-libvirt-VM-xcm_stop_0 cvmh03" -> "fs-libvirt-VM-xcm_stop_0 cvmh04" [ style = bold] "fs-libvirt-VM-xcm_stop_0 cvmh03" [ style=bold color="green" fontcolor="black"] -"fs-libvirt-VM-xcm_stop_0 cvmh04" -> "all_stopped" [ style = bold] "fs-libvirt-VM-xcm_stop_0 cvmh04" -> "c-fs-libvirt-VM-xcm_stopped_0" [ style = bold] "fs-libvirt-VM-xcm_stop_0 cvmh04" [ style=bold color="green" fontcolor="black"] "load_stopped_cvmh01 cvmh01" -> "vm-compute-test_migrate_to_0 cvmh03" [ style = bold] @@ -52,29 +47,23 @@ digraph "g" { "load_stopped_cvmh02 cvmh02" [ style=bold color="green" fontcolor="orange"] "load_stopped_cvmh03 cvmh03" [ style=bold color="green" fontcolor="orange"] "load_stopped_cvmh04 cvmh04" [ style=bold color="green" fontcolor="orange"] -"p-fs-gpfs_stop_0 cvmh03" -> "all_stopped" [ style = bold] "p-fs-gpfs_stop_0 cvmh03" -> "c-fs-gpfs_stopped_0" [ style = bold] "p-fs-gpfs_stop_0 cvmh03" -> "p-fs-gpfs_stop_0 cvmh04" [ style = bold] "p-fs-gpfs_stop_0 cvmh03" [ style=bold color="green" fontcolor="black"] -"p-fs-gpfs_stop_0 cvmh04" -> "all_stopped" [ style = bold] "p-fs-gpfs_stop_0 cvmh04" -> "c-fs-gpfs_stopped_0" [ style = bold] "p-fs-gpfs_stop_0 cvmh04" [ style=bold color="green" fontcolor="black"] -"p-libvirtd_stop_0 cvmh03" -> "all_stopped" [ style = bold] "p-libvirtd_stop_0 cvmh03" -> "c-p-libvirtd_stopped_0" [ style = bold] "p-libvirtd_stop_0 cvmh03" -> "fs-bind-libvirt-VM-cvmh_stop_0 cvmh03" [ style = bold] "p-libvirtd_stop_0 cvmh03" -> "fs-libvirt-VM-xcm_stop_0 cvmh03" [ style = bold] "p-libvirtd_stop_0 cvmh03" -> "p-libvirtd_stop_0 cvmh04" [ style = bold] "p-libvirtd_stop_0 cvmh03" [ style=bold color="green" fontcolor="black"] -"p-libvirtd_stop_0 cvmh04" -> "all_stopped" [ style = bold] "p-libvirtd_stop_0 cvmh04" -> "c-p-libvirtd_stopped_0" [ style = bold] "p-libvirtd_stop_0 cvmh04" -> "fs-bind-libvirt-VM-cvmh_stop_0 cvmh04" [ style = bold] "p-libvirtd_stop_0 cvmh04" -> "fs-libvirt-VM-xcm_stop_0 cvmh04" [ style = bold] "p-libvirtd_stop_0 cvmh04" [ style=bold color="green" fontcolor="black"] -"p-watch-ib0_stop_0 cvmh03" -> "all_stopped" [ style = bold] "p-watch-ib0_stop_0 cvmh03" -> "c-watch-ib0_stopped_0" [ style = bold] "p-watch-ib0_stop_0 cvmh03" -> "p-watch-ib0_stop_0 cvmh04" [ style = bold] "p-watch-ib0_stop_0 cvmh03" [ style=bold color="green" fontcolor="black"] -"p-watch-ib0_stop_0 cvmh04" -> "all_stopped" [ style = bold] "p-watch-ib0_stop_0 cvmh04" -> "c-watch-ib0_stopped_0" [ style = bold] "p-watch-ib0_stop_0 cvmh04" [ style=bold color="green" fontcolor="black"] "vm-compute-test_migrate_from_0 cvmh01" -> "vm-compute-test_start_0 cvmh01" [ style = bold] @@ -88,7 +77,6 @@ digraph "g" { "vm-compute-test_start_0 cvmh01" -> "vm-swbuildsl6_migrate_to_0 cvmh04" [ style = dashed] "vm-compute-test_start_0 cvmh01" -> "vm-swbuildsl6_start_0 cvmh02" [ style = bold] "vm-compute-test_start_0 cvmh01" [ style=bold color="green" fontcolor="orange"] -"vm-compute-test_stop_0 cvmh03" -> "all_stopped" [ style = bold] "vm-compute-test_stop_0 cvmh03" -> "c-p-libvirtd_stop_0" [ style = bold] "vm-compute-test_stop_0 cvmh03" -> "load_stopped_cvmh03 cvmh03" [ style = bold] "vm-compute-test_stop_0 cvmh03" -> "vm-compute-test_start_0 cvmh01" [ style = bold] @@ -101,7 +89,6 @@ digraph "g" { "vm-swbuildsl6_monitor_45000 cvmh02" [ style=bold color="green" fontcolor="black"] "vm-swbuildsl6_start_0 cvmh02" -> "vm-swbuildsl6_monitor_45000 cvmh02" [ style = bold] "vm-swbuildsl6_start_0 cvmh02" [ style=bold color="green" fontcolor="orange"] -"vm-swbuildsl6_stop_0 cvmh04" -> "all_stopped" [ style = bold] "vm-swbuildsl6_stop_0 cvmh04" -> "c-p-libvirtd_stop_0" [ style = bold] "vm-swbuildsl6_stop_0 cvmh04" -> "load_stopped_cvmh04 cvmh04" [ style = bold] "vm-swbuildsl6_stop_0 cvmh04" -> "vm-compute-test_migrate_to_0 cvmh03" [ style = dashed] diff --git a/pengine/test10/migrate-both-vms.exp b/pengine/test10/migrate-both-vms.exp index a8c5c63..3f06cb0 100644 --- a/pengine/test10/migrate-both-vms.exp +++ b/pengine/test10/migrate-both-vms.exp @@ -1,119 +1,119 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -121,348 +121,348 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -470,19 +470,19 @@ - + - + - + @@ -490,58 +490,13 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/migrate-both-vms.summary b/pengine/test10/migrate-both-vms.summary index d45d267..50139d8 100644 --- a/pengine/test10/migrate-both-vms.summary +++ b/pengine/test10/migrate-both-vms.summary @@ -70,7 +70,6 @@ Executing cluster transition: * Resource action: p-fs-gpfs stop on cvmh03 * Resource action: p-fs-gpfs stop on cvmh04 * Pseudo action: c-fs-gpfs_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Node cvmh03: standby diff --git a/pengine/test10/migrate-fail-2.dot b/pengine/test10/migrate-fail-2.dot index 89118b5..d12a56e 100644 --- a/pengine/test10/migrate-fail-2.dot +++ b/pengine/test10/migrate-fail-2.dot @@ -1,14 +1,11 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "load_stopped_hex-13 hex-13" -> "test-vm_start_0 hex-13" [ style = bold] "load_stopped_hex-13 hex-13" [ style=bold color="green" fontcolor="orange" ] "load_stopped_hex-14 hex-14" [ style=bold color="green" fontcolor="orange" ] "test-vm_start_0 hex-13" [ style=bold color="green" fontcolor="black" ] -"test-vm_stop_0 hex-13" -> "all_stopped" [ style = bold] "test-vm_stop_0 hex-13" -> "load_stopped_hex-13 hex-13" [ style = bold] "test-vm_stop_0 hex-13" -> "test-vm_start_0 hex-13" [ style = bold] "test-vm_stop_0 hex-13" [ style=bold color="green" fontcolor="black" ] -"test-vm_stop_0 hex-14" -> "all_stopped" [ style = bold] "test-vm_stop_0 hex-14" -> "load_stopped_hex-14 hex-14" [ style = bold] "test-vm_stop_0 hex-14" -> "test-vm_start_0 hex-13" [ style = bold] "test-vm_stop_0 hex-14" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/migrate-fail-2.exp b/pengine/test10/migrate-fail-2.exp index 3f3e679..0ed542d 100644 --- a/pengine/test10/migrate-fail-2.exp +++ b/pengine/test10/migrate-fail-2.exp @@ -1,7 +1,7 @@ - + @@ -11,16 +11,16 @@ - + - + - + @@ -38,19 +38,19 @@ - + - + - + @@ -60,20 +60,4 @@ - - - - - - - - - - - - - - - - diff --git a/pengine/test10/migrate-fail-2.summary b/pengine/test10/migrate-fail-2.summary index f3709c4..4b0135d 100644 --- a/pengine/test10/migrate-fail-2.summary +++ b/pengine/test10/migrate-fail-2.summary @@ -14,7 +14,6 @@ Executing cluster transition: * Resource action: test-vm stop on hex-13 * Pseudo action: load_stopped_hex-14 * Pseudo action: load_stopped_hex-13 - * Pseudo action: all_stopped * Resource action: test-vm start on hex-13 Revised cluster status: diff --git a/pengine/test10/migrate-fail-3.dot b/pengine/test10/migrate-fail-3.dot index 0ac7045..904387a 100644 --- a/pengine/test10/migrate-fail-3.dot +++ b/pengine/test10/migrate-fail-3.dot @@ -1,10 +1,8 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "load_stopped_hex-13 hex-13" -> "test-vm_start_0 hex-13" [ style = bold] "load_stopped_hex-13 hex-13" [ style=bold color="green" fontcolor="orange" ] "load_stopped_hex-14 hex-14" [ style=bold color="green" fontcolor="orange" ] "test-vm_start_0 hex-13" [ style=bold color="green" fontcolor="black" ] -"test-vm_stop_0 hex-13" -> "all_stopped" [ style = bold] "test-vm_stop_0 hex-13" -> "load_stopped_hex-13 hex-13" [ style = bold] "test-vm_stop_0 hex-13" -> "test-vm_start_0 hex-13" [ style = bold] "test-vm_stop_0 hex-13" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/migrate-fail-3.exp b/pengine/test10/migrate-fail-3.exp index 1681a38..c6e6963 100644 --- a/pengine/test10/migrate-fail-3.exp +++ b/pengine/test10/migrate-fail-3.exp @@ -1,7 +1,7 @@ - + @@ -11,7 +11,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -34,19 +34,7 @@ - - - - - - - - - - - - - + diff --git a/pengine/test10/migrate-fail-3.summary b/pengine/test10/migrate-fail-3.summary index 35ec75f..acc34a7 100644 --- a/pengine/test10/migrate-fail-3.summary +++ b/pengine/test10/migrate-fail-3.summary @@ -13,7 +13,6 @@ Executing cluster transition: * Resource action: test-vm stop on hex-13 * Pseudo action: load_stopped_hex-14 * Pseudo action: load_stopped_hex-13 - * Pseudo action: all_stopped * Resource action: test-vm start on hex-13 Revised cluster status: diff --git a/pengine/test10/migrate-fail-4.dot b/pengine/test10/migrate-fail-4.dot index 89118b5..d12a56e 100644 --- a/pengine/test10/migrate-fail-4.dot +++ b/pengine/test10/migrate-fail-4.dot @@ -1,14 +1,11 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "load_stopped_hex-13 hex-13" -> "test-vm_start_0 hex-13" [ style = bold] "load_stopped_hex-13 hex-13" [ style=bold color="green" fontcolor="orange" ] "load_stopped_hex-14 hex-14" [ style=bold color="green" fontcolor="orange" ] "test-vm_start_0 hex-13" [ style=bold color="green" fontcolor="black" ] -"test-vm_stop_0 hex-13" -> "all_stopped" [ style = bold] "test-vm_stop_0 hex-13" -> "load_stopped_hex-13 hex-13" [ style = bold] "test-vm_stop_0 hex-13" -> "test-vm_start_0 hex-13" [ style = bold] "test-vm_stop_0 hex-13" [ style=bold color="green" fontcolor="black" ] -"test-vm_stop_0 hex-14" -> "all_stopped" [ style = bold] "test-vm_stop_0 hex-14" -> "load_stopped_hex-14 hex-14" [ style = bold] "test-vm_stop_0 hex-14" -> "test-vm_start_0 hex-13" [ style = bold] "test-vm_stop_0 hex-14" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/migrate-fail-4.exp b/pengine/test10/migrate-fail-4.exp index 0cc2864..54bf9f6 100644 --- a/pengine/test10/migrate-fail-4.exp +++ b/pengine/test10/migrate-fail-4.exp @@ -1,26 +1,26 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -38,40 +38,25 @@ - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/migrate-fail-4.summary b/pengine/test10/migrate-fail-4.summary index d36c61b..49a5f57 100644 --- a/pengine/test10/migrate-fail-4.summary +++ b/pengine/test10/migrate-fail-4.summary @@ -14,7 +14,6 @@ Executing cluster transition: * Resource action: test-vm stop on hex-13 * Pseudo action: load_stopped_hex-14 * Pseudo action: load_stopped_hex-13 - * Pseudo action: all_stopped * Resource action: test-vm start on hex-13 Revised cluster status: diff --git a/pengine/test10/migrate-fail-5.exp b/pengine/test10/migrate-fail-5.exp index 3b167b3..db84a6c 100644 --- a/pengine/test10/migrate-fail-5.exp +++ b/pengine/test10/migrate-fail-5.exp @@ -1,20 +1,20 @@ - + - + - + @@ -22,7 +22,7 @@ - + diff --git a/pengine/test10/migrate-fail-6.dot b/pengine/test10/migrate-fail-6.dot index 89118b5..d12a56e 100644 --- a/pengine/test10/migrate-fail-6.dot +++ b/pengine/test10/migrate-fail-6.dot @@ -1,14 +1,11 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "load_stopped_hex-13 hex-13" -> "test-vm_start_0 hex-13" [ style = bold] "load_stopped_hex-13 hex-13" [ style=bold color="green" fontcolor="orange" ] "load_stopped_hex-14 hex-14" [ style=bold color="green" fontcolor="orange" ] "test-vm_start_0 hex-13" [ style=bold color="green" fontcolor="black" ] -"test-vm_stop_0 hex-13" -> "all_stopped" [ style = bold] "test-vm_stop_0 hex-13" -> "load_stopped_hex-13 hex-13" [ style = bold] "test-vm_stop_0 hex-13" -> "test-vm_start_0 hex-13" [ style = bold] "test-vm_stop_0 hex-13" [ style=bold color="green" fontcolor="black" ] -"test-vm_stop_0 hex-14" -> "all_stopped" [ style = bold] "test-vm_stop_0 hex-14" -> "load_stopped_hex-14 hex-14" [ style = bold] "test-vm_stop_0 hex-14" -> "test-vm_start_0 hex-13" [ style = bold] "test-vm_stop_0 hex-14" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/migrate-fail-6.exp b/pengine/test10/migrate-fail-6.exp index ca1aead..1b9a4a3 100644 --- a/pengine/test10/migrate-fail-6.exp +++ b/pengine/test10/migrate-fail-6.exp @@ -1,7 +1,7 @@ - + @@ -11,16 +11,16 @@ - + - + - + @@ -38,7 +38,7 @@ - + @@ -50,28 +50,13 @@ - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/migrate-fail-6.summary b/pengine/test10/migrate-fail-6.summary index 7cabcf3..f342d4c 100644 --- a/pengine/test10/migrate-fail-6.summary +++ b/pengine/test10/migrate-fail-6.summary @@ -14,7 +14,6 @@ Executing cluster transition: * Resource action: test-vm stop on hex-14 * Pseudo action: load_stopped_hex-14 * Pseudo action: load_stopped_hex-13 - * Pseudo action: all_stopped * Resource action: test-vm start on hex-13 Revised cluster status: diff --git a/pengine/test10/migrate-fail-7.exp b/pengine/test10/migrate-fail-7.exp index 8b49be1..5398929 100644 --- a/pengine/test10/migrate-fail-7.exp +++ b/pengine/test10/migrate-fail-7.exp @@ -1,20 +1,20 @@ - + - + - + @@ -22,7 +22,7 @@ - + diff --git a/pengine/test10/migrate-fail-8.dot b/pengine/test10/migrate-fail-8.dot index 2dc98ab..a71f6da 100644 --- a/pengine/test10/migrate-fail-8.dot +++ b/pengine/test10/migrate-fail-8.dot @@ -1,10 +1,8 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "load_stopped_hex-13 hex-13" -> "test-vm_start_0 hex-13" [ style = bold] "load_stopped_hex-13 hex-13" [ style=bold color="green" fontcolor="orange" ] "load_stopped_hex-14 hex-14" [ style=bold color="green" fontcolor="orange" ] "test-vm_start_0 hex-13" [ style=bold color="green" fontcolor="black" ] -"test-vm_stop_0 hex-14" -> "all_stopped" [ style = bold] "test-vm_stop_0 hex-14" -> "load_stopped_hex-14 hex-14" [ style = bold] "test-vm_stop_0 hex-14" -> "test-vm_start_0 hex-13" [ style = bold] "test-vm_stop_0 hex-14" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/migrate-fail-8.exp b/pengine/test10/migrate-fail-8.exp index 2e01397..52fd8f8 100644 --- a/pengine/test10/migrate-fail-8.exp +++ b/pengine/test10/migrate-fail-8.exp @@ -1,7 +1,7 @@ - + @@ -11,7 +11,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -34,19 +34,7 @@ - - - - - - - - - - - - - + diff --git a/pengine/test10/migrate-fail-8.summary b/pengine/test10/migrate-fail-8.summary index 018a466..d1b4200 100644 --- a/pengine/test10/migrate-fail-8.summary +++ b/pengine/test10/migrate-fail-8.summary @@ -13,7 +13,6 @@ Executing cluster transition: * Resource action: test-vm stop on hex-14 * Pseudo action: load_stopped_hex-13 * Pseudo action: load_stopped_hex-14 - * Pseudo action: all_stopped * Resource action: test-vm start on hex-13 Revised cluster status: diff --git a/pengine/test10/migrate-fail-9.dot b/pengine/test10/migrate-fail-9.dot index 04e6e70..d742c35 100644 --- a/pengine/test10/migrate-fail-9.dot +++ b/pengine/test10/migrate-fail-9.dot @@ -1,10 +1,8 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "load_stopped_hex-13 hex-13" -> "test-vm_start_0 hex-13" [ style = bold] "load_stopped_hex-13 hex-13" [ style=bold color="green" fontcolor="orange" ] "load_stopped_hex-14 hex-14" [ style=bold color="green" fontcolor="orange" ] "test-vm_start_0 hex-13" [ style=bold color="green" fontcolor="black" ] -"test-vm_stop_0 hex-14" -> "all_stopped" [ style = bold] "test-vm_stop_0 hex-14" -> "test-vm_start_0 hex-13" [ style = bold] "test-vm_stop_0 hex-14" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/migrate-fail-9.exp b/pengine/test10/migrate-fail-9.exp index d3ef2e9..e3dffe1 100644 --- a/pengine/test10/migrate-fail-9.exp +++ b/pengine/test10/migrate-fail-9.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -34,23 +34,10 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/migrate-fail-9.summary b/pengine/test10/migrate-fail-9.summary index 0f99e92..6fb9798 100644 --- a/pengine/test10/migrate-fail-9.summary +++ b/pengine/test10/migrate-fail-9.summary @@ -13,7 +13,6 @@ Executing cluster transition: * Resource action: test-vm stop on hex-14 * Pseudo action: load_stopped_hex-14 * Pseudo action: load_stopped_hex-13 - * Pseudo action: all_stopped * Resource action: test-vm start on hex-13 Revised cluster status: diff --git a/pengine/test10/migrate-fencing.dot b/pengine/test10/migrate-fencing.dot index b6dc6b4..600d558 100644 --- a/pengine/test10/migrate-fencing.dot +++ b/pengine/test10/migrate-fencing.dot @@ -4,13 +4,11 @@ digraph "g" { "Connectivity_stop_0" [ style=bold color="green" fontcolor="orange" ] "Connectivity_stopped_0" [ style=bold color="green" fontcolor="orange" ] "FencingChild:0_stop_0 pcmk-4" -> "Fencing_stopped_0" [ style = bold] -"FencingChild:0_stop_0 pcmk-4" -> "all_stopped" [ style = bold] "FencingChild:0_stop_0 pcmk-4" [ style=bold color="green" fontcolor="orange" ] "Fencing_stop_0" -> "FencingChild:0_stop_0 pcmk-4" [ style = bold] "Fencing_stop_0" -> "Fencing_stopped_0" [ style = bold] "Fencing_stop_0" [ style=bold color="green" fontcolor="orange" ] "Fencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "group-1_running_0" -> "lsb-dummy_start_0 pcmk-1" [ style = bold] "group-1_running_0" [ style=bold color="green" fontcolor="orange" ] "group-1_start_0" -> "group-1_running_0" [ style = bold] @@ -29,7 +27,6 @@ digraph "g" { "lsb-dummy_monitor_5000 pcmk-1" [ style=bold color="green" fontcolor="black" ] "lsb-dummy_start_0 pcmk-1" -> "lsb-dummy_monitor_5000 pcmk-1" [ style = bold] "lsb-dummy_start_0 pcmk-1" [ style=bold color="green" fontcolor="black" ] -"lsb-dummy_stop_0 pcmk-4" -> "all_stopped" [ style = bold] "lsb-dummy_stop_0 pcmk-4" -> "group-1_stop_0" [ style = bold] "lsb-dummy_stop_0 pcmk-4" -> "lsb-dummy_start_0 pcmk-1" [ style = bold] "lsb-dummy_stop_0 pcmk-4" [ style=bold color="green" fontcolor="orange" ] @@ -56,18 +53,15 @@ digraph "g" { "migrator_monitor_10000 pcmk-3" [ style=bold color="green" fontcolor="black" ] "migrator_start_0 pcmk-3" -> "migrator_monitor_10000 pcmk-3" [ style = bold] "migrator_start_0 pcmk-3" [ style=bold color="green" fontcolor="orange" ] -"migrator_stop_0 pcmk-1" -> "all_stopped" [ style = bold] "migrator_stop_0 pcmk-1" -> "migrator_start_0 pcmk-3" [ style = bold] "migrator_stop_0 pcmk-1" [ style=bold color="green" fontcolor="black" ] "ping-1:0_stop_0 pcmk-4" -> "Connectivity_stopped_0" [ style = bold] -"ping-1:0_stop_0 pcmk-4" -> "all_stopped" [ style = bold] "ping-1:0_stop_0 pcmk-4" [ style=bold color="green" fontcolor="orange" ] "r192.168.101.181_monitor_5000 pcmk-1" [ style=bold color="green" fontcolor="black" ] "r192.168.101.181_start_0 pcmk-1" -> "group-1_running_0" [ style = bold] "r192.168.101.181_start_0 pcmk-1" -> "r192.168.101.181_monitor_5000 pcmk-1" [ style = bold] "r192.168.101.181_start_0 pcmk-1" -> "r192.168.101.182_start_0 pcmk-1" [ style = bold] "r192.168.101.181_start_0 pcmk-1" [ style=bold color="green" fontcolor="black" ] -"r192.168.101.181_stop_0 pcmk-4" -> "all_stopped" [ style = bold] "r192.168.101.181_stop_0 pcmk-4" -> "group-1_stopped_0" [ style = bold] "r192.168.101.181_stop_0 pcmk-4" -> "r192.168.101.181_start_0 pcmk-1" [ style = bold] "r192.168.101.181_stop_0 pcmk-4" [ style=bold color="green" fontcolor="orange" ] @@ -76,7 +70,6 @@ digraph "g" { "r192.168.101.182_start_0 pcmk-1" -> "r192.168.101.182_monitor_5000 pcmk-1" [ style = bold] "r192.168.101.182_start_0 pcmk-1" -> "r192.168.101.183_start_0 pcmk-1" [ style = bold] "r192.168.101.182_start_0 pcmk-1" [ style=bold color="green" fontcolor="black" ] -"r192.168.101.182_stop_0 pcmk-4" -> "all_stopped" [ style = bold] "r192.168.101.182_stop_0 pcmk-4" -> "group-1_stopped_0" [ style = bold] "r192.168.101.182_stop_0 pcmk-4" -> "r192.168.101.181_stop_0 pcmk-4" [ style = bold] "r192.168.101.182_stop_0 pcmk-4" -> "r192.168.101.182_start_0 pcmk-1" [ style = bold] @@ -85,7 +78,6 @@ digraph "g" { "r192.168.101.183_start_0 pcmk-1" -> "group-1_running_0" [ style = bold] "r192.168.101.183_start_0 pcmk-1" -> "r192.168.101.183_monitor_5000 pcmk-1" [ style = bold] "r192.168.101.183_start_0 pcmk-1" [ style=bold color="green" fontcolor="black" ] -"r192.168.101.183_stop_0 pcmk-4" -> "all_stopped" [ style = bold] "r192.168.101.183_stop_0 pcmk-4" -> "group-1_stopped_0" [ style = bold] "r192.168.101.183_stop_0 pcmk-4" -> "r192.168.101.182_stop_0 pcmk-4" [ style = bold] "r192.168.101.183_stop_0 pcmk-4" -> "r192.168.101.183_start_0 pcmk-1" [ style = bold] @@ -93,13 +85,11 @@ digraph "g" { "rsc_pcmk-4_monitor_5000 pcmk-2" [ style=bold color="green" fontcolor="black" ] "rsc_pcmk-4_start_0 pcmk-2" -> "rsc_pcmk-4_monitor_5000 pcmk-2" [ style = bold] "rsc_pcmk-4_start_0 pcmk-2" [ style=bold color="green" fontcolor="black" ] -"rsc_pcmk-4_stop_0 pcmk-4" -> "all_stopped" [ style = bold] "rsc_pcmk-4_stop_0 pcmk-4" -> "rsc_pcmk-4_start_0 pcmk-2" [ style = bold] "rsc_pcmk-4_stop_0 pcmk-4" [ style=bold color="green" fontcolor="orange" ] "stateful-1:0_demote_0 pcmk-4" -> "master-1_demoted_0" [ style = bold] "stateful-1:0_demote_0 pcmk-4" -> "stateful-1:0_stop_0 pcmk-4" [ style = bold] "stateful-1:0_demote_0 pcmk-4" [ style=bold color="green" fontcolor="orange"] -"stateful-1:0_stop_0 pcmk-4" -> "all_stopped" [ style = bold] "stateful-1:0_stop_0 pcmk-4" -> "master-1_stopped_0" [ style = bold] "stateful-1:0_stop_0 pcmk-4" [ style=bold color="green" fontcolor="orange" ] "stateful-1:1_monitor_16000 pcmk-1" [ style=bold color="green" fontcolor="black" ] @@ -112,25 +102,22 @@ digraph "g" { "stonith 'reboot' pcmk-4" -> "FencingChild:0_stop_0 pcmk-4" [ style = bold] "stonith 'reboot' pcmk-4" -> "Fencing_stop_0" [ style = bold] "stonith 'reboot' pcmk-4" -> "group-1_stop_0" [ style = bold] +"stonith 'reboot' pcmk-4" -> "lsb-dummy_start_0 pcmk-1" [ style = bold] "stonith 'reboot' pcmk-4" -> "lsb-dummy_stop_0 pcmk-4" [ style = bold] "stonith 'reboot' pcmk-4" -> "master-1_stop_0" [ style = bold] +"stonith 'reboot' pcmk-4" -> "migrator_migrate_to_0 pcmk-1" [ style = bold] +"stonith 'reboot' pcmk-4" -> "migrator_start_0 pcmk-3" [ style = bold] "stonith 'reboot' pcmk-4" -> "ping-1:0_stop_0 pcmk-4" [ style = bold] +"stonith 'reboot' pcmk-4" -> "r192.168.101.181_start_0 pcmk-1" [ style = bold] "stonith 'reboot' pcmk-4" -> "r192.168.101.181_stop_0 pcmk-4" [ style = bold] +"stonith 'reboot' pcmk-4" -> "r192.168.101.182_start_0 pcmk-1" [ style = bold] "stonith 'reboot' pcmk-4" -> "r192.168.101.182_stop_0 pcmk-4" [ style = bold] +"stonith 'reboot' pcmk-4" -> "r192.168.101.183_start_0 pcmk-1" [ style = bold] "stonith 'reboot' pcmk-4" -> "r192.168.101.183_stop_0 pcmk-4" [ style = bold] +"stonith 'reboot' pcmk-4" -> "rsc_pcmk-4_start_0 pcmk-2" [ style = bold] "stonith 'reboot' pcmk-4" -> "rsc_pcmk-4_stop_0 pcmk-4" [ style = bold] "stonith 'reboot' pcmk-4" -> "stateful-1:0_demote_0 pcmk-4" [ style = bold] "stonith 'reboot' pcmk-4" -> "stateful-1:0_stop_0 pcmk-4" [ style = bold] -"stonith 'reboot' pcmk-4" -> "stonith_complete" [ style = bold] +"stonith 'reboot' pcmk-4" -> "stateful-1:1_promote_0 pcmk-1" [ style = bold] "stonith 'reboot' pcmk-4" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "lsb-dummy_start_0 pcmk-1" [ style = bold] -"stonith_complete" -> "migrator_migrate_to_0 pcmk-1" [ style = bold] -"stonith_complete" -> "migrator_start_0 pcmk-3" [ style = bold] -"stonith_complete" -> "r192.168.101.181_start_0 pcmk-1" [ style = bold] -"stonith_complete" -> "r192.168.101.182_start_0 pcmk-1" [ style = bold] -"stonith_complete" -> "r192.168.101.183_start_0 pcmk-1" [ style = bold] -"stonith_complete" -> "rsc_pcmk-4_start_0 pcmk-2" [ style = bold] -"stonith_complete" -> "stateful-1:1_promote_0 pcmk-1" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/migrate-fencing.exp b/pengine/test10/migrate-fencing.exp index 5ef64d7..0a58111 100644 --- a/pengine/test10/migrate-fencing.exp +++ b/pengine/test10/migrate-fencing.exp @@ -1,7 +1,7 @@ - + @@ -10,28 +10,28 @@ - + - + - + - + - + @@ -43,28 +43,28 @@ - + - + - + - + - + - + @@ -73,81 +73,81 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -156,51 +156,51 @@ - + - + - + - + - + - + - + - + - + - + @@ -209,51 +209,51 @@ - + - + - + - + - + - + - + - + - + - + @@ -262,42 +262,42 @@ - + - + - + - + - + - + - + @@ -309,39 +309,39 @@ - + - + - + - + - + - + - + @@ -353,77 +353,77 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -432,28 +432,28 @@ - + - + - + - + - + @@ -465,7 +465,7 @@ - + @@ -474,16 +474,16 @@ - + - + - + @@ -492,42 +492,42 @@ - + - + - + - + - + - + - + @@ -536,7 +536,7 @@ - + @@ -545,76 +545,76 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -623,63 +623,12 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/migrate-fencing.summary b/pengine/test10/migrate-fencing.summary index 44f3262..21b5f46 100644 --- a/pengine/test10/migrate-fencing.summary +++ b/pengine/test10/migrate-fencing.summary @@ -41,31 +41,29 @@ Executing cluster transition: * Pseudo action: Fencing_stop_0 * Pseudo action: rsc_pcmk-4_stop_0 * Pseudo action: lsb-dummy_stop_0 + * Resource action: migrator migrate_to on pcmk-1 * Pseudo action: Connectivity_stop_0 - * Pseudo action: stonith_complete * Pseudo action: FencingChild:0_stop_0 * Pseudo action: Fencing_stopped_0 * Pseudo action: group-1_stop_0 * Pseudo action: r192.168.101.183_stop_0 * Resource action: rsc_pcmk-4 start on pcmk-2 - * Resource action: migrator migrate_to on pcmk-1 + * Resource action: migrator migrate_from on pcmk-3 + * Resource action: migrator stop on pcmk-1 * Pseudo action: ping-1:0_stop_0 * Pseudo action: Connectivity_stopped_0 * Pseudo action: r192.168.101.182_stop_0 * Resource action: rsc_pcmk-4 monitor=5000 on pcmk-2 - * Resource action: migrator migrate_from on pcmk-3 - * Resource action: migrator stop on pcmk-1 - * Pseudo action: r192.168.101.181_stop_0 * Pseudo action: migrator_start_0 - * Pseudo action: group-1_stopped_0 + * Pseudo action: r192.168.101.181_stop_0 * Resource action: migrator monitor=10000 on pcmk-3 + * Pseudo action: group-1_stopped_0 * Pseudo action: master-1_demote_0 * Pseudo action: stateful-1:0_demote_0 * Pseudo action: master-1_demoted_0 * Pseudo action: master-1_stop_0 * Pseudo action: stateful-1:0_stop_0 * Pseudo action: master-1_stopped_0 - * Pseudo action: all_stopped * Pseudo action: master-1_promote_0 * Resource action: stateful-1:1 promote on pcmk-1 * Pseudo action: master-1_promoted_0 diff --git a/pengine/test10/migrate-partial-1.dot b/pengine/test10/migrate-partial-1.dot index 8f90595..759f8fe 100644 --- a/pengine/test10/migrate-partial-1.dot +++ b/pengine/test10/migrate-partial-1.dot @@ -1,7 +1,5 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "load_stopped_hex-13 hex-13" [ style=bold color="green" fontcolor="orange" ] "load_stopped_hex-14 hex-14" [ style=bold color="green" fontcolor="orange" ] -"test-vm_stop_0 hex-14" -> "all_stopped" [ style = bold] "test-vm_stop_0 hex-14" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/migrate-partial-1.exp b/pengine/test10/migrate-partial-1.exp index 781226c..e069ffa 100644 --- a/pengine/test10/migrate-partial-1.exp +++ b/pengine/test10/migrate-partial-1.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -18,23 +18,10 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/migrate-partial-1.summary b/pengine/test10/migrate-partial-1.summary index d0caf3b..87f95df 100644 --- a/pengine/test10/migrate-partial-1.summary +++ b/pengine/test10/migrate-partial-1.summary @@ -12,7 +12,6 @@ Executing cluster transition: * Resource action: test-vm stop on hex-14 * Pseudo action: load_stopped_hex-14 * Pseudo action: load_stopped_hex-13 - * Pseudo action: all_stopped Revised cluster status: Online: [ hex-13 hex-14 ] diff --git a/pengine/test10/migrate-partial-2.dot b/pengine/test10/migrate-partial-2.dot index ce333a2..eeea967 100644 --- a/pengine/test10/migrate-partial-2.dot +++ b/pengine/test10/migrate-partial-2.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "load_stopped_hex-13 hex-13" -> "test-vm_start_0 hex-13" [ style = bold] "load_stopped_hex-13 hex-13" [ style=bold color="green" fontcolor="orange"] "load_stopped_hex-14 hex-14" [ style=bold color="green" fontcolor="orange"] @@ -7,7 +6,6 @@ "test-vm_migrate_from_0 hex-13" -> "test-vm_stop_0 hex-14" [ style = bold] "test-vm_migrate_from_0 hex-13" [ style=bold color="green" fontcolor="black"] "test-vm_start_0 hex-13" [ style=bold color="green" fontcolor="orange"] -"test-vm_stop_0 hex-14" -> "all_stopped" [ style = bold] "test-vm_stop_0 hex-14" -> "load_stopped_hex-14 hex-14" [ style = bold] "test-vm_stop_0 hex-14" -> "test-vm_start_0 hex-13" [ style = bold] "test-vm_stop_0 hex-14" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/migrate-partial-2.exp b/pengine/test10/migrate-partial-2.exp index 59dd5f8..c6a8412 100644 --- a/pengine/test10/migrate-partial-2.exp +++ b/pengine/test10/migrate-partial-2.exp @@ -1,7 +1,7 @@ - + @@ -10,66 +10,53 @@ - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - diff --git a/pengine/test10/migrate-partial-2.summary b/pengine/test10/migrate-partial-2.summary index 7ef1a5d..113d0ca 100644 --- a/pengine/test10/migrate-partial-2.summary +++ b/pengine/test10/migrate-partial-2.summary @@ -14,7 +14,6 @@ Executing cluster transition: * Resource action: test-vm stop on hex-14 * Pseudo action: load_stopped_hex-14 * Pseudo action: load_stopped_hex-13 - * Pseudo action: all_stopped * Pseudo action: test-vm_start_0 Revised cluster status: diff --git a/pengine/test10/migrate-partial-3.dot b/pengine/test10/migrate-partial-3.dot index 5c8966e..1219271 100644 --- a/pengine/test10/migrate-partial-3.dot +++ b/pengine/test10/migrate-partial-3.dot @@ -1,11 +1,9 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "load_stopped_hex-13 hex-13" -> "test-vm_start_0 hex-13" [ style = bold] "load_stopped_hex-13 hex-13" [ style=bold color="green" fontcolor="orange" ] "load_stopped_hex-14 hex-14" [ style=bold color="green" fontcolor="orange" ] "load_stopped_hex-15 hex-15" [ style=bold color="green" fontcolor="orange" ] "test-vm_start_0 hex-13" [ style=bold color="green" fontcolor="black" ] -"test-vm_stop_0 hex-14" -> "all_stopped" [ style = bold] "test-vm_stop_0 hex-14" -> "load_stopped_hex-14 hex-14" [ style = bold] "test-vm_stop_0 hex-14" -> "test-vm_start_0 hex-13" [ style = bold] "test-vm_stop_0 hex-14" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/migrate-partial-3.exp b/pengine/test10/migrate-partial-3.exp index 34cda86..73e5139 100644 --- a/pengine/test10/migrate-partial-3.exp +++ b/pengine/test10/migrate-partial-3.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -42,25 +42,13 @@ - + - - - - - - - - - - - - - + diff --git a/pengine/test10/migrate-partial-3.summary b/pengine/test10/migrate-partial-3.summary index 0dbe46a..8e773e3 100644 --- a/pengine/test10/migrate-partial-3.summary +++ b/pengine/test10/migrate-partial-3.summary @@ -16,7 +16,6 @@ Executing cluster transition: * Pseudo action: load_stopped_hex-15 * Pseudo action: load_stopped_hex-13 * Pseudo action: load_stopped_hex-14 - * Pseudo action: all_stopped * Resource action: test-vm start on hex-13 Revised cluster status: diff --git a/pengine/test10/migrate-partial-4.dot b/pengine/test10/migrate-partial-4.dot index 1639f9e..dbc349f 100644 --- a/pengine/test10/migrate-partial-4.dot +++ b/pengine/test10/migrate-partial-4.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "drbd-mgs:0_monitor_30000 lustre01-left" [ style=bold color="green" fontcolor="black"] "drbd-mgs:0_post_notify_start_0 lustre01-left" -> "ms-drbd-mgs_confirmed-post_notify_running_0" [ style = bold] "drbd-mgs:0_post_notify_start_0 lustre01-left" [ style=bold color="green" fontcolor="black"] @@ -20,7 +19,6 @@ digraph "g" { "lustre_migrate_to_0 lustre03-left" -> "lustre_migrate_from_0 lustre04-left" [ style = bold] "lustre_migrate_to_0 lustre03-left" [ style=bold color="green" fontcolor="black"] "lustre_start_0 lustre04-left" [ style=bold color="green" fontcolor="orange"] -"lustre_stop_0 lustre03-left" -> "all_stopped" [ style = bold] "lustre_stop_0 lustre03-left" -> "lustre_start_0 lustre04-left" [ style = bold] "lustre_stop_0 lustre03-left" [ style=bold color="green" fontcolor="black"] "ms-drbd-mgs_confirmed-post_notify_running_0" -> "drbd-mgs:0_monitor_30000 lustre01-left" [ style = bold] @@ -48,10 +46,8 @@ digraph "g" { "testfs_migrate_to_0 lustre02-left" -> "testfs_migrate_from_0 lustre03-left" [ style = dashed] "testfs_migrate_to_0 lustre02-left" [ style=dashed color="red" fontcolor="black"] "testfs_start_0 lustre03-left" [ style=bold color="green" fontcolor="black"] -"testfs_stop_0 lustre01-left" -> "all_stopped" [ style = bold] "testfs_stop_0 lustre01-left" -> "testfs_start_0 lustre03-left" [ style = bold] "testfs_stop_0 lustre01-left" [ style=bold color="green" fontcolor="black"] -"testfs_stop_0 lustre02-left" -> "all_stopped" [ style = bold] "testfs_stop_0 lustre02-left" -> "testfs_start_0 lustre03-left" [ style = bold] "testfs_stop_0 lustre02-left" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/migrate-partial-4.exp b/pengine/test10/migrate-partial-4.exp index edddc37..9d80d5f 100644 --- a/pengine/test10/migrate-partial-4.exp +++ b/pengine/test10/migrate-partial-4.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,20 +19,20 @@ - + - + - + @@ -41,51 +41,51 @@ - + - + - + - + - + - + - + - + - + @@ -94,7 +94,7 @@ - + @@ -103,136 +103,136 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -240,49 +240,31 @@ - + - + - + - + - + - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/migrate-partial-4.summary b/pengine/test10/migrate-partial-4.summary index 8fd1d4c..1468b2d 100644 --- a/pengine/test10/migrate-partial-4.summary +++ b/pengine/test10/migrate-partial-4.summary @@ -65,7 +65,6 @@ Executing cluster transition: * Resource action: testfs start on lustre03-left * Pseudo action: ms-drbd-mgs_confirmed-pre_notify_start_0 * Pseudo action: ms-drbd-mgs_start_0 - * Pseudo action: all_stopped * Pseudo action: lustre_start_0 * Resource action: drbd-mgs:0 start on lustre01-left * Resource action: drbd-mgs:1 start on lustre02-left diff --git a/pengine/test10/migrate-shutdown.dot b/pengine/test10/migrate-shutdown.dot index 12186ef..585c84f 100644 --- a/pengine/test10/migrate-shutdown.dot +++ b/pengine/test10/migrate-shutdown.dot @@ -5,10 +5,8 @@ digraph "g" { "Connectivity_stop_0" -> "ping-1:3_stop_0 pcmk-4" [ style = bold] "Connectivity_stop_0" [ style=bold color="green" fontcolor="orange"] "Connectivity_stopped_0" [ style=bold color="green" fontcolor="orange"] -"Fencing_stop_0 pcmk-1" -> "all_stopped" [ style = bold] "Fencing_stop_0 pcmk-1" -> "do_shutdown pcmk-1" [ style = bold] "Fencing_stop_0 pcmk-1" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "do_shutdown pcmk-1" [ style=bold color="green" fontcolor="black"] "do_shutdown pcmk-2" -> "do_shutdown pcmk-1" [ style = bold] "do_shutdown pcmk-2" [ style=bold color="green" fontcolor="black"] @@ -23,7 +21,6 @@ digraph "g" { "group-1_stop_0" [ style=bold color="green" fontcolor="orange"] "group-1_stopped_0" -> "master-1_demote_0" [ style = bold] "group-1_stopped_0" [ style=bold color="green" fontcolor="orange"] -"lsb-dummy_stop_0 pcmk-2" -> "all_stopped" [ style = bold] "lsb-dummy_stop_0 pcmk-2" -> "do_shutdown pcmk-2" [ style = bold] "lsb-dummy_stop_0 pcmk-2" -> "group-1_stop_0" [ style = bold] "lsb-dummy_stop_0 pcmk-2" [ style=bold color="green" fontcolor="black"] @@ -38,59 +35,45 @@ digraph "g" { "master-1_stop_0" -> "stateful-1:3_stop_0 pcmk-4" [ style = bold] "master-1_stop_0" [ style=bold color="green" fontcolor="orange"] "master-1_stopped_0" [ style=bold color="green" fontcolor="orange"] -"migrator_stop_0 pcmk-1" -> "all_stopped" [ style = bold] "migrator_stop_0 pcmk-1" -> "do_shutdown pcmk-1" [ style = bold] "migrator_stop_0 pcmk-1" [ style=bold color="green" fontcolor="black"] -"migrator_stop_0 pcmk-3" -> "all_stopped" [ style = bold] "migrator_stop_0 pcmk-3" -> "do_shutdown pcmk-3" [ style = bold] "migrator_stop_0 pcmk-3" [ style=bold color="green" fontcolor="black"] "ping-1:0_stop_0 pcmk-1" -> "Connectivity_stopped_0" [ style = bold] -"ping-1:0_stop_0 pcmk-1" -> "all_stopped" [ style = bold] "ping-1:0_stop_0 pcmk-1" -> "do_shutdown pcmk-1" [ style = bold] "ping-1:0_stop_0 pcmk-1" [ style=bold color="green" fontcolor="black"] "ping-1:1_stop_0 pcmk-2" -> "Connectivity_stopped_0" [ style = bold] -"ping-1:1_stop_0 pcmk-2" -> "all_stopped" [ style = bold] "ping-1:1_stop_0 pcmk-2" -> "do_shutdown pcmk-2" [ style = bold] "ping-1:1_stop_0 pcmk-2" [ style=bold color="green" fontcolor="black"] "ping-1:3_stop_0 pcmk-4" -> "Connectivity_stopped_0" [ style = bold] -"ping-1:3_stop_0 pcmk-4" -> "all_stopped" [ style = bold] "ping-1:3_stop_0 pcmk-4" -> "do_shutdown pcmk-4" [ style = bold] "ping-1:3_stop_0 pcmk-4" [ style=bold color="green" fontcolor="black"] -"r192.168.122.105_stop_0 pcmk-2" -> "all_stopped" [ style = bold] "r192.168.122.105_stop_0 pcmk-2" -> "do_shutdown pcmk-2" [ style = bold] "r192.168.122.105_stop_0 pcmk-2" -> "group-1_stopped_0" [ style = bold] "r192.168.122.105_stop_0 pcmk-2" [ style=bold color="green" fontcolor="black"] -"r192.168.122.106_stop_0 pcmk-2" -> "all_stopped" [ style = bold] "r192.168.122.106_stop_0 pcmk-2" -> "do_shutdown pcmk-2" [ style = bold] "r192.168.122.106_stop_0 pcmk-2" -> "group-1_stopped_0" [ style = bold] "r192.168.122.106_stop_0 pcmk-2" -> "r192.168.122.105_stop_0 pcmk-2" [ style = bold] "r192.168.122.106_stop_0 pcmk-2" [ style=bold color="green" fontcolor="black"] -"r192.168.122.107_stop_0 pcmk-2" -> "all_stopped" [ style = bold] "r192.168.122.107_stop_0 pcmk-2" -> "do_shutdown pcmk-2" [ style = bold] "r192.168.122.107_stop_0 pcmk-2" -> "group-1_stopped_0" [ style = bold] "r192.168.122.107_stop_0 pcmk-2" -> "r192.168.122.106_stop_0 pcmk-2" [ style = bold] "r192.168.122.107_stop_0 pcmk-2" [ style=bold color="green" fontcolor="black"] -"rsc_pcmk-1_stop_0 pcmk-1" -> "all_stopped" [ style = bold] "rsc_pcmk-1_stop_0 pcmk-1" -> "do_shutdown pcmk-1" [ style = bold] "rsc_pcmk-1_stop_0 pcmk-1" [ style=bold color="green" fontcolor="black"] -"rsc_pcmk-2_stop_0 pcmk-2" -> "all_stopped" [ style = bold] "rsc_pcmk-2_stop_0 pcmk-2" -> "do_shutdown pcmk-2" [ style = bold] "rsc_pcmk-2_stop_0 pcmk-2" [ style=bold color="green" fontcolor="black"] -"rsc_pcmk-4_stop_0 pcmk-4" -> "all_stopped" [ style = bold] "rsc_pcmk-4_stop_0 pcmk-4" -> "do_shutdown pcmk-4" [ style = bold] "rsc_pcmk-4_stop_0 pcmk-4" [ style=bold color="green" fontcolor="black"] "stateful-1:0_demote_0 pcmk-2" -> "master-1_demoted_0" [ style = bold] "stateful-1:0_demote_0 pcmk-2" -> "stateful-1:0_stop_0 pcmk-2" [ style = bold] "stateful-1:0_demote_0 pcmk-2" [ style=bold color="green" fontcolor="black"] -"stateful-1:0_stop_0 pcmk-2" -> "all_stopped" [ style = bold] "stateful-1:0_stop_0 pcmk-2" -> "do_shutdown pcmk-2" [ style = bold] "stateful-1:0_stop_0 pcmk-2" -> "master-1_stopped_0" [ style = bold] "stateful-1:0_stop_0 pcmk-2" [ style=bold color="green" fontcolor="black"] -"stateful-1:2_stop_0 pcmk-1" -> "all_stopped" [ style = bold] "stateful-1:2_stop_0 pcmk-1" -> "do_shutdown pcmk-1" [ style = bold] "stateful-1:2_stop_0 pcmk-1" -> "master-1_stopped_0" [ style = bold] "stateful-1:2_stop_0 pcmk-1" [ style=bold color="green" fontcolor="black"] -"stateful-1:3_stop_0 pcmk-4" -> "all_stopped" [ style = bold] "stateful-1:3_stop_0 pcmk-4" -> "do_shutdown pcmk-4" [ style = bold] "stateful-1:3_stop_0 pcmk-4" -> "master-1_stopped_0" [ style = bold] "stateful-1:3_stop_0 pcmk-4" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/migrate-shutdown.exp b/pengine/test10/migrate-shutdown.exp index 3b91933..352b148 100644 --- a/pengine/test10/migrate-shutdown.exp +++ b/pengine/test10/migrate-shutdown.exp @@ -1,7 +1,7 @@ - + @@ -10,85 +10,85 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -97,7 +97,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -124,7 +124,7 @@ - + @@ -133,7 +133,7 @@ - + @@ -142,67 +142,67 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -210,122 +210,122 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -334,19 +334,19 @@ - + - + - + - + @@ -355,13 +355,13 @@ - + - + @@ -370,31 +370,31 @@ - + - + - + - + - + - + - + - + @@ -403,85 +403,28 @@ - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/migrate-shutdown.summary b/pengine/test10/migrate-shutdown.summary index 24008a9..586d3ac 100644 --- a/pengine/test10/migrate-shutdown.summary +++ b/pengine/test10/migrate-shutdown.summary @@ -72,7 +72,6 @@ Executing cluster transition: * Cluster action: do_shutdown on pcmk-4 * Cluster action: do_shutdown on pcmk-2 * Cluster action: do_shutdown on pcmk-1 - * Pseudo action: all_stopped Revised cluster status: Online: [ pcmk-1 pcmk-2 pcmk-3 pcmk-4 ] diff --git a/pengine/test10/migrate-start-complex.dot b/pengine/test10/migrate-start-complex.dot index 1218430..c4e3c5a 100644 --- a/pengine/test10/migrate-start-complex.dot +++ b/pengine/test10/migrate-start-complex.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "bottom:0_monitor_0 dom0-01" -> "clone-bottom_start_0" [ style = bold] "bottom:0_monitor_0 dom0-01" [ style=bold color="green" fontcolor="black" ] "bottom:0_start_0 dom0-01" -> "clone-bottom_running_0" [ style = bold] @@ -35,11 +34,9 @@ digraph "g" { "domU-test01_migrate_to_0 dom0-02" [ style=bold color="green" fontcolor="black" ] "domU-test01_start_0 dom0-01" -> "top_start_0 dom0-01" [ style = bold] "domU-test01_start_0 dom0-01" [ style=bold color="green" fontcolor="orange" ] -"domU-test01_stop_0 dom0-02" -> "all_stopped" [ style = bold] "domU-test01_stop_0 dom0-02" -> "domU-test01_start_0 dom0-01" [ style = bold] "domU-test01_stop_0 dom0-02" [ style=bold color="green" fontcolor="black" ] "top_start_0 dom0-01" [ style=bold color="green" fontcolor="black" ] -"top_stop_0 dom0-02" -> "all_stopped" [ style = bold] "top_stop_0 dom0-02" -> "domU-test01_migrate_to_0 dom0-02" [ style = bold] "top_stop_0 dom0-02" -> "domU-test01_stop_0 dom0-02" [ style = bold] "top_stop_0 dom0-02" -> "top_start_0 dom0-01" [ style = bold] diff --git a/pengine/test10/migrate-start-complex.exp b/pengine/test10/migrate-start-complex.exp index 786d4da..3a9829d 100644 --- a/pengine/test10/migrate-start-complex.exp +++ b/pengine/test10/migrate-start-complex.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,131 +26,131 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -158,20 +158,20 @@ - + - + - + @@ -180,20 +180,20 @@ - + - + - + @@ -202,49 +202,34 @@ - + - + - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/migrate-start-complex.summary b/pengine/test10/migrate-start-complex.summary index 9dd0924..077d966 100644 --- a/pengine/test10/migrate-start-complex.summary +++ b/pengine/test10/migrate-start-complex.summary @@ -33,7 +33,6 @@ Executing cluster transition: * Resource action: domU-test01 migrate_to on dom0-02 * Resource action: domU-test01 migrate_from on dom0-01 * Resource action: domU-test01 stop on dom0-02 - * Pseudo action: all_stopped * Pseudo action: domU-test01_start_0 * Resource action: top start on dom0-01 diff --git a/pengine/test10/migrate-start.dot b/pengine/test10/migrate-start.dot index cfe9ae1..3f314bf 100644 --- a/pengine/test10/migrate-start.dot +++ b/pengine/test10/migrate-start.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "clone-dom0-iscsi1_running_0" -> "domU-test01_migrate_to_0 dom0-02" [ style = bold] "clone-dom0-iscsi1_running_0" -> "domU-test01_start_0 dom0-01" [ style = bold] "clone-dom0-iscsi1_running_0" [ style=bold color="green" fontcolor="orange" ] @@ -19,7 +18,6 @@ digraph "g" { "domU-test01_migrate_to_0 dom0-02" -> "domU-test01_migrate_from_0 dom0-01" [ style = bold] "domU-test01_migrate_to_0 dom0-02" [ style=bold color="green" fontcolor="black" ] "domU-test01_start_0 dom0-01" [ style=bold color="green" fontcolor="orange" ] -"domU-test01_stop_0 dom0-02" -> "all_stopped" [ style = bold] "domU-test01_stop_0 dom0-02" -> "domU-test01_start_0 dom0-01" [ style = bold] "domU-test01_stop_0 dom0-02" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/migrate-start.exp b/pengine/test10/migrate-start.exp index fcb8511..465f987 100644 --- a/pengine/test10/migrate-start.exp +++ b/pengine/test10/migrate-start.exp @@ -1,135 +1,122 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - diff --git a/pengine/test10/migrate-start.summary b/pengine/test10/migrate-start.summary index fb6fdef..bad00bf 100644 --- a/pengine/test10/migrate-start.summary +++ b/pengine/test10/migrate-start.summary @@ -20,7 +20,6 @@ Executing cluster transition: * Resource action: domU-test01 migrate_to on dom0-02 * Resource action: domU-test01 migrate_from on dom0-01 * Resource action: domU-test01 stop on dom0-02 - * Pseudo action: all_stopped * Pseudo action: domU-test01_start_0 Revised cluster status: diff --git a/pengine/test10/migrate-stop-complex.dot b/pengine/test10/migrate-stop-complex.dot index 258aa15..055722f 100644 --- a/pengine/test10/migrate-stop-complex.dot +++ b/pengine/test10/migrate-stop-complex.dot @@ -1,6 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] -"bottom:0_stop_0 dom0-02" -> "all_stopped" [ style = bold] "bottom:0_stop_0 dom0-02" -> "clone-bottom_stopped_0" [ style = bold] "bottom:0_stop_0 dom0-02" [ style=bold color="green" fontcolor="black"] "clone-bottom_stop_0" -> "bottom:0_stop_0 dom0-02" [ style = bold] @@ -11,7 +9,6 @@ digraph "g" { "clone-dom0-iscsi1_stop_0" -> "dom0-iscsi1:1_stop_0" [ style = bold] "clone-dom0-iscsi1_stop_0" [ style=bold color="green" fontcolor="orange" ] "clone-dom0-iscsi1_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"dom0-iscsi1-cnx1:0_stop_0 dom0-02" -> "all_stopped" [ style = bold] "dom0-iscsi1-cnx1:0_stop_0 dom0-02" -> "dom0-iscsi1:1_stopped_0" [ style = bold] "dom0-iscsi1-cnx1:0_stop_0 dom0-02" [ style=bold color="green" fontcolor="black" ] "dom0-iscsi1:1_stop_0" -> "dom0-iscsi1-cnx1:0_stop_0 dom0-02" [ style = bold] @@ -26,13 +23,11 @@ digraph "g" { "domU-test01_migrate_to_0 dom0-02" [ style=bold color="green" fontcolor="black" ] "domU-test01_start_0 dom0-01" -> "top_start_0 dom0-01" [ style = bold] "domU-test01_start_0 dom0-01" [ style=bold color="green" fontcolor="orange" ] -"domU-test01_stop_0 dom0-02" -> "all_stopped" [ style = bold] "domU-test01_stop_0 dom0-02" -> "clone-bottom_stop_0" [ style = dashed] "domU-test01_stop_0 dom0-02" -> "clone-dom0-iscsi1_stop_0" [ style = dashed] "domU-test01_stop_0 dom0-02" -> "domU-test01_start_0 dom0-01" [ style = bold] "domU-test01_stop_0 dom0-02" [ style=bold color="green" fontcolor="black" ] "top_start_0 dom0-01" [ style=bold color="green" fontcolor="black" ] -"top_stop_0 dom0-02" -> "all_stopped" [ style = bold] "top_stop_0 dom0-02" -> "domU-test01_migrate_to_0 dom0-02" [ style = bold] "top_stop_0 dom0-02" -> "domU-test01_stop_0 dom0-02" [ style = bold] "top_stop_0 dom0-02" -> "top_start_0 dom0-01" [ style = bold] diff --git a/pengine/test10/migrate-stop-complex.exp b/pengine/test10/migrate-stop-complex.exp index 0f57988..a70cd34 100644 --- a/pengine/test10/migrate-stop-complex.exp +++ b/pengine/test10/migrate-stop-complex.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,119 +26,119 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -146,60 +146,38 @@ - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/migrate-stop-complex.summary b/pengine/test10/migrate-stop-complex.summary index 4aa6cf7..ec3e9c6 100644 --- a/pengine/test10/migrate-stop-complex.summary +++ b/pengine/test10/migrate-stop-complex.summary @@ -27,7 +27,6 @@ Executing cluster transition: * Resource action: dom0-iscsi1-cnx1:0 stop on dom0-02 * Resource action: bottom:0 stop on dom0-02 * Pseudo action: clone-bottom_stopped_0 - * Pseudo action: all_stopped * Pseudo action: domU-test01_start_0 * Pseudo action: dom0-iscsi1:1_stopped_0 * Pseudo action: clone-dom0-iscsi1_stopped_0 diff --git a/pengine/test10/migrate-stop-start-complex.dot b/pengine/test10/migrate-stop-start-complex.dot index 416db98..0ca4ed9 100644 --- a/pengine/test10/migrate-stop-start-complex.dot +++ b/pengine/test10/migrate-stop-start-complex.dot @@ -1,8 +1,6 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "bottom:0_start_0 dom0-01" -> "clone-bottom_running_0" [ style = bold] "bottom:0_start_0 dom0-01" [ style=bold color="green" fontcolor="black" ] -"bottom:0_stop_0 dom0-02" -> "all_stopped" [ style = bold] "bottom:0_stop_0 dom0-02" -> "bottom:0_start_0 dom0-01" [ style = bold] "bottom:0_stop_0 dom0-02" -> "clone-bottom_stopped_0" [ style = bold] "bottom:0_stop_0 dom0-02" [ style=bold color="green" fontcolor="black" ] @@ -20,7 +18,6 @@ digraph "g" { "clone-dom0-iscsi1_stop_0" [ style=bold color="green" fontcolor="orange" ] "clone-dom0-iscsi1_stopped_0" -> "clone-bottom_stop_0" [ style = bold] "clone-dom0-iscsi1_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"dom0-iscsi1-cnx1:0_stop_0 dom0-02" -> "all_stopped" [ style = bold] "dom0-iscsi1-cnx1:0_stop_0 dom0-02" -> "dom0-iscsi1:1_stopped_0" [ style = bold] "dom0-iscsi1-cnx1:0_stop_0 dom0-02" [ style=bold color="green" fontcolor="black" ] "dom0-iscsi1:1_stop_0" -> "dom0-iscsi1-cnx1:0_stop_0 dom0-02" [ style = bold] @@ -35,7 +32,6 @@ digraph "g" { "domU-test01_migrate_to_0 dom0-02" -> "domU-test01_migrate_from_0 dom0-01" [ style = bold] "domU-test01_migrate_to_0 dom0-02" [ style=bold color="green" fontcolor="black" ] "domU-test01_start_0 dom0-01" [ style=bold color="green" fontcolor="orange" ] -"domU-test01_stop_0 dom0-02" -> "all_stopped" [ style = bold] "domU-test01_stop_0 dom0-02" -> "clone-dom0-iscsi1_stop_0" [ style = dashed] "domU-test01_stop_0 dom0-02" -> "domU-test01_start_0 dom0-01" [ style = bold] "domU-test01_stop_0 dom0-02" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/migrate-stop-start-complex.exp b/pengine/test10/migrate-stop-start-complex.exp index 335c3dd..9087628 100644 --- a/pengine/test10/migrate-stop-start-complex.exp +++ b/pengine/test10/migrate-stop-start-complex.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,90 +23,90 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -114,105 +114,87 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/migrate-stop-start-complex.summary b/pengine/test10/migrate-stop-start-complex.summary index f0f5843..0c26ef6 100644 --- a/pengine/test10/migrate-stop-start-complex.summary +++ b/pengine/test10/migrate-stop-start-complex.summary @@ -30,7 +30,6 @@ Executing cluster transition: * Resource action: bottom:0 stop on dom0-02 * Pseudo action: clone-bottom_stopped_0 * Pseudo action: clone-bottom_start_0 - * Pseudo action: all_stopped * Resource action: bottom:0 start on dom0-01 * Pseudo action: clone-bottom_running_0 diff --git a/pengine/test10/migrate-stop.dot b/pengine/test10/migrate-stop.dot index 738d4cb..66b0418 100644 --- a/pengine/test10/migrate-stop.dot +++ b/pengine/test10/migrate-stop.dot @@ -1,10 +1,8 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "clone-dom0-iscsi1_stop_0" -> "clone-dom0-iscsi1_stopped_0" [ style = bold] "clone-dom0-iscsi1_stop_0" -> "dom0-iscsi1:1_stop_0" [ style = bold] "clone-dom0-iscsi1_stop_0" [ style=bold color="green" fontcolor="orange" ] "clone-dom0-iscsi1_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"dom0-iscsi1-cnx1:0_stop_0 dom0-02" -> "all_stopped" [ style = bold] "dom0-iscsi1-cnx1:0_stop_0 dom0-02" -> "dom0-iscsi1:1_stopped_0" [ style = bold] "dom0-iscsi1-cnx1:0_stop_0 dom0-02" [ style=bold color="green" fontcolor="black" ] "dom0-iscsi1:1_stop_0" -> "dom0-iscsi1-cnx1:0_stop_0 dom0-02" [ style = bold] @@ -18,7 +16,6 @@ "domU-test01_migrate_to_0 dom0-02" -> "domU-test01_migrate_from_0 dom0-01" [ style = bold] "domU-test01_migrate_to_0 dom0-02" [ style=bold color="green" fontcolor="black" ] "domU-test01_start_0 dom0-01" [ style=bold color="green" fontcolor="orange" ] -"domU-test01_stop_0 dom0-02" -> "all_stopped" [ style = bold] "domU-test01_stop_0 dom0-02" -> "clone-dom0-iscsi1_stop_0" [ style = dashed] "domU-test01_stop_0 dom0-02" -> "domU-test01_start_0 dom0-01" [ style = bold] "domU-test01_stop_0 dom0-02" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/migrate-stop.exp b/pengine/test10/migrate-stop.exp index 4840658..313ed17 100644 --- a/pengine/test10/migrate-stop.exp +++ b/pengine/test10/migrate-stop.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,109 +23,93 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/migrate-stop.summary b/pengine/test10/migrate-stop.summary index 0a939dd..d0b7aed 100644 --- a/pengine/test10/migrate-stop.summary +++ b/pengine/test10/migrate-stop.summary @@ -18,7 +18,6 @@ Executing cluster transition: * Resource action: domU-test01 stop on dom0-02 * Pseudo action: dom0-iscsi1:1_stop_0 * Resource action: dom0-iscsi1-cnx1:0 stop on dom0-02 - * Pseudo action: all_stopped * Pseudo action: domU-test01_start_0 * Pseudo action: dom0-iscsi1:1_stopped_0 * Pseudo action: clone-dom0-iscsi1_stopped_0 diff --git a/pengine/test10/migrate-stop_start.dot b/pengine/test10/migrate-stop_start.dot index d9b03f0..849db3f 100644 --- a/pengine/test10/migrate-stop_start.dot +++ b/pengine/test10/migrate-stop_start.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "clone-dom0-iscsi1_running_0" -> "domU-test01_migrate_to_0 dom0-02" [ style = bold] "clone-dom0-iscsi1_running_0" -> "domU-test01_start_0 dom0-01" [ style = bold] "clone-dom0-iscsi1_running_0" [ style=bold color="green" fontcolor="orange" ] @@ -13,7 +12,6 @@ digraph "g" { "clone-dom0-iscsi1_stopped_0" [ style=bold color="green" fontcolor="orange" ] "dom0-iscsi1-cnx1:0_start_0 dom0-01" -> "dom0-iscsi1:0_running_0" [ style = bold] "dom0-iscsi1-cnx1:0_start_0 dom0-01" [ style=bold color="green" fontcolor="black" ] -"dom0-iscsi1-cnx1:0_stop_0 dom0-02" -> "all_stopped" [ style = bold] "dom0-iscsi1-cnx1:0_stop_0 dom0-02" -> "dom0-iscsi1-cnx1:0_start_0 dom0-01" [ style = bold] "dom0-iscsi1-cnx1:0_stop_0 dom0-02" -> "dom0-iscsi1:0_stopped_0" [ style = bold] "dom0-iscsi1-cnx1:0_stop_0 dom0-02" [ style=bold color="green" fontcolor="black" ] @@ -34,7 +32,6 @@ digraph "g" { "domU-test01_migrate_to_0 dom0-02" -> "domU-test01_migrate_from_0 dom0-01" [ style = bold] "domU-test01_migrate_to_0 dom0-02" [ style=bold color="green" fontcolor="black"] "domU-test01_start_0 dom0-01" [ style=bold color="green" fontcolor="orange"] -"domU-test01_stop_0 dom0-02" -> "all_stopped" [ style = bold] "domU-test01_stop_0 dom0-02" -> "clone-dom0-iscsi1_stop_0" [ style = dashed] "domU-test01_stop_0 dom0-02" -> "domU-test01_start_0 dom0-01" [ style = bold] "domU-test01_stop_0 dom0-02" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/migrate-stop_start.exp b/pengine/test10/migrate-stop_start.exp index e57cab2..e04d514 100644 --- a/pengine/test10/migrate-stop_start.exp +++ b/pengine/test10/migrate-stop_start.exp @@ -1,165 +1,165 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -167,43 +167,28 @@ - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/migrate-stop_start.summary b/pengine/test10/migrate-stop_start.summary index de89651..c82db13 100644 --- a/pengine/test10/migrate-stop_start.summary +++ b/pengine/test10/migrate-stop_start.summary @@ -26,7 +26,6 @@ Executing cluster transition: * Resource action: domU-test01 migrate_to on dom0-02 * Resource action: domU-test01 migrate_from on dom0-01 * Resource action: domU-test01 stop on dom0-02 - * Pseudo action: all_stopped * Pseudo action: domU-test01_start_0 Revised cluster status: diff --git a/pengine/test10/migrate-success.exp b/pengine/test10/migrate-success.exp index f13d0cb..09652f9 100644 --- a/pengine/test10/migrate-success.exp +++ b/pengine/test10/migrate-success.exp @@ -1,7 +1,7 @@ - + @@ -9,7 +9,7 @@ - + diff --git a/pengine/test10/migration-behind-migrating-remote.dot b/pengine/test10/migration-behind-migrating-remote.dot index 7f8d745..00f0348 100644 --- a/pengine/test10/migration-behind-migrating-remote.dot +++ b/pengine/test10/migration-behind-migrating-remote.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "remote1_migrate_from_0 node2" -> "remote1_start_0 node2" [ style = bold] "remote1_migrate_from_0 node2" -> "remote1_stop_0 node1" [ style = bold] "remote1_migrate_from_0 node2" [ style=bold color="green" fontcolor="black"] @@ -8,7 +7,6 @@ digraph "g" { "remote1_monitor_60000 node2" [ style=bold color="green" fontcolor="black"] "remote1_start_0 node2" -> "remote1_monitor_60000 node2" [ style = bold] "remote1_start_0 node2" [ style=bold color="green" fontcolor="orange"] -"remote1_stop_0 node1" -> "all_stopped" [ style = bold] "remote1_stop_0 node1" -> "remote1_start_0 node2" [ style = bold] "remote1_stop_0 node1" [ style=bold color="green" fontcolor="black"] "rsc1_migrate_from_0 remote2" -> "rsc1_start_0 remote2" [ style = bold] @@ -20,7 +18,6 @@ digraph "g" { "rsc1_monitor_10000 remote2" [ style=bold color="green" fontcolor="black"] "rsc1_start_0 remote2" -> "rsc1_monitor_10000 remote2" [ style = bold] "rsc1_start_0 remote2" [ style=bold color="green" fontcolor="orange"] -"rsc1_stop_0 remote1" -> "all_stopped" [ style = bold] "rsc1_stop_0 remote1" -> "remote1_migrate_to_0 node1" [ style = dashed] "rsc1_stop_0 remote1" -> "remote1_stop_0 node1" [ style = bold] "rsc1_stop_0 remote1" -> "rsc1_start_0 remote2" [ style = bold] diff --git a/pengine/test10/migration-behind-migrating-remote.exp b/pengine/test10/migration-behind-migrating-remote.exp index 853f95a..b289520 100644 --- a/pengine/test10/migration-behind-migrating-remote.exp +++ b/pengine/test10/migration-behind-migrating-remote.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,61 +23,61 @@ - + - + - + - + - + - + - + - + - + - + @@ -86,63 +86,48 @@ - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/migration-behind-migrating-remote.summary b/pengine/test10/migration-behind-migrating-remote.summary index 35ef8ca..1f431d4 100644 --- a/pengine/test10/migration-behind-migrating-remote.summary +++ b/pengine/test10/migration-behind-migrating-remote.summary @@ -20,7 +20,6 @@ Executing cluster transition: * Resource action: rsc1 stop on remote1 * Resource action: remote1 migrate_from on node2 * Resource action: remote1 stop on node1 - * Pseudo action: all_stopped * Pseudo action: rsc1_start_0 * Pseudo action: remote1_start_0 * Resource action: rsc1 monitor=10000 on remote2 diff --git a/pengine/test10/minimal.exp b/pengine/test10/minimal.exp index f6c58fa..83208af 100644 --- a/pengine/test10/minimal.exp +++ b/pengine/test10/minimal.exp @@ -1,26 +1,26 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -38,26 +38,26 @@ - + - + - + - + - + @@ -66,7 +66,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -83,7 +83,7 @@ - + diff --git a/pengine/test10/mon-rsc-1.exp b/pengine/test10/mon-rsc-1.exp index 519bea6..fb1340e 100644 --- a/pengine/test10/mon-rsc-1.exp +++ b/pengine/test10/mon-rsc-1.exp @@ -1,36 +1,36 @@ - + - + - + - + - + - + @@ -39,7 +39,7 @@ - + diff --git a/pengine/test10/mon-rsc-2.dot b/pengine/test10/mon-rsc-2.dot index c47d2aa..05c67e1 100644 --- a/pengine/test10/mon-rsc-2.dot +++ b/pengine/test10/mon-rsc-2.dot @@ -1,11 +1,9 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node1" -> "rsc1_start_0 node1" [ style = bold] "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_monitor_5000 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node1" -> "rsc1_monitor_5000 node1" [ style = bold] "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="black" ] } diff --git a/pengine/test10/mon-rsc-2.exp b/pengine/test10/mon-rsc-2.exp index 526abeb..1c48c31 100644 --- a/pengine/test10/mon-rsc-2.exp +++ b/pengine/test10/mon-rsc-2.exp @@ -1,36 +1,36 @@ - + - + - + - + - + - + @@ -39,24 +39,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/mon-rsc-2.summary b/pengine/test10/mon-rsc-2.summary index c4611c4..0940a25 100644 --- a/pengine/test10/mon-rsc-2.summary +++ b/pengine/test10/mon-rsc-2.summary @@ -11,7 +11,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on node2 * Resource action: rsc1 monitor on node1 - * Pseudo action: all_stopped * Resource action: rsc1 start on node1 * Resource action: rsc1 monitor=5000 on node1 diff --git a/pengine/test10/mon-rsc-3.exp b/pengine/test10/mon-rsc-3.exp index 2e2427f..ae6770e 100644 --- a/pengine/test10/mon-rsc-3.exp +++ b/pengine/test10/mon-rsc-3.exp @@ -1,33 +1,33 @@ - + - + - + - + - + diff --git a/pengine/test10/mon-rsc-4.dot b/pengine/test10/mon-rsc-4.dot index c47d2aa..05c67e1 100644 --- a/pengine/test10/mon-rsc-4.dot +++ b/pengine/test10/mon-rsc-4.dot @@ -1,11 +1,9 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node1" -> "rsc1_start_0 node1" [ style = bold] "rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_monitor_5000 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node1" -> "rsc1_monitor_5000 node1" [ style = bold] "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="black" ] } diff --git a/pengine/test10/mon-rsc-4.exp b/pengine/test10/mon-rsc-4.exp index 41c3b17..4572f18 100644 --- a/pengine/test10/mon-rsc-4.exp +++ b/pengine/test10/mon-rsc-4.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,40 +23,27 @@ - + - + - + - + - - - - - - - - - - - - - diff --git a/pengine/test10/mon-rsc-4.summary b/pengine/test10/mon-rsc-4.summary index 3c3f0ba..8d04bd1 100644 --- a/pengine/test10/mon-rsc-4.summary +++ b/pengine/test10/mon-rsc-4.summary @@ -11,7 +11,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on node2 * Resource action: rsc1 monitor on node1 - * Pseudo action: all_stopped * Resource action: rsc1 start on node1 * Resource action: rsc1 monitor=5000 on node1 diff --git a/pengine/test10/monitor-onfail-restart.dot b/pengine/test10/monitor-onfail-restart.dot index 227e643..c030a13 100644 --- a/pengine/test10/monitor-onfail-restart.dot +++ b/pengine/test10/monitor-onfail-restart.dot @@ -3,7 +3,5 @@ "A_start_0 fc16-builder" -> "A_monitor_20000 fc16-builder" [ style = bold] "A_start_0 fc16-builder" [ style=bold color="green" fontcolor="black"] "A_stop_0 fc16-builder" -> "A_start_0 fc16-builder" [ style = bold] -"A_stop_0 fc16-builder" -> "all_stopped" [ style = bold] "A_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/monitor-onfail-restart.exp b/pengine/test10/monitor-onfail-restart.exp index e9d50f1..bbb9d2b 100644 --- a/pengine/test10/monitor-onfail-restart.exp +++ b/pengine/test10/monitor-onfail-restart.exp @@ -1,7 +1,7 @@ - + @@ -30,19 +30,7 @@ - - - - - - - - - - - - - + diff --git a/pengine/test10/monitor-onfail-restart.summary b/pengine/test10/monitor-onfail-restart.summary index b15c321..6f60d8c 100644 --- a/pengine/test10/monitor-onfail-restart.summary +++ b/pengine/test10/monitor-onfail-restart.summary @@ -10,7 +10,6 @@ Transition Summary: Executing cluster transition: * Resource action: A stop on fc16-builder - * Pseudo action: all_stopped * Resource action: A start on fc16-builder * Resource action: A monitor=20000 on fc16-builder diff --git a/pengine/test10/monitor-onfail-stop.dot b/pengine/test10/monitor-onfail-stop.dot index 822a003..bdab5e6 100644 --- a/pengine/test10/monitor-onfail-stop.dot +++ b/pengine/test10/monitor-onfail-stop.dot @@ -1,5 +1,3 @@ digraph "g" { -"A_stop_0 fc16-builder" -> "all_stopped" [ style = bold] "A_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/monitor-onfail-stop.exp b/pengine/test10/monitor-onfail-stop.exp index c93a84c..63750ec 100644 --- a/pengine/test10/monitor-onfail-stop.exp +++ b/pengine/test10/monitor-onfail-stop.exp @@ -1,24 +1,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/monitor-onfail-stop.summary b/pengine/test10/monitor-onfail-stop.summary index 6c100c0..3711298 100644 --- a/pengine/test10/monitor-onfail-stop.summary +++ b/pengine/test10/monitor-onfail-stop.summary @@ -10,7 +10,6 @@ Transition Summary: Executing cluster transition: * Resource action: A stop on fc16-builder - * Pseudo action: all_stopped Revised cluster status: Online: [ fc16-builder ] diff --git a/pengine/test10/monitor-recovery.dot b/pengine/test10/monitor-recovery.dot index 13eab93..4976a94 100644 --- a/pengine/test10/monitor-recovery.dot +++ b/pengine/test10/monitor-recovery.dot @@ -1,10 +1,8 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "cl_tomcat_stop_0" -> "cl_tomcat_stopped_0" [ style = bold] "cl_tomcat_stop_0" -> "d_tomcat_stop_0 CSE-1" [ style = bold] "cl_tomcat_stop_0" [ style=bold color="green" fontcolor="orange"] "cl_tomcat_stopped_0" [ style=bold color="green" fontcolor="orange"] -"d_tomcat_stop_0 CSE-1" -> "all_stopped" [ style = bold] "d_tomcat_stop_0 CSE-1" -> "cl_tomcat_stopped_0" [ style = bold] "d_tomcat_stop_0 CSE-1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/monitor-recovery.exp b/pengine/test10/monitor-recovery.exp index 2d6716a..8af2528 100644 --- a/pengine/test10/monitor-recovery.exp +++ b/pengine/test10/monitor-recovery.exp @@ -1,51 +1,38 @@ - + - + - + - + - + - + - - - - - - - - - - - - - diff --git a/pengine/test10/monitor-recovery.summary b/pengine/test10/monitor-recovery.summary index d8a13fe..6c65c1d 100644 --- a/pengine/test10/monitor-recovery.summary +++ b/pengine/test10/monitor-recovery.summary @@ -17,7 +17,6 @@ Executing cluster transition: * Pseudo action: cl_tomcat_stop_0 * Resource action: d_tomcat stop on CSE-1 * Pseudo action: cl_tomcat_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ CSE-1 ] diff --git a/pengine/test10/multi1.dot b/pengine/test10/multi1.dot index 747d7d2..06c7c0b 100644 --- a/pengine/test10/multi1.dot +++ b/pengine/test10/multi1.dot @@ -1,10 +1,7 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"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" ] -"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="black" ] } diff --git a/pengine/test10/multi1.exp b/pengine/test10/multi1.exp index 6648e00..6299f79 100644 --- a/pengine/test10/multi1.exp +++ b/pengine/test10/multi1.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,27 +26,11 @@ - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/multi1.summary b/pengine/test10/multi1.summary index 40222fc..ebc8cfa 100644 --- a/pengine/test10/multi1.summary +++ b/pengine/test10/multi1.summary @@ -10,7 +10,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on node2 * Resource action: rsc1 stop on node1 - * Pseudo action: all_stopped * Resource action: rsc1 start on node1 Revised cluster status: diff --git a/pengine/test10/multiple-monitor-one-failed.dot b/pengine/test10/multiple-monitor-one-failed.dot index e4eb8fd..b37a5d4 100644 --- a/pengine/test10/multiple-monitor-one-failed.dot +++ b/pengine/test10/multiple-monitor-one-failed.dot @@ -5,7 +5,5 @@ digraph "g" { "Dummy-test2_start_0 dhcp180" -> "Dummy-test2_monitor_30000 dhcp180" [ style = bold] "Dummy-test2_start_0 dhcp180" [ style=bold color="green" fontcolor="black"] "Dummy-test2_stop_0 dhcp180" -> "Dummy-test2_start_0 dhcp180" [ style = bold] -"Dummy-test2_stop_0 dhcp180" -> "all_stopped" [ style = bold] "Dummy-test2_stop_0 dhcp180" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/multiple-monitor-one-failed.exp b/pengine/test10/multiple-monitor-one-failed.exp index 3c2eb06..4b8ddc0 100644 --- a/pengine/test10/multiple-monitor-one-failed.exp +++ b/pengine/test10/multiple-monitor-one-failed.exp @@ -1,7 +1,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -43,19 +43,7 @@ - - - - - - - - - - - - - + diff --git a/pengine/test10/multiple-monitor-one-failed.summary b/pengine/test10/multiple-monitor-one-failed.summary index 0691ebf..6ac3d85 100644 --- a/pengine/test10/multiple-monitor-one-failed.summary +++ b/pengine/test10/multiple-monitor-one-failed.summary @@ -9,7 +9,6 @@ Transition Summary: Executing cluster transition: * Resource action: Dummy-test2 stop on dhcp180 - * Pseudo action: all_stopped * Resource action: Dummy-test2 start on dhcp180 * Resource action: Dummy-test2 monitor=30000 on dhcp180 * Resource action: Dummy-test2 monitor=10000 on dhcp180 diff --git a/pengine/test10/node-maintenance-1.dot b/pengine/test10/node-maintenance-1.dot index adbfd52..5980197 100644 --- a/pengine/test10/node-maintenance-1.dot +++ b/pengine/test10/node-maintenance-1.dot @@ -1,6 +1,4 @@ digraph "g" { "Cancel rsc2_monitor_10000 node2" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/node-maintenance-1.exp b/pengine/test10/node-maintenance-1.exp index 6804721..8e8ff5d 100644 --- a/pengine/test10/node-maintenance-1.exp +++ b/pengine/test10/node-maintenance-1.exp @@ -1,7 +1,7 @@ - + @@ -17,17 +17,4 @@ - - - - - - - - - - - - - diff --git a/pengine/test10/node-maintenance-1.summary b/pengine/test10/node-maintenance-1.summary index 196c144..f03539c 100644 --- a/pengine/test10/node-maintenance-1.summary +++ b/pengine/test10/node-maintenance-1.summary @@ -13,7 +13,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on node1 * Resource action: rsc2 cancel=10000 on node2 - * Pseudo action: all_stopped Revised cluster status: Node node2: maintenance diff --git a/pengine/test10/node-maintenance-2.exp b/pengine/test10/node-maintenance-2.exp index 35b569a..543fea4 100644 --- a/pengine/test10/node-maintenance-2.exp +++ b/pengine/test10/node-maintenance-2.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,7 +23,7 @@ - + diff --git a/pengine/test10/not-installed-agent.dot b/pengine/test10/not-installed-agent.dot index ec3fd9b..35e2f08 100644 --- a/pengine/test10/not-installed-agent.dot +++ b/pengine/test10/not-installed-agent.dot @@ -1,15 +1,12 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "rsc1_monitor_10000 sles11-2" [ style=bold color="green" fontcolor="black"] "rsc1_start_0 sles11-2" -> "rsc1_monitor_10000 sles11-2" [ style = bold] "rsc1_start_0 sles11-2" [ style=bold color="green" fontcolor="black"] -"rsc1_stop_0 sles11-1" -> "all_stopped" [ style = bold] "rsc1_stop_0 sles11-1" -> "rsc1_start_0 sles11-2" [ style = bold] "rsc1_stop_0 sles11-1" [ style=bold color="green" fontcolor="black"] "rsc2_monitor_10000 sles11-2" [ style=bold color="green" fontcolor="black"] "rsc2_start_0 sles11-2" -> "rsc2_monitor_10000 sles11-2" [ style = bold] "rsc2_start_0 sles11-2" [ style=bold color="green" fontcolor="black"] -"rsc2_stop_0 sles11-1" -> "all_stopped" [ style = bold] "rsc2_stop_0 sles11-1" -> "rsc2_start_0 sles11-2" [ style = bold] "rsc2_stop_0 sles11-1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/not-installed-agent.exp b/pengine/test10/not-installed-agent.exp index 722272d..bce79cb 100644 --- a/pengine/test10/not-installed-agent.exp +++ b/pengine/test10/not-installed-agent.exp @@ -1,20 +1,20 @@ - + - + - + @@ -36,52 +36,37 @@ - + - + - + - + - + - - - - - - - - - - - - - - - diff --git a/pengine/test10/not-installed-agent.summary b/pengine/test10/not-installed-agent.summary index b32cdd4..6c92c1e 100644 --- a/pengine/test10/not-installed-agent.summary +++ b/pengine/test10/not-installed-agent.summary @@ -13,7 +13,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on sles11-1 * Resource action: rsc2 stop on sles11-1 - * Pseudo action: all_stopped * Resource action: rsc1 start on sles11-2 * Resource action: rsc2 start on sles11-2 * Resource action: rsc1 monitor=10000 on sles11-2 diff --git a/pengine/test10/not-installed-tools.dot b/pengine/test10/not-installed-tools.dot index 7817899..1edb956 100644 --- a/pengine/test10/not-installed-tools.dot +++ b/pengine/test10/not-installed-tools.dot @@ -1,9 +1,7 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "rsc1_monitor_10000 sles11-2" [ style=bold color="green" fontcolor="black"] "rsc1_start_0 sles11-2" -> "rsc1_monitor_10000 sles11-2" [ style = bold] "rsc1_start_0 sles11-2" [ style=bold color="green" fontcolor="black"] -"rsc1_stop_0 sles11-1" -> "all_stopped" [ style = bold] "rsc1_stop_0 sles11-1" -> "rsc1_start_0 sles11-2" [ style = bold] "rsc1_stop_0 sles11-1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/not-installed-tools.exp b/pengine/test10/not-installed-tools.exp index f10504f..5438b94 100644 --- a/pengine/test10/not-installed-tools.exp +++ b/pengine/test10/not-installed-tools.exp @@ -1,20 +1,20 @@ - + - + - + @@ -34,16 +34,4 @@ - - - - - - - - - - - - diff --git a/pengine/test10/not-installed-tools.summary b/pengine/test10/not-installed-tools.summary index 01ae7f7..8dbd87d 100644 --- a/pengine/test10/not-installed-tools.summary +++ b/pengine/test10/not-installed-tools.summary @@ -11,7 +11,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on sles11-1 - * Pseudo action: all_stopped * Resource action: rsc1 start on sles11-2 * Resource action: rsc1 monitor=10000 on sles11-2 diff --git a/pengine/test10/not-reschedule-unneeded-monitor.dot b/pengine/test10/not-reschedule-unneeded-monitor.dot index 6697534..cde4860 100644 --- a/pengine/test10/not-reschedule-unneeded-monitor.dot +++ b/pengine/test10/not-reschedule-unneeded-monitor.dot @@ -1,9 +1,7 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "sle12-kvm_monitor_10000 kimball" [ style=bold color="green" fontcolor="black"] "sle12-kvm_start_0 kimball" -> "sle12-kvm_monitor_10000 kimball" [ style = bold] "sle12-kvm_start_0 kimball" [ style=bold color="green" fontcolor="black"] -"sle12-kvm_stop_0 castor" -> "all_stopped" [ style = bold] "sle12-kvm_stop_0 castor" -> "sle12-kvm_start_0 kimball" [ style = bold] "sle12-kvm_stop_0 castor" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/not-reschedule-unneeded-monitor.exp b/pengine/test10/not-reschedule-unneeded-monitor.exp index 76d4034..2862998 100644 --- a/pengine/test10/not-reschedule-unneeded-monitor.exp +++ b/pengine/test10/not-reschedule-unneeded-monitor.exp @@ -1,20 +1,20 @@ - + - + - + @@ -34,16 +34,4 @@ - - - - - - - - - - - - diff --git a/pengine/test10/not-reschedule-unneeded-monitor.summary b/pengine/test10/not-reschedule-unneeded-monitor.summary index 429ea24..3ea4fc8 100644 --- a/pengine/test10/not-reschedule-unneeded-monitor.summary +++ b/pengine/test10/not-reschedule-unneeded-monitor.summary @@ -18,7 +18,6 @@ Transition Summary: Executing cluster transition: * Resource action: sle12-kvm stop on castor - * Pseudo action: all_stopped * Resource action: sle12-kvm start on kimball * Resource action: sle12-kvm monitor=10000 on kimball diff --git a/pengine/test10/notify-0.dot b/pengine/test10/notify-0.dot index 88406c2..b0a1355 100644 --- a/pengine/test10/notify-0.dot +++ b/pengine/test10/notify-0.dot @@ -1,10 +1,8 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "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_start_0 node1" -> "rsc1_running_0" [ style = bold] "child_rsc1:1_start_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" ] diff --git a/pengine/test10/notify-0.exp b/pengine/test10/notify-0.exp index 34f6dab..e5abf68 100644 --- a/pengine/test10/notify-0.exp +++ b/pengine/test10/notify-0.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,47 +23,47 @@ - + - + - + - + - + - + - + - + @@ -72,38 +72,25 @@ - + - + - + - + - - - - - - - - - - - - - diff --git a/pengine/test10/notify-0.summary b/pengine/test10/notify-0.summary index 69112da..b917980 100644 --- a/pengine/test10/notify-0.summary +++ b/pengine/test10/notify-0.summary @@ -23,7 +23,6 @@ Executing cluster transition: * Pseudo action: rsc1_running_0 * Resource action: child_rsc2:0 stop on node1 * Pseudo action: rsc2_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 ] diff --git a/pengine/test10/notify-1.dot b/pengine/test10/notify-1.dot index 09252bc..d2f6183 100644 --- a/pengine/test10/notify-1.dot +++ b/pengine/test10/notify-1.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "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_pre_notify_start_0 node1" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold] @@ -12,7 +11,6 @@ "child_rsc1:1_start_0 node1" [ 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" ] @@ -32,7 +30,6 @@ "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" ] -"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] diff --git a/pengine/test10/notify-1.exp b/pengine/test10/notify-1.exp index d6bce21..ee763cc 100644 --- a/pengine/test10/notify-1.exp +++ b/pengine/test10/notify-1.exp @@ -1,59 +1,59 @@ - + - + - + - + - + - + - + - + - + @@ -62,55 +62,55 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -118,63 +118,63 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -183,49 +183,49 @@ - + - + - + - + - + - + - + - + - + @@ -233,43 +233,28 @@ - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/notify-1.summary b/pengine/test10/notify-1.summary index 0a734a6..0bd0416 100644 --- a/pengine/test10/notify-1.summary +++ b/pengine/test10/notify-1.summary @@ -35,7 +35,6 @@ Executing cluster transition: * Resource action: child_rsc1:1 notify on node1 * Pseudo action: rsc1_confirmed-post_notify_running_0 * Pseudo action: rsc2_confirmed-post_notify_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 ] diff --git a/pengine/test10/notify-2.dot b/pengine/test10/notify-2.dot index 09252bc..d2f6183 100644 --- a/pengine/test10/notify-2.dot +++ b/pengine/test10/notify-2.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "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_pre_notify_start_0 node1" -> "rsc1_confirmed-pre_notify_start_0" [ style = bold] @@ -12,7 +11,6 @@ "child_rsc1:1_start_0 node1" [ 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" ] @@ -32,7 +30,6 @@ "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" ] -"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] diff --git a/pengine/test10/notify-2.exp b/pengine/test10/notify-2.exp index d6bce21..ee763cc 100644 --- a/pengine/test10/notify-2.exp +++ b/pengine/test10/notify-2.exp @@ -1,59 +1,59 @@ - + - + - + - + - + - + - + - + - + @@ -62,55 +62,55 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -118,63 +118,63 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -183,49 +183,49 @@ - + - + - + - + - + - + - + - + - + @@ -233,43 +233,28 @@ - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/notify-2.summary b/pengine/test10/notify-2.summary index 0a734a6..0bd0416 100644 --- a/pengine/test10/notify-2.summary +++ b/pengine/test10/notify-2.summary @@ -35,7 +35,6 @@ Executing cluster transition: * Resource action: child_rsc1:1 notify on node1 * Pseudo action: rsc1_confirmed-post_notify_running_0 * Pseudo action: rsc2_confirmed-post_notify_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 ] diff --git a/pengine/test10/notify-3.dot b/pengine/test10/notify-3.dot index bb75ccb..66341d0 100644 --- a/pengine/test10/notify-3.dot +++ b/pengine/test10/notify-3.dot @@ -1,5 +1,4 @@ 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] @@ -18,20 +17,17 @@ "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" [ 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] @@ -65,7 +61,6 @@ "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] diff --git a/pengine/test10/notify-3.exp b/pengine/test10/notify-3.exp index d878783..388e009 100644 --- a/pengine/test10/notify-3.exp +++ b/pengine/test10/notify-3.exp @@ -1,59 +1,59 @@ - + - + - + - + - + - + - + - + - + @@ -62,62 +62,62 @@ - + - + - + - + - + - + - + - + - + - + @@ -126,55 +126,55 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -182,156 +182,156 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -340,7 +340,7 @@ - + @@ -349,7 +349,7 @@ - + @@ -358,49 +358,49 @@ - + - + - + - + - + - + - + - + - + @@ -408,49 +408,28 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/notify-3.summary b/pengine/test10/notify-3.summary index 6c3367e..c19c672 100644 --- a/pengine/test10/notify-3.summary +++ b/pengine/test10/notify-3.summary @@ -38,7 +38,6 @@ Executing cluster transition: * Pseudo action: rsc1_confirmed-post_notify_stopped_0 * Pseudo action: rsc1_pre_notify_start_0 * Pseudo action: rsc2_confirmed-post_notify_stopped_0 - * Pseudo action: all_stopped * Resource action: child_rsc1:0 notify on node1 * Pseudo action: rsc1_confirmed-pre_notify_start_0 * Pseudo action: rsc1_start_0 diff --git a/pengine/test10/notify-behind-stopping-remote.dot b/pengine/test10/notify-behind-stopping-remote.dot index cac4d5a..1704cdd 100644 --- a/pengine/test10/notify-behind-stopping-remote.dot +++ b/pengine/test10/notify-behind-stopping-remote.dot @@ -3,18 +3,15 @@ digraph "g" { "Cancel redis_monitor_45000 redis-bundle-0" [ style=bold color="green" fontcolor="black"] "Cancel redis_monitor_60000 redis-bundle-0" -> "redis_promote_0 redis-bundle-0" [ style = bold] "Cancel redis_monitor_60000 redis-bundle-0" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "redis-bundle-1_monitor_60000 ra2" [ style=dashed color="red" fontcolor="black"] "redis-bundle-1_start_0 ra2" -> "redis-bundle-1_monitor_60000 ra2" [ style = dashed] "redis-bundle-1_start_0 ra2" -> "redis_monitor_45000 redis-bundle-1" [ style = dashed] "redis-bundle-1_start_0 ra2" -> "redis_monitor_60000 redis-bundle-1" [ style = dashed] "redis-bundle-1_start_0 ra2" -> "redis_start_0 redis-bundle-1" [ style = dashed] "redis-bundle-1_start_0 ra2" [ style=dashed color="red" fontcolor="black"] -"redis-bundle-1_stop_0 ra2" -> "all_stopped" [ style = bold] "redis-bundle-1_stop_0 ra2" -> "redis-bundle-1_start_0 ra2" [ style = dashed] "redis-bundle-1_stop_0 ra2" -> "redis-bundle-docker-1_stop_0 ra2" [ style = bold] "redis-bundle-1_stop_0 ra2" [ style=bold color="green" fontcolor="black"] -"redis-bundle-docker-1_stop_0 ra2" -> "all_stopped" [ style = bold] "redis-bundle-docker-1_stop_0 ra2" -> "redis-bundle_stopped_0" [ style = bold] "redis-bundle-docker-1_stop_0 ra2" [ style=bold color="green" fontcolor="black"] "redis-bundle-master_confirmed-post_notify_promoted_0" -> "redis-bundle_promoted_0" [ style = bold] diff --git a/pengine/test10/notify-behind-stopping-remote.exp b/pengine/test10/notify-behind-stopping-remote.exp index 44e6356..e56f84b 100644 --- a/pengine/test10/notify-behind-stopping-remote.exp +++ b/pengine/test10/notify-behind-stopping-remote.exp @@ -1,49 +1,49 @@ - + - + - + - + - + - + - + - + @@ -56,7 +56,7 @@ - + @@ -80,165 +80,165 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -246,50 +246,50 @@ - + - + - + - + - + - + - + - + - + @@ -301,46 +301,46 @@ - + - + - + - + - + - + - + - + @@ -348,40 +348,25 @@ - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/notify-behind-stopping-remote.summary b/pengine/test10/notify-behind-stopping-remote.summary index b9342b9..525570a 100644 --- a/pengine/test10/notify-behind-stopping-remote.summary +++ b/pengine/test10/notify-behind-stopping-remote.summary @@ -25,7 +25,6 @@ Executing cluster transition: * Resource action: redis-bundle-docker-1 stop on ra2 * Pseudo action: redis-bundle_stopped_0 * Pseudo action: redis-bundle_start_0 - * Pseudo action: all_stopped * Pseudo action: redis-bundle-master_start_0 * Pseudo action: redis-bundle-master_running_0 * Pseudo action: redis-bundle-master_post_notify_running_0 diff --git a/pengine/test10/novell-239079.exp b/pengine/test10/novell-239079.exp index 16fac82..e265643 100644 --- a/pengine/test10/novell-239079.exp +++ b/pengine/test10/novell-239079.exp @@ -1,104 +1,104 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -106,31 +106,31 @@ - + - + - + - + - + - + diff --git a/pengine/test10/novell-239082.dot b/pengine/test10/novell-239082.dot index 6addfae..d7b5219 100644 --- a/pengine/test10/novell-239082.dot +++ b/pengine/test10/novell-239082.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "do_shutdown xen-1" [ style=bold color="green" fontcolor="black" ] "drbd0:0_post_notify_demote_0 xen-2" -> "ms-drbd0_confirmed-post_notify_demoted_0" [ style = bold] "drbd0:0_post_notify_demote_0 xen-2" [ style=bold color="green" fontcolor="black" ] @@ -24,12 +23,10 @@ "drbd0:1_pre_notify_demote_0 xen-1" [ style=bold color="green" fontcolor="black" ] "drbd0:1_pre_notify_stop_0 xen-1" -> "ms-drbd0_confirmed-pre_notify_stop_0" [ style = bold] "drbd0:1_pre_notify_stop_0 xen-1" [ style=bold color="green" fontcolor="black" ] -"drbd0:1_stop_0 xen-1" -> "all_stopped" [ style = bold] "drbd0:1_stop_0 xen-1" -> "do_shutdown xen-1" [ style = bold] "drbd0:1_stop_0 xen-1" -> "ms-drbd0_stopped_0" [ style = bold] "drbd0:1_stop_0 xen-1" [ style=bold color="green" fontcolor="black" ] "fs_1_start_0 xen-2" [ style=bold color="green" fontcolor="black" ] -"fs_1_stop_0 xen-1" -> "all_stopped" [ style = bold] "fs_1_stop_0 xen-1" -> "do_shutdown xen-1" [ style = bold] "fs_1_stop_0 xen-1" -> "fs_1_start_0 xen-2" [ style = bold] "fs_1_stop_0 xen-1" -> "ms-drbd0_demote_0" [ style = bold] @@ -39,7 +36,6 @@ "ms-drbd0_confirmed-post_notify_demoted_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd0_confirmed-post_notify_promoted_0" -> "fs_1_start_0 xen-2" [ style = bold] "ms-drbd0_confirmed-post_notify_promoted_0" [ style=bold color="green" fontcolor="orange" ] -"ms-drbd0_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "ms-drbd0_confirmed-post_notify_stopped_0" -> "ms-drbd0_pre_notify_promote_0" [ style = bold] "ms-drbd0_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "ms-drbd0_confirmed-pre_notify_demote_0" -> "ms-drbd0_demote_0" [ style = bold] diff --git a/pengine/test10/novell-239082.exp b/pengine/test10/novell-239082.exp index c6d0221..95fb41c 100644 --- a/pengine/test10/novell-239082.exp +++ b/pengine/test10/novell-239082.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,217 +26,217 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -244,217 +244,217 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -463,28 +463,10 @@ - + - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/novell-239082.summary b/pengine/test10/novell-239082.summary index 2bafd1b..8aa8928 100644 --- a/pengine/test10/novell-239082.summary +++ b/pengine/test10/novell-239082.summary @@ -37,7 +37,6 @@ Executing cluster transition: * Pseudo action: ms-drbd0_post_notify_stopped_0 * Resource action: drbd0:0 notify on xen-2 * Pseudo action: ms-drbd0_confirmed-post_notify_stopped_0 - * Pseudo action: all_stopped * Pseudo action: ms-drbd0_pre_notify_promote_0 * Resource action: drbd0:0 notify on xen-2 * Pseudo action: ms-drbd0_confirmed-pre_notify_promote_0 diff --git a/pengine/test10/novell-251689.dot b/pengine/test10/novell-251689.dot index 6b0ead9..8c5b6c9 100644 --- a/pengine/test10/novell-251689.dot +++ b/pengine/test10/novell-251689.dot @@ -1,5 +1,3 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] -"sles10_stop_0 node2" -> "all_stopped" [ style = bold] "sles10_stop_0 node2" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/novell-251689.exp b/pengine/test10/novell-251689.exp index ff12e41..72bcf45 100644 --- a/pengine/test10/novell-251689.exp +++ b/pengine/test10/novell-251689.exp @@ -1,24 +1,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/novell-251689.summary b/pengine/test10/novell-251689.summary index 04bbe59..0568848 100644 --- a/pengine/test10/novell-251689.summary +++ b/pengine/test10/novell-251689.summary @@ -20,7 +20,6 @@ Transition Summary: Executing cluster transition: * Resource action: sles10 stop on node2 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/novell-252693-2.dot b/pengine/test10/novell-252693-2.dot index c628b47..a407de3 100644 --- a/pengine/test10/novell-252693-2.dot +++ b/pengine/test10/novell-252693-2.dot @@ -1,5 +1,4 @@ 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] @@ -112,7 +111,6 @@ "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" -> "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] diff --git a/pengine/test10/novell-252693-2.exp b/pengine/test10/novell-252693-2.exp index 6e75a4f..f11abc4 100644 --- a/pengine/test10/novell-252693-2.exp +++ b/pengine/test10/novell-252693-2.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,60 +36,60 @@ - + - + - + - + - + - + - + - + - + - + @@ -98,86 +98,86 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -186,55 +186,55 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -242,108 +242,108 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -352,55 +352,55 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -408,108 +408,108 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -518,55 +518,55 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -574,139 +574,126 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - diff --git a/pengine/test10/novell-252693-2.summary b/pengine/test10/novell-252693-2.summary index 392d26e..8033c57 100644 --- a/pengine/test10/novell-252693-2.summary +++ b/pengine/test10/novell-252693-2.summary @@ -77,7 +77,6 @@ Executing cluster transition: * Resource action: configstoreclone:1 monitor=20000 on node1 * Resource action: sles10 migrate_from on node1 * Resource action: sles10 stop on node2 - * Pseudo action: all_stopped * Pseudo action: sles10_start_0 * Resource action: sles10 monitor=10000 on node1 diff --git a/pengine/test10/novell-252693-3.dot b/pengine/test10/novell-252693-3.dot index 28e9113..6d225f9 100644 --- a/pengine/test10/novell-252693-3.dot +++ b/pengine/test10/novell-252693-3.dot @@ -1,5 +1,4 @@ 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] @@ -80,7 +79,6 @@ "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" ] @@ -95,7 +93,6 @@ "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] @@ -138,7 +135,6 @@ "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" ] diff --git a/pengine/test10/novell-252693-3.exp b/pengine/test10/novell-252693-3.exp index 4605df4..e7cc1c4 100644 --- a/pengine/test10/novell-252693-3.exp +++ b/pengine/test10/novell-252693-3.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,60 +36,60 @@ - + - + - + - + - + - + - + - + - + - + @@ -98,86 +98,86 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -186,55 +186,55 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -242,82 +242,82 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -327,13 +327,13 @@ - + - + @@ -349,97 +349,97 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -447,7 +447,7 @@ - + @@ -456,189 +456,189 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -647,55 +647,55 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -703,145 +703,126 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/novell-252693-3.summary b/pengine/test10/novell-252693-3.summary index 5c3b0ca..d560373 100644 --- a/pengine/test10/novell-252693-3.summary +++ b/pengine/test10/novell-252693-3.summary @@ -87,7 +87,6 @@ Executing cluster transition: * Resource action: imagestoreclone:1 monitor=20000 on node2 * Resource action: sles10 migrate_from on node1 * Resource action: sles10 stop on node2 - * Pseudo action: all_stopped * Pseudo action: sles10_start_0 * Resource action: sles10 monitor=10000 on node1 diff --git a/pengine/test10/novell-252693.dot b/pengine/test10/novell-252693.dot index cd10e28..0c0afbd 100644 --- a/pengine/test10/novell-252693.dot +++ b/pengine/test10/novell-252693.dot @@ -1,16 +1,13 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "configstoreclone:0_post_notify_stop_0 node2" -> "configstorecloneset_confirmed-post_notify_stopped_0" [ style = bold] "configstoreclone:0_post_notify_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "configstoreclone:0_pre_notify_stop_0 node1" -> "configstorecloneset_confirmed-pre_notify_stop_0" [ style = bold] "configstoreclone:0_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black"] "configstoreclone:0_pre_notify_stop_0 node2" -> "configstorecloneset_confirmed-pre_notify_stop_0" [ style = bold] "configstoreclone:0_pre_notify_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"configstoreclone:0_stop_0 node1" -> "all_stopped" [ style = bold] "configstoreclone:0_stop_0 node1" -> "configstorecloneset_stopped_0" [ style = bold] "configstoreclone:0_stop_0 node1" -> "do_shutdown node1" [ style = bold] "configstoreclone:0_stop_0 node1" [ style=bold color="green" fontcolor="black"] -"configstorecloneset_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "configstorecloneset_confirmed-post_notify_stopped_0" -> "evmscloneset_stop_0" [ style = bold] "configstorecloneset_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "configstorecloneset_confirmed-pre_notify_stop_0" -> "configstorecloneset_post_notify_stopped_0" [ style = bold] @@ -35,11 +32,9 @@ "evmsclone:0_pre_notify_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "evmsclone:1_pre_notify_stop_0 node1" -> "evmscloneset_confirmed-pre_notify_stop_0" [ style = bold] "evmsclone:1_pre_notify_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"evmsclone:1_stop_0 node1" -> "all_stopped" [ style = bold] "evmsclone:1_stop_0 node1" -> "do_shutdown node1" [ style = bold] "evmsclone:1_stop_0 node1" -> "evmscloneset_stopped_0" [ style = bold] "evmsclone:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"evmscloneset_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "evmscloneset_confirmed-post_notify_stopped_0" -> "evmsdcloneset_stop_0" [ style = bold] "evmscloneset_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "evmscloneset_confirmed-pre_notify_stop_0" -> "evmscloneset_post_notify_stopped_0" [ style = bold] @@ -57,7 +52,6 @@ "evmscloneset_stop_0" [ style=bold color="green" fontcolor="orange" ] "evmscloneset_stopped_0" -> "evmscloneset_post_notify_stopped_0" [ style = bold] "evmscloneset_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"evmsdclone:1_stop_0 node1" -> "all_stopped" [ style = bold] "evmsdclone:1_stop_0 node1" -> "do_shutdown node1" [ style = bold] "evmsdclone:1_stop_0 node1" -> "evmsdcloneset_stopped_0" [ style = bold] "evmsdclone:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] @@ -71,11 +65,9 @@ "imagestoreclone:0_pre_notify_stop_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_stop_0 node1" -> "all_stopped" [ style = bold] "imagestoreclone:0_stop_0 node1" -> "do_shutdown node1" [ style = bold] "imagestoreclone:0_stop_0 node1" -> "imagestorecloneset_stopped_0" [ style = bold] "imagestoreclone:0_stop_0 node1" [ style=bold color="green" fontcolor="black"] -"imagestorecloneset_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "imagestorecloneset_confirmed-post_notify_stopped_0" -> "evmscloneset_stop_0" [ style = bold] "imagestorecloneset_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "imagestorecloneset_confirmed-pre_notify_stop_0" -> "imagestorecloneset_post_notify_stopped_0" [ style = bold] @@ -101,13 +93,11 @@ "sles10_monitor_10000 node2" [ style=bold color="green" fontcolor="black" ] "sles10_start_0 node2" -> "sles10_monitor_10000 node2" [ style = bold] "sles10_start_0 node2" [ style=bold color="green" fontcolor="orange" ] -"sles10_stop_0 node1" -> "all_stopped" [ style = bold] "sles10_stop_0 node1" -> "configstorecloneset_stop_0" [ style = dashed] "sles10_stop_0 node1" -> "do_shutdown node1" [ style = bold] "sles10_stop_0 node1" -> "imagestorecloneset_stop_0" [ style = dashed] "sles10_stop_0 node1" -> "sles10_start_0 node2" [ style = bold] "sles10_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"stonithclone:1_stop_0 node1" -> "all_stopped" [ style = bold] "stonithclone:1_stop_0 node1" -> "do_shutdown node1" [ style = bold] "stonithclone:1_stop_0 node1" -> "stonithcloneset_stopped_0" [ style = bold] "stonithclone:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/novell-252693.exp b/pengine/test10/novell-252693.exp index 82486d2..8c1ea26 100644 --- a/pengine/test10/novell-252693.exp +++ b/pengine/test10/novell-252693.exp @@ -1,35 +1,35 @@ - + - + - + - + - + - + @@ -37,147 +37,147 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -185,140 +185,140 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -326,134 +326,134 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -461,47 +461,47 @@ - + - + - + - + - + - + - + - + @@ -510,48 +510,48 @@ - + - + - + - + - + - + - + - + @@ -560,58 +560,22 @@ - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/novell-252693.summary b/pengine/test10/novell-252693.summary index 27cf315..660f71c 100644 --- a/pengine/test10/novell-252693.summary +++ b/pengine/test10/novell-252693.summary @@ -66,7 +66,6 @@ Executing cluster transition: * Resource action: evmsdclone:1 stop on node1 * Pseudo action: evmsdcloneset_stopped_0 * Cluster action: do_shutdown on node1 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/nvpair-id-ref.exp b/pengine/test10/nvpair-id-ref.exp index fa46779..f1804d0 100644 --- a/pengine/test10/nvpair-id-ref.exp +++ b/pengine/test10/nvpair-id-ref.exp @@ -1,36 +1,36 @@ - + - + - + - + - + - + @@ -39,7 +39,7 @@ - + @@ -48,36 +48,36 @@ - + - + - + - + - + - + @@ -86,7 +86,7 @@ - + diff --git a/pengine/test10/obsolete-lrm-resource.exp b/pengine/test10/obsolete-lrm-resource.exp index e37262b..e4eeed0 100644 --- a/pengine/test10/obsolete-lrm-resource.exp +++ b/pengine/test10/obsolete-lrm-resource.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,34 +23,34 @@ - + - + - + - + - + - + diff --git a/pengine/test10/on-fail-ignore.dot b/pengine/test10/on-fail-ignore.dot index b90f071..ce78d67 100644 --- a/pengine/test10/on-fail-ignore.dot +++ b/pengine/test10/on-fail-ignore.dot @@ -1,15 +1,12 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "fence_db1_monitor_60000 407892-db2" [ style=bold color="green" fontcolor="black"] "fence_db1_start_0 407892-db2" -> "fence_db1_monitor_60000 407892-db2" [ style = bold] "fence_db1_start_0 407892-db2" [ style=bold color="green" fontcolor="black"] -"fence_db1_stop_0 407892-db2" -> "all_stopped" [ style = bold] "fence_db1_stop_0 407892-db2" -> "fence_db1_start_0 407892-db2" [ style = bold] "fence_db1_stop_0 407892-db2" [ style=bold color="green" fontcolor="black"] "fence_db2_monitor_60000 407888-db1" [ style=bold color="green" fontcolor="black"] "fence_db2_start_0 407888-db1" -> "fence_db2_monitor_60000 407888-db1" [ style = bold] "fence_db2_start_0 407888-db1" [ style=bold color="green" fontcolor="black"] -"fence_db2_stop_0 407888-db1" -> "all_stopped" [ style = bold] "fence_db2_stop_0 407888-db1" -> "fence_db2_start_0 407888-db1" [ style = bold] "fence_db2_stop_0 407888-db1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/on-fail-ignore.exp b/pengine/test10/on-fail-ignore.exp index 20e5c9a..fc3fb5b 100644 --- a/pengine/test10/on-fail-ignore.exp +++ b/pengine/test10/on-fail-ignore.exp @@ -1,7 +1,7 @@ - + @@ -10,14 +10,14 @@ - + - + @@ -30,13 +30,13 @@ - + - + @@ -45,14 +45,14 @@ - + - + @@ -65,22 +65,7 @@ - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/on-fail-ignore.summary b/pengine/test10/on-fail-ignore.summary index cf7b077..18dddd8 100644 --- a/pengine/test10/on-fail-ignore.summary +++ b/pengine/test10/on-fail-ignore.summary @@ -18,7 +18,6 @@ Executing cluster transition: * Resource action: fence_db2 stop on 407888-db1 * Resource action: fence_db2 start on 407888-db1 * Resource action: fence_db2 monitor=60000 on 407888-db1 - * Pseudo action: all_stopped Using the original execution date of: 2017-10-26 14:23:50Z Revised cluster status: diff --git a/pengine/test10/one-or-more-0.exp b/pengine/test10/one-or-more-0.exp index 36283a8..aa478b7 100644 --- a/pengine/test10/one-or-more-0.exp +++ b/pengine/test10/one-or-more-0.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,23 +23,23 @@ - + - + - + - + @@ -48,23 +48,23 @@ - + - + - + - + @@ -73,7 +73,7 @@ - + @@ -83,13 +83,13 @@ - + - + @@ -104,10 +104,10 @@ - + - + diff --git a/pengine/test10/one-or-more-1.exp b/pengine/test10/one-or-more-1.exp index e3a9512..5de19e5 100644 --- a/pengine/test10/one-or-more-1.exp +++ b/pengine/test10/one-or-more-1.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/pengine/test10/one-or-more-2.exp b/pengine/test10/one-or-more-2.exp index 0670cdb..542b591 100644 --- a/pengine/test10/one-or-more-2.exp +++ b/pengine/test10/one-or-more-2.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,7 +23,7 @@ - + @@ -32,23 +32,23 @@ - + - + - + - + @@ -57,7 +57,7 @@ - + @@ -67,13 +67,13 @@ - + - + @@ -88,7 +88,7 @@ - + diff --git a/pengine/test10/one-or-more-3.exp b/pengine/test10/one-or-more-3.exp index ad8db73..810df09 100644 --- a/pengine/test10/one-or-more-3.exp +++ b/pengine/test10/one-or-more-3.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,7 +23,7 @@ - + @@ -32,7 +32,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/pengine/test10/one-or-more-4.exp b/pengine/test10/one-or-more-4.exp index c301230..51ce014 100644 --- a/pengine/test10/one-or-more-4.exp +++ b/pengine/test10/one-or-more-4.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,23 +23,23 @@ - + - + - + - + @@ -48,23 +48,23 @@ - + - + - + - + @@ -73,7 +73,7 @@ - + @@ -88,10 +88,10 @@ - + - + diff --git a/pengine/test10/one-or-more-5.exp b/pengine/test10/one-or-more-5.exp index fec2127..4add5a3 100644 --- a/pengine/test10/one-or-more-5.exp +++ b/pengine/test10/one-or-more-5.exp @@ -1,7 +1,7 @@ - + @@ -11,13 +11,13 @@ - + - + @@ -26,20 +26,20 @@ - + - + - + @@ -48,7 +48,7 @@ - + @@ -57,7 +57,7 @@ - + @@ -66,23 +66,23 @@ - + - + - + - + @@ -91,7 +91,7 @@ - + @@ -101,13 +101,13 @@ - + - + @@ -122,7 +122,7 @@ - + @@ -134,7 +134,7 @@ - + diff --git a/pengine/test10/one-or-more-6.dot b/pengine/test10/one-or-more-6.dot index ed5b63e..bcc2ca1 100644 --- a/pengine/test10/one-or-more-6.dot +++ b/pengine/test10/one-or-more-6.dot @@ -1,7 +1,5 @@ digraph "g" { "B_start_0 " [ style=dashed color="red" fontcolor="black"] "B_stop_0 fc16-builder" -> "B_start_0 " [ style = dashed] -"B_stop_0 fc16-builder" -> "all_stopped" [ style = bold] "B_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/one-or-more-6.exp b/pengine/test10/one-or-more-6.exp index 732da9b..bc76cf6 100644 --- a/pengine/test10/one-or-more-6.exp +++ b/pengine/test10/one-or-more-6.exp @@ -1,24 +1,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/one-or-more-6.summary b/pengine/test10/one-or-more-6.summary index 665ac52..8cf0a6e 100644 --- a/pengine/test10/one-or-more-6.summary +++ b/pengine/test10/one-or-more-6.summary @@ -13,7 +13,6 @@ Transition Summary: Executing cluster transition: * Resource action: B stop on fc16-builder - * Pseudo action: all_stopped Revised cluster status: Online: [ fc16-builder ] diff --git a/pengine/test10/one-or-more-7.dot b/pengine/test10/one-or-more-7.dot index 8093f85..72ee924 100644 --- a/pengine/test10/one-or-more-7.dot +++ b/pengine/test10/one-or-more-7.dot @@ -1,7 +1,5 @@ digraph "g" { "C_start_0 " [ style=dashed color="red" fontcolor="black"] "C_stop_0 fc16-builder" -> "C_start_0 " [ style = dashed] -"C_stop_0 fc16-builder" -> "all_stopped" [ style = bold] "C_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/one-or-more-7.exp b/pengine/test10/one-or-more-7.exp index 7aeab78..daaa829 100644 --- a/pengine/test10/one-or-more-7.exp +++ b/pengine/test10/one-or-more-7.exp @@ -1,24 +1,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/one-or-more-7.summary b/pengine/test10/one-or-more-7.summary index 89b3416..3c65e3c 100644 --- a/pengine/test10/one-or-more-7.summary +++ b/pengine/test10/one-or-more-7.summary @@ -13,7 +13,6 @@ Transition Summary: Executing cluster transition: * Resource action: C stop on fc16-builder - * Pseudo action: all_stopped Revised cluster status: Online: [ fc16-builder ] diff --git a/pengine/test10/one-or-more-unrunnable-instances.exp b/pengine/test10/one-or-more-unrunnable-instances.exp index ff156a4..7660c66 100644 --- a/pengine/test10/one-or-more-unrunnable-instances.exp +++ b/pengine/test10/one-or-more-unrunnable-instances.exp @@ -1,7 +1,7 @@ - + @@ -10,106 +10,106 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -117,3935 +117,3935 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -4057,235 +4057,235 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -4294,196 +4294,196 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -4491,28 +4491,28 @@ - + - + - + - + - + - + @@ -4521,36 +4521,36 @@ - + - + - + - + - + - + @@ -4562,13 +4562,13 @@ - + - + - + @@ -4580,13 +4580,13 @@ - + - + - + @@ -4598,13 +4598,13 @@ - + - + - + diff --git a/pengine/test10/order-clone.exp b/pengine/test10/order-clone.exp index 9bd7a5f..1810833 100644 --- a/pengine/test10/order-clone.exp +++ b/pengine/test10/order-clone.exp @@ -1,7 +1,7 @@ - + diff --git a/pengine/test10/order-mandatory.dot b/pengine/test10/order-mandatory.dot index 72a874a..e3921e5 100644 --- a/pengine/test10/order-mandatory.dot +++ b/pengine/test10/order-mandatory.dot @@ -1,13 +1,10 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_start_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc4_start_0 node1" [ style=dashed color="red" fontcolor="black" ] -"rsc4_stop_0 node1" -> "all_stopped" [ style = bold] "rsc4_stop_0 node1" -> "rsc4_start_0 node1" [ style = dashed] "rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/order-mandatory.exp b/pengine/test10/order-mandatory.exp index 1db9fba..f5aba7e 100644 --- a/pengine/test10/order-mandatory.exp +++ b/pengine/test10/order-mandatory.exp @@ -1,7 +1,7 @@ - + @@ -10,23 +10,23 @@ - + - + - + - + @@ -35,27 +35,11 @@ - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/order-mandatory.summary b/pengine/test10/order-mandatory.summary index 955a281..a5b90b1 100644 --- a/pengine/test10/order-mandatory.summary +++ b/pengine/test10/order-mandatory.summary @@ -16,7 +16,6 @@ Executing cluster transition: * Resource action: rsc1 start on node1 * Resource action: rsc2 stop on node1 * Resource action: rsc4 stop on node1 - * Pseudo action: all_stopped * Resource action: rsc2 start on node1 Revised cluster status: diff --git a/pengine/test10/order-optional-keyword.exp b/pengine/test10/order-optional-keyword.exp index 76b7268..a1ce694 100644 --- a/pengine/test10/order-optional-keyword.exp +++ b/pengine/test10/order-optional-keyword.exp @@ -1,7 +1,7 @@ - + diff --git a/pengine/test10/order-optional.exp b/pengine/test10/order-optional.exp index 0fbfed8..f107466 100644 --- a/pengine/test10/order-optional.exp +++ b/pengine/test10/order-optional.exp @@ -1,7 +1,7 @@ - + diff --git a/pengine/test10/order-required.dot b/pengine/test10/order-required.dot index 72a874a..e3921e5 100644 --- a/pengine/test10/order-required.dot +++ b/pengine/test10/order-required.dot @@ -1,13 +1,10 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_start_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc4_start_0 node1" [ style=dashed color="red" fontcolor="black" ] -"rsc4_stop_0 node1" -> "all_stopped" [ style = bold] "rsc4_stop_0 node1" -> "rsc4_start_0 node1" [ style = dashed] "rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/order-required.exp b/pengine/test10/order-required.exp index 9336677..b675893 100644 --- a/pengine/test10/order-required.exp +++ b/pengine/test10/order-required.exp @@ -1,7 +1,7 @@ - + @@ -10,23 +10,23 @@ - + - + - + - + @@ -35,27 +35,11 @@ - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/order-required.summary b/pengine/test10/order-required.summary index 955a281..a5b90b1 100644 --- a/pengine/test10/order-required.summary +++ b/pengine/test10/order-required.summary @@ -16,7 +16,6 @@ Executing cluster transition: * Resource action: rsc1 start on node1 * Resource action: rsc2 stop on node1 * Resource action: rsc4 stop on node1 - * Pseudo action: all_stopped * Resource action: rsc2 start on node1 Revised cluster status: diff --git a/pengine/test10/order-serialize-set.dot b/pengine/test10/order-serialize-set.dot index 5ec4d9a..501eb27 100644 --- a/pengine/test10/order-serialize-set.dot +++ b/pengine/test10/order-serialize-set.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "base_migrate_from_0 xen-b" -> "base_start_0 xen-b" [ style = bold] "base_migrate_from_0 xen-b" -> "base_stop_0 xen-a" [ style = bold] "base_migrate_from_0 xen-b" [ style=bold color="green" fontcolor="black" ] @@ -8,7 +7,6 @@ digraph "g" { "base_monitor_10000 xen-b" [ style=bold color="green" fontcolor="black" ] "base_start_0 xen-b" -> "base_monitor_10000 xen-b" [ style = bold] "base_start_0 xen-b" [ style=bold color="green" fontcolor="orange" ] -"base_stop_0 xen-a" -> "all_stopped" [ style = bold] "base_stop_0 xen-a" -> "base_start_0 xen-b" [ style = bold] "base_stop_0 xen-a" [ style=bold color="green" fontcolor="black" ] "core-101_migrate_from_0 xen-b" -> "base_migrate_to_0 xen-a" [ style = bold] @@ -28,7 +26,6 @@ digraph "g" { "core-101_start_0 xen-b" -> "edge_migrate_to_0 xen-a" [ style = dashed] "core-101_start_0 xen-b" -> "edge_start_0 xen-b" [ style = bold] "core-101_start_0 xen-b" [ style=bold color="green" fontcolor="orange" ] -"core-101_stop_0 xen-a" -> "all_stopped" [ style = bold] "core-101_stop_0 xen-a" -> "core-101_start_0 xen-b" [ style = bold] "core-101_stop_0 xen-a" [ style=bold color="green" fontcolor="black" ] "core-200_migrate_from_0 xen-b" -> "base_migrate_to_0 xen-a" [ style = bold] @@ -45,7 +42,6 @@ digraph "g" { "core-200_start_0 xen-b" -> "edge_migrate_to_0 xen-a" [ style = dashed] "core-200_start_0 xen-b" -> "edge_start_0 xen-b" [ style = bold] "core-200_start_0 xen-b" [ style=bold color="green" fontcolor="orange" ] -"core-200_stop_0 xen-a" -> "all_stopped" [ style = bold] "core-200_stop_0 xen-a" -> "core-200_start_0 xen-b" [ style = bold] "core-200_stop_0 xen-a" [ style=bold color="green" fontcolor="black" ] "db_migrate_from_0 xen-b" -> "base_migrate_to_0 xen-a" [ style = bold] @@ -68,7 +64,6 @@ digraph "g" { "db_start_0 xen-b" -> "edge_migrate_to_0 xen-a" [ style = dashed] "db_start_0 xen-b" -> "edge_start_0 xen-b" [ style = bold] "db_start_0 xen-b" [ style=bold color="green" fontcolor="orange" ] -"db_stop_0 xen-a" -> "all_stopped" [ style = bold] "db_stop_0 xen-a" -> "db_start_0 xen-b" [ style = bold] "db_stop_0 xen-a" [ style=bold color="green" fontcolor="black" ] "edge_migrate_from_0 xen-b" -> "base_migrate_to_0 xen-a" [ style = bold] @@ -82,15 +77,12 @@ digraph "g" { "edge_start_0 xen-b" -> "base_start_0 xen-b" [ style = bold] "edge_start_0 xen-b" -> "edge_monitor_10000 xen-b" [ style = bold] "edge_start_0 xen-b" [ style=bold color="green" fontcolor="orange" ] -"edge_stop_0 xen-a" -> "all_stopped" [ style = bold] "edge_stop_0 xen-a" -> "edge_start_0 xen-b" [ style = bold] "edge_stop_0 xen-a" [ style=bold color="green" fontcolor="black" ] "xen-a-fencing_monitor_60000 xen-b" [ style=bold color="green" fontcolor="black" ] "xen-a-fencing_start_0 xen-b" -> "xen-a-fencing_monitor_60000 xen-b" [ style = bold] "xen-a-fencing_start_0 xen-b" [ style=bold color="green" fontcolor="black" ] -"xen-a-fencing_stop_0 xen-b" -> "all_stopped" [ style = bold] "xen-a-fencing_stop_0 xen-b" -> "xen-a-fencing_start_0 xen-b" [ style = bold] "xen-a-fencing_stop_0 xen-b" [ style=bold color="green" fontcolor="black" ] -"xen-b-fencing_stop_0 xen-a" -> "all_stopped" [ style = bold] "xen-b-fencing_stop_0 xen-a" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/order-serialize-set.exp b/pengine/test10/order-serialize-set.exp index d0a8bec..34706ba 100644 --- a/pengine/test10/order-serialize-set.exp +++ b/pengine/test10/order-serialize-set.exp @@ -1,7 +1,7 @@ - + @@ -10,14 +10,14 @@ - + - + @@ -30,13 +30,13 @@ - + - + @@ -45,20 +45,20 @@ - + - + - + @@ -67,388 +67,358 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/order-serialize-set.summary b/pengine/test10/order-serialize-set.summary index a2fe27b..fee3163 100644 --- a/pengine/test10/order-serialize-set.summary +++ b/pengine/test10/order-serialize-set.summary @@ -50,7 +50,6 @@ Executing cluster transition: * Pseudo action: edge_start_0 * Resource action: base migrate_from on xen-b * Resource action: base stop on xen-a - * Pseudo action: all_stopped * Resource action: edge monitor=10000 on xen-b * Pseudo action: base_start_0 * Resource action: base monitor=10000 on xen-b diff --git a/pengine/test10/order-serialize.dot b/pengine/test10/order-serialize.dot index cc82141..e292471 100644 --- a/pengine/test10/order-serialize.dot +++ b/pengine/test10/order-serialize.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "base_migrate_from_0 xen-b" -> "base_start_0 xen-b" [ style = bold] "base_migrate_from_0 xen-b" -> "base_stop_0 xen-a" [ style = bold] "base_migrate_from_0 xen-b" [ style=bold color="green" fontcolor="black" ] @@ -8,7 +7,6 @@ digraph "g" { "base_monitor_10000 xen-b" [ style=bold color="green" fontcolor="black" ] "base_start_0 xen-b" -> "base_monitor_10000 xen-b" [ style = bold] "base_start_0 xen-b" [ style=bold color="green" fontcolor="orange" ] -"base_stop_0 xen-a" -> "all_stopped" [ style = bold] "base_stop_0 xen-a" -> "base_start_0 xen-b" [ style = bold] "base_stop_0 xen-a" [ style=bold color="green" fontcolor="black" ] "core-101_migrate_from_0 xen-b" -> "core-101_start_0 xen-b" [ style = bold] @@ -22,7 +20,6 @@ digraph "g" { "core-101_start_0 xen-b" -> "core-200_migrate_to_0 xen-a" [ style = dashed] "core-101_start_0 xen-b" -> "core-200_start_0 xen-b" [ style = bold] "core-101_start_0 xen-b" [ style=bold color="green" fontcolor="orange" ] -"core-101_stop_0 xen-a" -> "all_stopped" [ style = bold] "core-101_stop_0 xen-a" -> "core-101_start_0 xen-b" [ style = bold] "core-101_stop_0 xen-a" [ style=bold color="green" fontcolor="black" ] "core-200_migrate_from_0 xen-b" -> "core-200_start_0 xen-b" [ style = bold] @@ -33,7 +30,6 @@ digraph "g" { "core-200_monitor_10000 xen-b" [ style=bold color="green" fontcolor="black" ] "core-200_start_0 xen-b" -> "core-200_monitor_10000 xen-b" [ style = bold] "core-200_start_0 xen-b" [ style=bold color="green" fontcolor="orange" ] -"core-200_stop_0 xen-a" -> "all_stopped" [ style = bold] "core-200_stop_0 xen-a" -> "core-200_start_0 xen-b" [ style = bold] "core-200_stop_0 xen-a" [ style=bold color="green" fontcolor="black" ] "db_migrate_from_0 xen-b" -> "db_start_0 xen-b" [ style = bold] @@ -44,7 +40,6 @@ digraph "g" { "db_monitor_10000 xen-b" [ style=bold color="green" fontcolor="black" ] "db_start_0 xen-b" -> "db_monitor_10000 xen-b" [ style = bold] "db_start_0 xen-b" [ style=bold color="green" fontcolor="orange" ] -"db_stop_0 xen-a" -> "all_stopped" [ style = bold] "db_stop_0 xen-a" -> "db_start_0 xen-b" [ style = bold] "db_stop_0 xen-a" [ style=bold color="green" fontcolor="black" ] "edge_migrate_from_0 xen-b" -> "base_migrate_to_0 xen-a" [ style = bold] @@ -58,15 +53,12 @@ digraph "g" { "edge_start_0 xen-b" -> "base_start_0 xen-b" [ style = bold] "edge_start_0 xen-b" -> "edge_monitor_10000 xen-b" [ style = bold] "edge_start_0 xen-b" [ style=bold color="green" fontcolor="orange" ] -"edge_stop_0 xen-a" -> "all_stopped" [ style = bold] "edge_stop_0 xen-a" -> "edge_start_0 xen-b" [ style = bold] "edge_stop_0 xen-a" [ style=bold color="green" fontcolor="black" ] "xen-a-fencing_monitor_60000 xen-b" [ style=bold color="green" fontcolor="black" ] "xen-a-fencing_start_0 xen-b" -> "xen-a-fencing_monitor_60000 xen-b" [ style = bold] "xen-a-fencing_start_0 xen-b" [ style=bold color="green" fontcolor="black" ] -"xen-a-fencing_stop_0 xen-b" -> "all_stopped" [ style = bold] "xen-a-fencing_stop_0 xen-b" -> "xen-a-fencing_start_0 xen-b" [ style = bold] "xen-a-fencing_stop_0 xen-b" [ style=bold color="green" fontcolor="black" ] -"xen-b-fencing_stop_0 xen-a" -> "all_stopped" [ style = bold] "xen-b-fencing_stop_0 xen-a" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/order-serialize.exp b/pengine/test10/order-serialize.exp index 4736732..c1b3e15 100644 --- a/pengine/test10/order-serialize.exp +++ b/pengine/test10/order-serialize.exp @@ -1,7 +1,7 @@ - + @@ -10,14 +10,14 @@ - + - + @@ -30,13 +30,13 @@ - + - + @@ -45,20 +45,20 @@ - + - + - + @@ -67,61 +67,61 @@ - + - + - + - + - + - + - + - + - + - + @@ -130,131 +130,131 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -263,142 +263,112 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/order-serialize.summary b/pengine/test10/order-serialize.summary index eac994f..beb3607 100644 --- a/pengine/test10/order-serialize.summary +++ b/pengine/test10/order-serialize.summary @@ -46,7 +46,6 @@ Executing cluster transition: * Pseudo action: edge_start_0 * Resource action: base migrate_from on xen-b * Resource action: base stop on xen-a - * Pseudo action: all_stopped * Resource action: db monitor=10000 on xen-b * Resource action: core-101 monitor=10000 on xen-b * Pseudo action: core-200_start_0 diff --git a/pengine/test10/order-sets.dot b/pengine/test10/order-sets.dot index b2b4c16..4894572 100644 --- a/pengine/test10/order-sets.dot +++ b/pengine/test10/order-sets.dot @@ -1,17 +1,14 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "world1_monitor_10000 ubuntu_1" [ style=bold color="green" fontcolor="black" ] "world1_start_0 ubuntu_1" -> "world1_monitor_10000 ubuntu_1" [ style = bold] "world1_start_0 ubuntu_1" -> "world2_start_0 ubuntu_1" [ style = bold] "world1_start_0 ubuntu_1" [ style=bold color="green" fontcolor="black" ] -"world1_stop_0 ubuntu_2" -> "all_stopped" [ style = bold] "world1_stop_0 ubuntu_2" -> "world1_start_0 ubuntu_1" [ style = bold] "world1_stop_0 ubuntu_2" [ style=bold color="green" fontcolor="black" ] "world2_monitor_10000 ubuntu_1" [ style=bold color="green" fontcolor="black" ] "world2_start_0 ubuntu_1" -> "world2_monitor_10000 ubuntu_1" [ style = bold] "world2_start_0 ubuntu_1" -> "world3_start_0 ubuntu_1" [ style = bold] "world2_start_0 ubuntu_1" [ style=bold color="green" fontcolor="black" ] -"world2_stop_0 ubuntu_2" -> "all_stopped" [ style = bold] "world2_stop_0 ubuntu_2" -> "world1_stop_0 ubuntu_2" [ style = bold] "world2_stop_0 ubuntu_2" -> "world2_start_0 ubuntu_1" [ style = bold] "world2_stop_0 ubuntu_2" [ style=bold color="green" fontcolor="black" ] @@ -19,14 +16,12 @@ digraph "g" { "world3_start_0 ubuntu_1" -> "world3_monitor_10000 ubuntu_1" [ style = bold] "world3_start_0 ubuntu_1" -> "world4_start_0 ubuntu_1" [ style = bold] "world3_start_0 ubuntu_1" [ style=bold color="green" fontcolor="black" ] -"world3_stop_0 ubuntu_2" -> "all_stopped" [ style = bold] "world3_stop_0 ubuntu_2" -> "world2_stop_0 ubuntu_2" [ style = bold] "world3_stop_0 ubuntu_2" -> "world3_start_0 ubuntu_1" [ style = bold] "world3_stop_0 ubuntu_2" [ style=bold color="green" fontcolor="black" ] "world4_monitor_10000 ubuntu_1" [ style=bold color="green" fontcolor="black" ] "world4_start_0 ubuntu_1" -> "world4_monitor_10000 ubuntu_1" [ style = bold] "world4_start_0 ubuntu_1" [ style=bold color="green" fontcolor="black" ] -"world4_stop_0 ubuntu_2" -> "all_stopped" [ style = bold] "world4_stop_0 ubuntu_2" -> "world3_stop_0 ubuntu_2" [ style = bold] "world4_stop_0 ubuntu_2" -> "world4_start_0 ubuntu_1" [ style = bold] "world4_stop_0 ubuntu_2" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/order-sets.exp b/pengine/test10/order-sets.exp index 1f5673e..d0569e9 100644 --- a/pengine/test10/order-sets.exp +++ b/pengine/test10/order-sets.exp @@ -1,185 +1,163 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/order-sets.summary b/pengine/test10/order-sets.summary index e16e1f4..999c100 100644 --- a/pengine/test10/order-sets.summary +++ b/pengine/test10/order-sets.summary @@ -19,7 +19,6 @@ Executing cluster transition: * Resource action: world3 stop on ubuntu_2 * Resource action: world2 stop on ubuntu_2 * Resource action: world1 stop on ubuntu_2 - * Pseudo action: all_stopped * Resource action: world1 start on ubuntu_1 * Resource action: world2 start on ubuntu_1 * Resource action: world3 start on ubuntu_1 diff --git a/pengine/test10/order-wrong-kind.dot b/pengine/test10/order-wrong-kind.dot index d104373..0805cba 100644 --- a/pengine/test10/order-wrong-kind.dot +++ b/pengine/test10/order-wrong-kind.dot @@ -1,9 +1,7 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_start_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/order-wrong-kind.exp b/pengine/test10/order-wrong-kind.exp index cd5e138..a582941 100644 --- a/pengine/test10/order-wrong-kind.exp +++ b/pengine/test10/order-wrong-kind.exp @@ -1,7 +1,7 @@ - + @@ -10,40 +10,27 @@ - + - + - + - + - - - - - - - - - - - - - diff --git a/pengine/test10/order-wrong-kind.summary b/pengine/test10/order-wrong-kind.summary index df3bd80..7fc8864 100644 --- a/pengine/test10/order-wrong-kind.summary +++ b/pengine/test10/order-wrong-kind.summary @@ -15,7 +15,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 start on node1 * Resource action: rsc2 stop on node1 - * Pseudo action: all_stopped * Resource action: rsc2 start on node1 Revised cluster status: diff --git a/pengine/test10/order1.exp b/pengine/test10/order1.exp index 66f0a85..c998e42 100644 --- a/pengine/test10/order1.exp +++ b/pengine/test10/order1.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,26 +35,26 @@ - + - + - + - + - + @@ -63,7 +63,7 @@ - + @@ -72,26 +72,26 @@ - + - + - + - + - + @@ -100,7 +100,7 @@ - + diff --git a/pengine/test10/order2.exp b/pengine/test10/order2.exp index a385359..09b40a7 100644 --- a/pengine/test10/order2.exp +++ b/pengine/test10/order2.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,29 +35,29 @@ - + - + - + - + - + - + @@ -66,7 +66,7 @@ - + @@ -75,26 +75,26 @@ - + - + - + - + - + @@ -103,7 +103,7 @@ - + @@ -112,23 +112,23 @@ - + - + - + - + @@ -137,7 +137,7 @@ - + diff --git a/pengine/test10/order3.dot b/pengine/test10/order3.dot index 87b1b36..dd4e427 100644 --- a/pengine/test10/order3.dot +++ b/pengine/test10/order3.dot @@ -1,17 +1,14 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = bold] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" -> "rsc2_start_0 node2" [ style = bold] "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" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" -> "rsc3_start_0 node2" [ style = bold] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "rsc1_stop_0 node1" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node1" -> "rsc4_stop_0 node1" [ style = bold] @@ -19,7 +16,6 @@ "rsc3_monitor_0 node2" -> "rsc3_start_0 node2" [ 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" -> "rsc2_stop_0 node1" [ style = bold] "rsc3_stop_0 node1" -> "rsc3_start_0 node2" [ style = bold] "rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] @@ -27,7 +23,6 @@ "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_start_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc4_stop_0 node1" -> "all_stopped" [ style = bold] "rsc4_stop_0 node1" -> "rsc4_start_0 node2" [ style = bold] "rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/order3.exp b/pengine/test10/order3.exp index f4833e6..c6ee38e 100644 --- a/pengine/test10/order3.exp +++ b/pengine/test10/order3.exp @@ -1,36 +1,36 @@ - + - + - + - + - + - + @@ -39,42 +39,42 @@ - + - + - + - + - + - + - + - + @@ -83,26 +83,26 @@ - + - + - + - + - + @@ -111,7 +111,7 @@ - + @@ -120,62 +120,40 @@ - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/order3.summary b/pengine/test10/order3.summary index b22ff75..58ebdcd 100644 --- a/pengine/test10/order3.summary +++ b/pengine/test10/order3.summary @@ -23,7 +23,6 @@ Executing cluster transition: * Resource action: rsc4 stop on node1 * Resource action: rsc1 stop on node1 * Resource action: rsc4 start on node2 - * Pseudo action: all_stopped * Resource action: rsc1 start on node2 * Resource action: rsc2 start on node2 * Resource action: rsc3 start on node2 diff --git a/pengine/test10/order4.exp b/pengine/test10/order4.exp index 66f0a85..c998e42 100644 --- a/pengine/test10/order4.exp +++ b/pengine/test10/order4.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,26 +35,26 @@ - + - + - + - + - + @@ -63,7 +63,7 @@ - + @@ -72,26 +72,26 @@ - + - + - + - + - + @@ -100,7 +100,7 @@ - + diff --git a/pengine/test10/order5.dot b/pengine/test10/order5.dot index a1ac025..74f1c5b 100644 --- a/pengine/test10/order5.dot +++ b/pengine/test10/order5.dot @@ -1,31 +1,26 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_monitor_0 node2" -> "rsc4_start_0 node2" [ style = bold] "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc4_stop_0 node1" -> "all_stopped" [ style = bold] "rsc4_stop_0 node1" -> "rsc4_start_0 node2" [ style = bold] "rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc5_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc6_monitor_0 node1" -> "rsc6_start_0 node1" [ style = bold] "rsc6_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc6_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc6_stop_0 node2" -> "all_stopped" [ style = bold] "rsc6_stop_0 node2" -> "rsc6_start_0 node1" [ style = bold] "rsc6_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc7_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc8_monitor_0 node1" -> "rsc8_start_0 node1" [ style = bold] "rsc8_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc8_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc8_stop_0 node2" -> "all_stopped" [ style = bold] "rsc8_stop_0 node2" -> "rsc8_start_0 node1" [ style = bold] "rsc8_stop_0 node2" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/order5.exp b/pengine/test10/order5.exp index a0c2a15..a60ecc7 100644 --- a/pengine/test10/order5.exp +++ b/pengine/test10/order5.exp @@ -1,7 +1,7 @@ - + @@ -10,23 +10,23 @@ - + - + - + - + @@ -35,7 +35,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -53,23 +53,23 @@ - + - + - + - + @@ -78,7 +78,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -96,23 +96,23 @@ - + - + - + - + @@ -121,7 +121,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -139,23 +139,23 @@ - + - + - + - + @@ -164,33 +164,11 @@ - + - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/order5.summary b/pengine/test10/order5.summary index 703f66f..73377ad 100644 --- a/pengine/test10/order5.summary +++ b/pengine/test10/order5.summary @@ -30,7 +30,6 @@ Executing cluster transition: * Resource action: rsc7 monitor on node1 * Resource action: rsc8 stop on node2 * Resource action: rsc8 monitor on node1 - * Pseudo action: all_stopped * Resource action: rsc2 start on node2 * Resource action: rsc4 start on node2 * Resource action: rsc6 start on node1 diff --git a/pengine/test10/order6.dot b/pengine/test10/order6.dot index a1ac025..74f1c5b 100644 --- a/pengine/test10/order6.dot +++ b/pengine/test10/order6.dot @@ -1,31 +1,26 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_monitor_0 node2" -> "rsc4_start_0 node2" [ style = bold] "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc4_stop_0 node1" -> "all_stopped" [ style = bold] "rsc4_stop_0 node1" -> "rsc4_start_0 node2" [ style = bold] "rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc5_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc6_monitor_0 node1" -> "rsc6_start_0 node1" [ style = bold] "rsc6_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc6_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc6_stop_0 node2" -> "all_stopped" [ style = bold] "rsc6_stop_0 node2" -> "rsc6_start_0 node1" [ style = bold] "rsc6_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc7_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc8_monitor_0 node1" -> "rsc8_start_0 node1" [ style = bold] "rsc8_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc8_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc8_stop_0 node2" -> "all_stopped" [ style = bold] "rsc8_stop_0 node2" -> "rsc8_start_0 node1" [ style = bold] "rsc8_stop_0 node2" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/order6.exp b/pengine/test10/order6.exp index 513f221..47dc227 100644 --- a/pengine/test10/order6.exp +++ b/pengine/test10/order6.exp @@ -1,7 +1,7 @@ - + @@ -10,23 +10,23 @@ - + - + - + - + @@ -35,7 +35,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -53,23 +53,23 @@ - + - + - + - + @@ -78,7 +78,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -96,23 +96,23 @@ - + - + - + - + @@ -121,7 +121,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -139,23 +139,23 @@ - + - + - + - + @@ -164,33 +164,11 @@ - + - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/order6.summary b/pengine/test10/order6.summary index 703f66f..73377ad 100644 --- a/pengine/test10/order6.summary +++ b/pengine/test10/order6.summary @@ -30,7 +30,6 @@ Executing cluster transition: * Resource action: rsc7 monitor on node1 * Resource action: rsc8 stop on node2 * Resource action: rsc8 monitor on node1 - * Pseudo action: all_stopped * Resource action: rsc2 start on node2 * Resource action: rsc4 start on node2 * Resource action: rsc6 start on node1 diff --git a/pengine/test10/order7.exp b/pengine/test10/order7.exp index 4e59463..6476815 100644 --- a/pengine/test10/order7.exp +++ b/pengine/test10/order7.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,20 +23,20 @@ - + - + - + @@ -45,20 +45,20 @@ - + - + - + @@ -67,7 +67,7 @@ - + diff --git a/pengine/test10/order_constraint_stops_master.dot b/pengine/test10/order_constraint_stops_master.dot index 359d3fe..3a2e536 100644 --- a/pengine/test10/order_constraint_stops_master.dot +++ b/pengine/test10/order_constraint_stops_master.dot @@ -6,7 +6,6 @@ "MASTER_RSC_A_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"] "MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "MASTER_RSC_A_pre_notify_start_0" [ style = dashed] "MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "NATIVE_RSC_B_stop_0 fc16-builder2" [ style = bold] -"MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "MASTER_RSC_A_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"] "MASTER_RSC_A_confirmed-pre_notify_demote_0" -> "MASTER_RSC_A_demote_0" [ style = bold] "MASTER_RSC_A_confirmed-pre_notify_demote_0" -> "MASTER_RSC_A_post_notify_demoted_0" [ style = bold] @@ -68,12 +67,9 @@ "NATIVE_RSC_A:0_stop_0 fc16-builder" -> "MASTER_RSC_A_stopped_0" [ style = bold] "NATIVE_RSC_A:0_stop_0 fc16-builder" -> "NATIVE_RSC_A:0_delete_0 fc16-builder2" [ style = bold] "NATIVE_RSC_A:0_stop_0 fc16-builder" -> "NATIVE_RSC_A:0_start_0 fc16-builder" [ style = dashed] -"NATIVE_RSC_A:0_stop_0 fc16-builder" -> "all_stopped" [ style = bold] "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"] "NATIVE_RSC_B_start_0 " -> "MASTER_RSC_A_start_0" [ style = dashed] "NATIVE_RSC_B_start_0 " [ style=dashed color="red" fontcolor="black"] "NATIVE_RSC_B_stop_0 fc16-builder2" -> "NATIVE_RSC_B_start_0 " [ style = dashed] -"NATIVE_RSC_B_stop_0 fc16-builder2" -> "all_stopped" [ style = bold] "NATIVE_RSC_B_stop_0 fc16-builder2" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/order_constraint_stops_master.exp b/pengine/test10/order_constraint_stops_master.exp index 22355bc..1095752 100644 --- a/pengine/test10/order_constraint_stops_master.exp +++ b/pengine/test10/order_constraint_stops_master.exp @@ -1,133 +1,133 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -135,143 +135,125 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/order_constraint_stops_master.summary b/pengine/test10/order_constraint_stops_master.summary index d3d8891..9fb5737 100644 --- a/pengine/test10/order_constraint_stops_master.summary +++ b/pengine/test10/order_constraint_stops_master.summary @@ -31,7 +31,6 @@ Executing cluster transition: * Pseudo action: MASTER_RSC_A_post_notify_stopped_0 * Pseudo action: MASTER_RSC_A_confirmed-post_notify_stopped_0 * Resource action: NATIVE_RSC_B stop on fc16-builder2 - * Pseudo action: all_stopped Revised cluster status: Online: [ fc16-builder fc16-builder2 ] diff --git a/pengine/test10/order_constraint_stops_slave.dot b/pengine/test10/order_constraint_stops_slave.dot index b7a48eb..812fe95 100644 --- a/pengine/test10/order_constraint_stops_slave.dot +++ b/pengine/test10/order_constraint_stops_slave.dot @@ -2,7 +2,6 @@ "MASTER_RSC_A_confirmed-post_notify_running_0" [ style=dashed color="red" fontcolor="orange"] "MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "MASTER_RSC_A_pre_notify_start_0" [ style = dashed] "MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "NATIVE_RSC_B_stop_0 fc16-builder" [ style = bold] -"MASTER_RSC_A_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "MASTER_RSC_A_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"] "MASTER_RSC_A_confirmed-pre_notify_start_0" -> "MASTER_RSC_A_post_notify_running_0" [ style = dashed] "MASTER_RSC_A_confirmed-pre_notify_start_0" -> "MASTER_RSC_A_start_0" [ style = dashed] @@ -38,12 +37,9 @@ "NATIVE_RSC_A:0_start_0 fc16-builder" [ style=dashed color="red" fontcolor="black"] "NATIVE_RSC_A:0_stop_0 fc16-builder" -> "MASTER_RSC_A_stopped_0" [ style = bold] "NATIVE_RSC_A:0_stop_0 fc16-builder" -> "NATIVE_RSC_A:0_start_0 fc16-builder" [ style = dashed] -"NATIVE_RSC_A:0_stop_0 fc16-builder" -> "all_stopped" [ style = bold] "NATIVE_RSC_A:0_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"] "NATIVE_RSC_B_start_0 " -> "MASTER_RSC_A_start_0" [ style = dashed] "NATIVE_RSC_B_start_0 " [ style=dashed color="red" fontcolor="black"] "NATIVE_RSC_B_stop_0 fc16-builder" -> "NATIVE_RSC_B_start_0 " [ style = dashed] -"NATIVE_RSC_B_stop_0 fc16-builder" -> "all_stopped" [ style = bold] "NATIVE_RSC_B_stop_0 fc16-builder" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/order_constraint_stops_slave.exp b/pengine/test10/order_constraint_stops_slave.exp index 96c7a72..780e7e9 100644 --- a/pengine/test10/order_constraint_stops_slave.exp +++ b/pengine/test10/order_constraint_stops_slave.exp @@ -1,75 +1,75 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -77,59 +77,41 @@ - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/order_constraint_stops_slave.summary b/pengine/test10/order_constraint_stops_slave.summary index 896c9c3..60c1545 100644 --- a/pengine/test10/order_constraint_stops_slave.summary +++ b/pengine/test10/order_constraint_stops_slave.summary @@ -22,7 +22,6 @@ Executing cluster transition: * Pseudo action: MASTER_RSC_A_post_notify_stopped_0 * Pseudo action: MASTER_RSC_A_confirmed-post_notify_stopped_0 * Resource action: NATIVE_RSC_B stop on fc16-builder - * Pseudo action: all_stopped Revised cluster status: Online: [ fc16-builder ] diff --git a/pengine/test10/ordered-set-basic-startup.exp b/pengine/test10/ordered-set-basic-startup.exp index 56a506a..80bc7b6 100644 --- a/pengine/test10/ordered-set-basic-startup.exp +++ b/pengine/test10/ordered-set-basic-startup.exp @@ -1,7 +1,7 @@ - + @@ -10,20 +10,20 @@ - + - + - + @@ -32,7 +32,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/pengine/test10/origin.exp b/pengine/test10/origin.exp index 780be47..4b3cde6 100644 --- a/pengine/test10/origin.exp +++ b/pengine/test10/origin.exp @@ -1,7 +1,7 @@ - + diff --git a/pengine/test10/orphan-0.exp b/pengine/test10/orphan-0.exp index 7bdb18f..0f8b454 100644 --- a/pengine/test10/orphan-0.exp +++ b/pengine/test10/orphan-0.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -109,7 +109,7 @@ - + diff --git a/pengine/test10/orphan-1.dot b/pengine/test10/orphan-1.dot index 9842307..39c456b 100644 --- a/pengine/test10/orphan-1.dot +++ b/pengine/test10/orphan-1.dot @@ -4,7 +4,6 @@ "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" ] @@ -16,7 +15,6 @@ "rsc_c001n03_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ] "rsc_c001n03_monitor_6000 c001n03" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_delete_0 c001n08" [ style=bold color="green" fontcolor="black"] -"rsc_c001n08_stop_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n08" [ style = bold] "rsc_c001n08_stop_0 c001n08" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/orphan-1.exp b/pengine/test10/orphan-1.exp index af4873a..b56db7d 100644 --- a/pengine/test10/orphan-1.exp +++ b/pengine/test10/orphan-1.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -145,26 +145,14 @@ - + - - - - - - - - - - - - - + diff --git a/pengine/test10/orphan-1.summary b/pengine/test10/orphan-1.summary index 0ab96f4..0660978 100644 --- a/pengine/test10/orphan-1.summary +++ b/pengine/test10/orphan-1.summary @@ -29,7 +29,6 @@ Executing cluster transition: * Resource action: rsc_c001n01 monitor on c001n02 * Resource action: rsc_c001n08 stop on c001n08 * Resource action: rsc_c001n08 delete on c001n08 - * Pseudo action: all_stopped Revised cluster status: Online: [ c001n01 c001n02 c001n03 c001n08 ] diff --git a/pengine/test10/orphan-2.dot b/pengine/test10/orphan-2.dot index 1a4e057..0df2a95 100644 --- a/pengine/test10/orphan-2.dot +++ b/pengine/test10/orphan-2.dot @@ -4,7 +4,6 @@ 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"] @@ -20,7 +19,6 @@ digraph "g" { "rsc_c001n08_clear_failcount_0 c001n08" -> "rsc_c001n08_stop_0 c001n08" [ style = bold] "rsc_c001n08_clear_failcount_0 c001n08" [ style=bold color="green" fontcolor="black"] "rsc_c001n08_delete_0 c001n08" [ style=bold color="green" fontcolor="black"] -"rsc_c001n08_stop_0 c001n08" -> "all_stopped" [ style = bold] "rsc_c001n08_stop_0 c001n08" -> "rsc_c001n08_delete_0 c001n08" [ style = bold] "rsc_c001n08_stop_0 c001n08" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/orphan-2.exp b/pengine/test10/orphan-2.exp index 90042e7..5a0f631 100644 --- a/pengine/test10/orphan-2.exp +++ b/pengine/test10/orphan-2.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -136,23 +136,23 @@ - + - + - + - + @@ -161,7 +161,7 @@ - + @@ -170,26 +170,14 @@ - + - - - - - - - - - - - - - + diff --git a/pengine/test10/orphan-2.summary b/pengine/test10/orphan-2.summary index e04363a..ee00ad5 100644 --- a/pengine/test10/orphan-2.summary +++ b/pengine/test10/orphan-2.summary @@ -31,7 +31,6 @@ Executing cluster transition: * Cluster action: clear_failcount for rsc_c001n08 on c001n02 * Resource action: rsc_c001n08 stop on c001n08 * Resource action: rsc_c001n08 delete on c001n08 - * Pseudo action: all_stopped Revised cluster status: Online: [ c001n01 c001n02 c001n03 c001n08 ] diff --git a/pengine/test10/params-0.exp b/pengine/test10/params-0.exp index bea3f17..c0d8c65 100644 --- a/pengine/test10/params-0.exp +++ b/pengine/test10/params-0.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -127,7 +127,7 @@ - + diff --git a/pengine/test10/params-1.dot b/pengine/test10/params-1.dot index d44a701..c1ad634 100644 --- a/pengine/test10/params-1.dot +++ b/pengine/test10/params-1.dot @@ -10,9 +10,7 @@ "DcIPaddr_start_0 c001n02" -> "DcIPaddr_monitor_5000 c001n02" [ style = bold] "DcIPaddr_start_0 c001n02" [ style=bold color="green" fontcolor="black" ] "DcIPaddr_stop_0 c001n02" -> "DcIPaddr_start_0 c001n02" [ style = bold] -"DcIPaddr_stop_0 c001n02" -> "all_stopped" [ style = bold] "DcIPaddr_stop_0 c001n02" [ 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" ] diff --git a/pengine/test10/params-1.exp b/pengine/test10/params-1.exp index 87e2669..dcdfdef 100644 --- a/pengine/test10/params-1.exp +++ b/pengine/test10/params-1.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,23 +37,23 @@ - + - + - + - + - + @@ -66,13 +66,13 @@ - + - + @@ -81,7 +81,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -153,7 +153,7 @@ - + @@ -162,7 +162,7 @@ - + @@ -171,7 +171,7 @@ - + @@ -180,7 +180,7 @@ - + @@ -189,7 +189,7 @@ - + @@ -198,24 +198,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/params-1.summary b/pengine/test10/params-1.summary index b237672..46d6f81 100644 --- a/pengine/test10/params-1.summary +++ b/pengine/test10/params-1.summary @@ -33,7 +33,6 @@ Executing cluster transition: * Resource action: rsc_c001n01 monitor on c001n08 * Resource action: rsc_c001n01 monitor on c001n03 * Resource action: rsc_c001n01 monitor on c001n02 - * Pseudo action: all_stopped Revised cluster status: Online: [ c001n01 c001n02 c001n03 c001n08 ] diff --git a/pengine/test10/params-2.dot b/pengine/test10/params-2.dot index 162a5ae..4cb78f7 100644 --- a/pengine/test10/params-2.dot +++ b/pengine/test10/params-2.dot @@ -1,9 +1,7 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "do_shutdown node1" [ style=bold color="green" fontcolor="black" ] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "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] @@ -13,7 +11,6 @@ "rsc2_monitor_0 node3" -> "rsc2_start_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" ] diff --git a/pengine/test10/params-2.exp b/pengine/test10/params-2.exp index f6d7c53..69dc88a 100644 --- a/pengine/test10/params-2.exp +++ b/pengine/test10/params-2.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,42 +46,42 @@ - + - + - + - + - + - + - + - + @@ -90,26 +90,26 @@ - + - + - + - + - + @@ -118,7 +118,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -145,22 +145,7 @@ - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/params-2.summary b/pengine/test10/params-2.summary index c19659a..6fab75f 100644 --- a/pengine/test10/params-2.summary +++ b/pengine/test10/params-2.summary @@ -23,7 +23,6 @@ Executing cluster transition: * Resource action: rsc3 monitor on node1 * Resource action: rsc3 delete 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 diff --git a/pengine/test10/params-4.exp b/pengine/test10/params-4.exp index 2b31cb1..627311d 100644 --- a/pengine/test10/params-4.exp +++ b/pengine/test10/params-4.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,20 +28,20 @@ - + - + - + - + @@ -54,13 +54,13 @@ - + - + @@ -69,7 +69,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -168,7 +168,7 @@ - + @@ -177,7 +177,7 @@ - + @@ -186,7 +186,7 @@ - + diff --git a/pengine/test10/params-5.dot b/pengine/test10/params-5.dot index cb00964..6370be2 100644 --- a/pengine/test10/params-5.dot +++ b/pengine/test10/params-5.dot @@ -10,9 +10,7 @@ digraph "g" { "DcIPaddr_start_0 c001n02" -> "DcIPaddr_monitor_5000 c001n02" [ style = bold] "DcIPaddr_start_0 c001n02" [ style=bold color="green" fontcolor="black"] "DcIPaddr_stop_0 c001n02" -> "DcIPaddr_start_0 c001n02" [ style = bold] -"DcIPaddr_stop_0 c001n02" -> "all_stopped" [ style = bold] "DcIPaddr_stop_0 c001n02" [ 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"] diff --git a/pengine/test10/params-5.exp b/pengine/test10/params-5.exp index 788dd8b..951a012 100644 --- a/pengine/test10/params-5.exp +++ b/pengine/test10/params-5.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,23 +37,23 @@ - + - + - + - + - + @@ -66,13 +66,13 @@ - + - + @@ -81,7 +81,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -126,7 +126,7 @@ - + @@ -135,7 +135,7 @@ - + @@ -153,7 +153,7 @@ - + @@ -162,7 +162,7 @@ - + @@ -171,7 +171,7 @@ - + @@ -180,7 +180,7 @@ - + @@ -189,7 +189,7 @@ - + @@ -198,24 +198,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/params-5.summary b/pengine/test10/params-5.summary index b237672..46d6f81 100644 --- a/pengine/test10/params-5.summary +++ b/pengine/test10/params-5.summary @@ -33,7 +33,6 @@ Executing cluster transition: * Resource action: rsc_c001n01 monitor on c001n08 * Resource action: rsc_c001n01 monitor on c001n03 * Resource action: rsc_c001n01 monitor on c001n02 - * Pseudo action: all_stopped Revised cluster status: Online: [ c001n01 c001n02 c001n03 c001n08 ] diff --git a/pengine/test10/params-6.exp b/pengine/test10/params-6.exp index f33ca74..bbdde61 100644 --- a/pengine/test10/params-6.exp +++ b/pengine/test10/params-6.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -35,13 +35,13 @@ - + - + @@ -49,7 +49,7 @@ - + @@ -57,7 +57,7 @@ - + diff --git a/pengine/test10/per-node-attrs.exp b/pengine/test10/per-node-attrs.exp index 13a128c..9095ed8 100644 --- a/pengine/test10/per-node-attrs.exp +++ b/pengine/test10/per-node-attrs.exp @@ -1,26 +1,26 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/pengine/test10/per-op-failcount.dot b/pengine/test10/per-op-failcount.dot index daae9e5..3293329 100644 --- a/pengine/test10/per-op-failcount.dot +++ b/pengine/test10/per-op-failcount.dot @@ -1,19 +1,13 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "prmDummy_monitor_10000 rh73-02-snmp" [ style=bold color="green" fontcolor="black"] "prmDummy_start_0 rh73-02-snmp" -> "prmDummy_monitor_10000 rh73-02-snmp" [ style = bold] "prmDummy_start_0 rh73-02-snmp" [ style=bold color="green" fontcolor="black"] -"prmDummy_stop_0 rh73-01-snmp" -> "all_stopped" [ style = bold] "prmDummy_stop_0 rh73-01-snmp" -> "prmDummy_start_0 rh73-02-snmp" [ style = bold] "prmDummy_stop_0 rh73-01-snmp" [ style=bold color="green" fontcolor="orange"] "prmStonith2-1_start_0 rh73-02-snmp" [ style=bold color="green" fontcolor="black"] -"prmStonith2-1_stop_0 rh73-01-snmp" -> "all_stopped" [ style = bold] "prmStonith2-1_stop_0 rh73-01-snmp" -> "prmStonith2-1_start_0 rh73-02-snmp" [ style = bold] "prmStonith2-1_stop_0 rh73-01-snmp" [ style=bold color="green" fontcolor="orange"] +"stonith 'reboot' rh73-01-snmp" -> "prmDummy_start_0 rh73-02-snmp" [ style = bold] "stonith 'reboot' rh73-01-snmp" -> "prmDummy_stop_0 rh73-01-snmp" [ style = bold] -"stonith 'reboot' rh73-01-snmp" -> "stonith_complete" [ style = bold] "stonith 'reboot' rh73-01-snmp" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "prmDummy_start_0 rh73-02-snmp" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/per-op-failcount.exp b/pengine/test10/per-op-failcount.exp index 052997b..d86e486 100644 --- a/pengine/test10/per-op-failcount.exp +++ b/pengine/test10/per-op-failcount.exp @@ -1,36 +1,36 @@ - + - + - + - + - + - + @@ -42,20 +42,20 @@ - + - + - + @@ -63,36 +63,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/per-op-failcount.summary b/pengine/test10/per-op-failcount.summary index 110d6b0..3b2fb88 100644 --- a/pengine/test10/per-op-failcount.summary +++ b/pengine/test10/per-op-failcount.summary @@ -18,8 +18,6 @@ Executing cluster transition: * Fencing rh73-01-snmp (reboot) * Pseudo action: prmDummy_stop_0 * Resource action: prmStonith2-1 start on rh73-02-snmp - * Pseudo action: stonith_complete - * Pseudo action: all_stopped * Resource action: prmDummy start on rh73-02-snmp * Resource action: prmDummy monitor=10000 on rh73-02-snmp Using the original execution date of: 2017-04-06 09:04:22Z diff --git a/pengine/test10/placement-capacity.dot b/pengine/test10/placement-capacity.dot index d8fc911..9a09367 100644 --- a/pengine/test10/placement-capacity.dot +++ b/pengine/test10/placement-capacity.dot @@ -1,8 +1,6 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "load_stopped_node1 node1" [ style=bold color="green" fontcolor="orange" ] "load_stopped_node2 node2" [ style=bold color="green" fontcolor="orange" ] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "load_stopped_node1 node1" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/placement-capacity.exp b/pengine/test10/placement-capacity.exp index 9aca009..69cf0ed 100644 --- a/pengine/test10/placement-capacity.exp +++ b/pengine/test10/placement-capacity.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -18,25 +18,13 @@ - + - - - - - - - - - - - - - + diff --git a/pengine/test10/placement-capacity.summary b/pengine/test10/placement-capacity.summary index 232c3f2..58f4180 100644 --- a/pengine/test10/placement-capacity.summary +++ b/pengine/test10/placement-capacity.summary @@ -12,7 +12,6 @@ Executing cluster transition: * Resource action: rsc1 stop on node1 * Pseudo action: load_stopped_node2 * Pseudo action: load_stopped_node1 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/placement-location.dot b/pengine/test10/placement-location.dot index d8fc911..9a09367 100644 --- a/pengine/test10/placement-location.dot +++ b/pengine/test10/placement-location.dot @@ -1,8 +1,6 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "load_stopped_node1 node1" [ style=bold color="green" fontcolor="orange" ] "load_stopped_node2 node2" [ style=bold color="green" fontcolor="orange" ] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "load_stopped_node1 node1" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/placement-location.exp b/pengine/test10/placement-location.exp index 9aca009..69cf0ed 100644 --- a/pengine/test10/placement-location.exp +++ b/pengine/test10/placement-location.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -18,25 +18,13 @@ - + - - - - - - - - - - - - - + diff --git a/pengine/test10/placement-location.summary b/pengine/test10/placement-location.summary index 2a5c9f5..7858eac 100644 --- a/pengine/test10/placement-location.summary +++ b/pengine/test10/placement-location.summary @@ -13,7 +13,6 @@ Executing cluster transition: * Resource action: rsc1 stop on node1 * Pseudo action: load_stopped_node2 * Pseudo action: load_stopped_node1 - * Pseudo action: all_stopped Revised cluster status: Node node1: standby diff --git a/pengine/test10/placement-priority.dot b/pengine/test10/placement-priority.dot index d8fc911..9a09367 100644 --- a/pengine/test10/placement-priority.dot +++ b/pengine/test10/placement-priority.dot @@ -1,8 +1,6 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "load_stopped_node1 node1" [ style=bold color="green" fontcolor="orange" ] "load_stopped_node2 node2" [ style=bold color="green" fontcolor="orange" ] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "load_stopped_node1 node1" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/placement-priority.exp b/pengine/test10/placement-priority.exp index 4db51ba..1ee5b62 100644 --- a/pengine/test10/placement-priority.exp +++ b/pengine/test10/placement-priority.exp @@ -1,7 +1,7 @@ - + @@ -10,35 +10,22 @@ - + - + - + - - - - - - - - - - - - - diff --git a/pengine/test10/placement-priority.summary b/pengine/test10/placement-priority.summary index 1d59837..af566ec 100644 --- a/pengine/test10/placement-priority.summary +++ b/pengine/test10/placement-priority.summary @@ -13,7 +13,6 @@ Executing cluster transition: * Resource action: rsc1 stop on node1 * Pseudo action: load_stopped_node1 * Pseudo action: load_stopped_node2 - * Pseudo action: all_stopped Revised cluster status: Node node1: standby diff --git a/pengine/test10/placement-stickiness.dot b/pengine/test10/placement-stickiness.dot index d8fc911..9a09367 100644 --- a/pengine/test10/placement-stickiness.dot +++ b/pengine/test10/placement-stickiness.dot @@ -1,8 +1,6 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "load_stopped_node1 node1" [ style=bold color="green" fontcolor="orange" ] "load_stopped_node2 node2" [ style=bold color="green" fontcolor="orange" ] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "load_stopped_node1 node1" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/placement-stickiness.exp b/pengine/test10/placement-stickiness.exp index 9aca009..69cf0ed 100644 --- a/pengine/test10/placement-stickiness.exp +++ b/pengine/test10/placement-stickiness.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -18,25 +18,13 @@ - + - - - - - - - - - - - - - + diff --git a/pengine/test10/placement-stickiness.summary b/pengine/test10/placement-stickiness.summary index 2a5c9f5..7858eac 100644 --- a/pengine/test10/placement-stickiness.summary +++ b/pengine/test10/placement-stickiness.summary @@ -13,7 +13,6 @@ Executing cluster transition: * Resource action: rsc1 stop on node1 * Pseudo action: load_stopped_node2 * Pseudo action: load_stopped_node1 - * Pseudo action: all_stopped Revised cluster status: Node node1: standby diff --git a/pengine/test10/probe-0.exp b/pengine/test10/probe-0.exp index d65acb6..8f8879f 100644 --- a/pengine/test10/probe-0.exp +++ b/pengine/test10/probe-0.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,33 +36,33 @@ - + - + - + - + - + @@ -71,52 +71,52 @@ - + - + - + - + - + - + - + - + - + - + @@ -124,37 +124,37 @@ - + - + - + - + - + - + - + - + diff --git a/pengine/test10/probe-1.exp b/pengine/test10/probe-1.exp index 79ad319..32d2c92 100644 --- a/pengine/test10/probe-1.exp +++ b/pengine/test10/probe-1.exp @@ -1,33 +1,33 @@ - + - + - + - + - + diff --git a/pengine/test10/probe-2.dot b/pengine/test10/probe-2.dot index 452baee..bc6b736 100644 --- a/pengine/test10/probe-2.dot +++ b/pengine/test10/probe-2.dot @@ -11,8 +11,6 @@ digraph "g" { "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stopped_0" -> "DoFencing_start_0" [ style = bold] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] -"apache2:1_stop_0 wc02" -> "all_stopped" [ style = bold] "apache2:1_stop_0 wc02" -> "fs_www:1_stop_0 wc02" [ style = bold] "apache2:1_stop_0 wc02" -> "group_webservice:1_stopped_0" [ style = bold] "apache2:1_stop_0 wc02" [ style=bold color="green" fontcolor="black" ] @@ -54,7 +52,6 @@ digraph "g" { "drbd_mysql:1_pre_notify_demote_0 wc02" [ style=bold color="green" fontcolor="black" ] "drbd_mysql:1_pre_notify_stop_0 wc02" -> "ms_drbd_mysql_confirmed-pre_notify_stop_0" [ style = bold] "drbd_mysql:1_pre_notify_stop_0 wc02" [ style=bold color="green" fontcolor="black" ] -"drbd_mysql:1_stop_0 wc02" -> "all_stopped" [ style = bold] "drbd_mysql:1_stop_0 wc02" -> "ms_drbd_mysql_stopped_0" [ style = bold] "drbd_mysql:1_stop_0 wc02" [ style=bold color="green" fontcolor="black" ] "drbd_www:0_post_notify_stop_0 wc01" -> "ms_drbd_www_confirmed-post_notify_stopped_0" [ style = bold] @@ -63,7 +60,6 @@ digraph "g" { "drbd_www:0_pre_notify_stop_0 wc01" [ style=bold color="green" fontcolor="black" ] "drbd_www:1_pre_notify_stop_0 wc02" -> "ms_drbd_www_confirmed-pre_notify_stop_0" [ style = bold] "drbd_www:1_pre_notify_stop_0 wc02" [ style=bold color="green" fontcolor="black" ] -"drbd_www:1_stop_0 wc02" -> "all_stopped" [ style = bold] "drbd_www:1_stop_0 wc02" -> "ms_drbd_www_stopped_0" [ style = bold] "drbd_www:1_stop_0 wc02" [ style=bold color="green" fontcolor="black" ] "fs_mysql_monitor_30000 wc01" [ style=bold color="green" fontcolor="black" ] @@ -71,11 +67,9 @@ digraph "g" { "fs_mysql_start_0 wc01" -> "group_mysql_running_0" [ style = bold] "fs_mysql_start_0 wc01" -> "intip_sql_start_0 wc01" [ style = bold] "fs_mysql_start_0 wc01" [ style=bold color="green" fontcolor="black" ] -"fs_mysql_stop_0 wc02" -> "all_stopped" [ style = bold] "fs_mysql_stop_0 wc02" -> "fs_mysql_start_0 wc01" [ style = bold] "fs_mysql_stop_0 wc02" -> "group_mysql_stopped_0" [ style = bold] "fs_mysql_stop_0 wc02" [ style=bold color="green" fontcolor="black" ] -"fs_www:1_stop_0 wc02" -> "all_stopped" [ style = bold] "fs_www:1_stop_0 wc02" -> "group_webservice:1_stopped_0" [ style = bold] "fs_www:1_stop_0 wc02" [ style=bold color="green" fontcolor="black" ] "group_mysql-proxy:1_stop_0" -> "group_mysql-proxy:1_stopped_0" [ style = bold] @@ -114,7 +108,6 @@ digraph "g" { "intip_sql_start_0 wc01" -> "intip_sql_monitor_30000 wc01" [ style = bold] "intip_sql_start_0 wc01" -> "mysql-server_start_0 wc01" [ style = bold] "intip_sql_start_0 wc01" [ style=bold color="green" fontcolor="black" ] -"intip_sql_stop_0 wc02" -> "all_stopped" [ style = bold] "intip_sql_stop_0 wc02" -> "fs_mysql_stop_0 wc02" [ style = bold] "intip_sql_stop_0 wc02" -> "group_mysql_stopped_0" [ style = bold] "intip_sql_stop_0 wc02" -> "intip_sql_start_0 wc01" [ style = bold] @@ -126,7 +119,6 @@ digraph "g" { "ms_drbd_mysql_confirmed-post_notify_promoted_0" -> "drbd_mysql:0_monitor_5000 wc01" [ style = bold] "ms_drbd_mysql_confirmed-post_notify_promoted_0" -> "group_mysql_start_0" [ style = bold] "ms_drbd_mysql_confirmed-post_notify_promoted_0" [ style=bold color="green" fontcolor="orange" ] -"ms_drbd_mysql_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "ms_drbd_mysql_confirmed-post_notify_stopped_0" -> "drbd_mysql:0_monitor_5000 wc01" [ style = bold] "ms_drbd_mysql_confirmed-post_notify_stopped_0" -> "ms_drbd_mysql_pre_notify_promote_0" [ style = bold] "ms_drbd_mysql_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] @@ -177,7 +169,6 @@ digraph "g" { "ms_drbd_mysql_stopped_0" -> "ms_drbd_mysql_post_notify_stopped_0" [ style = bold] "ms_drbd_mysql_stopped_0" -> "ms_drbd_mysql_promote_0" [ style = bold] "ms_drbd_mysql_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"ms_drbd_www_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "ms_drbd_www_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_www_confirmed-pre_notify_stop_0" -> "ms_drbd_www_post_notify_stopped_0" [ style = bold] "ms_drbd_www_confirmed-pre_notify_stop_0" -> "ms_drbd_www_stop_0" [ style = bold] @@ -194,19 +185,16 @@ digraph "g" { "ms_drbd_www_stop_0" [ style=bold color="green" fontcolor="orange" ] "ms_drbd_www_stopped_0" -> "ms_drbd_www_post_notify_stopped_0" [ style = bold] "ms_drbd_www_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"mysql-proxy:1_stop_0 wc02" -> "all_stopped" [ style = bold] "mysql-proxy:1_stop_0 wc02" -> "group_mysql-proxy:1_stopped_0" [ style = bold] "mysql-proxy:1_stop_0 wc02" [ style=bold color="green" fontcolor="black" ] "mysql-server_monitor_30000 wc01" [ style=bold color="green" fontcolor="black" ] "mysql-server_start_0 wc01" -> "group_mysql_running_0" [ style = bold] "mysql-server_start_0 wc01" -> "mysql-server_monitor_30000 wc01" [ style = bold] "mysql-server_start_0 wc01" [ style=bold color="green" fontcolor="black" ] -"mysql-server_stop_0 wc02" -> "all_stopped" [ style = bold] "mysql-server_stop_0 wc02" -> "group_mysql_stopped_0" [ style = bold] "mysql-server_stop_0 wc02" -> "intip_sql_stop_0 wc02" [ style = bold] "mysql-server_stop_0 wc02" -> "mysql-server_start_0 wc01" [ style = bold] "mysql-server_stop_0 wc02" [ style=bold color="green" fontcolor="black" ] -"nfs-common:1_stop_0 wc02" -> "all_stopped" [ style = bold] "nfs-common:1_stop_0 wc02" -> "group_nfs-common:1_stopped_0" [ style = bold] "nfs-common:1_stop_0 wc02" [ style=bold color="green" fontcolor="black" ] "stonith_rackpdu:0_monitor_5000 wc01" [ style=bold color="green" fontcolor="black" ] @@ -214,10 +202,8 @@ digraph "g" { "stonith_rackpdu:0_start_0 wc01" -> "stonith_rackpdu:0_monitor_5000 wc01" [ style = bold] "stonith_rackpdu:0_start_0 wc01" [ style=bold color="green" fontcolor="black" ] "stonith_rackpdu:0_stop_0 wc01" -> "DoFencing_stopped_0" [ style = bold] -"stonith_rackpdu:0_stop_0 wc01" -> "all_stopped" [ style = bold] "stonith_rackpdu:0_stop_0 wc01" -> "stonith_rackpdu:0_start_0 wc01" [ style = bold] "stonith_rackpdu:0_stop_0 wc01" [ style=bold color="green" fontcolor="black" ] "stonith_rackpdu:1_stop_0 wc02" -> "DoFencing_stopped_0" [ style = bold] -"stonith_rackpdu:1_stop_0 wc02" -> "all_stopped" [ style = bold] "stonith_rackpdu:1_stop_0 wc02" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/probe-2.exp b/pengine/test10/probe-2.exp index 72cc32a..da3c43e 100644 --- a/pengine/test10/probe-2.exp +++ b/pengine/test10/probe-2.exp @@ -1,107 +1,107 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -111,7 +111,7 @@ - + @@ -126,126 +126,126 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -253,238 +253,238 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -492,281 +492,281 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -774,159 +774,159 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -934,81 +934,81 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1016,80 +1016,80 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1097,76 +1097,28 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/probe-2.summary b/pengine/test10/probe-2.summary index 7b8b124..6680fd4 100644 --- a/pengine/test10/probe-2.summary +++ b/pengine/test10/probe-2.summary @@ -106,7 +106,6 @@ Executing cluster transition: * Pseudo action: ms_drbd_mysql_post_notify_stopped_0 * Resource action: drbd_mysql:0 notify on wc01 * Pseudo action: ms_drbd_mysql_confirmed-post_notify_stopped_0 - * Pseudo action: all_stopped * Pseudo action: ms_drbd_mysql_pre_notify_promote_0 * Resource action: drbd_mysql:0 notify on wc01 * Pseudo action: ms_drbd_mysql_confirmed-pre_notify_promote_0 diff --git a/pengine/test10/probe-timeout.exp b/pengine/test10/probe-timeout.exp index 5f36d79..de5c526 100644 --- a/pengine/test10/probe-timeout.exp +++ b/pengine/test10/probe-timeout.exp @@ -1,49 +1,49 @@ - + - + - + - + - + - + - + - + @@ -52,7 +52,7 @@ - + @@ -61,49 +61,49 @@ - + - + - + - + - + - + - + - + @@ -112,7 +112,7 @@ - + diff --git a/pengine/test10/quorum-1.dot b/pengine/test10/quorum-1.dot index 84dc105..3a57bc1 100644 --- a/pengine/test10/quorum-1.dot +++ b/pengine/test10/quorum-1.dot @@ -1,10 +1,8 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3_monitor_0 node1" -> "rsc3_start_0 node1" [ style = bold] diff --git a/pengine/test10/quorum-1.exp b/pengine/test10/quorum-1.exp index 65bfe1d..3402c71 100644 --- a/pengine/test10/quorum-1.exp +++ b/pengine/test10/quorum-1.exp @@ -1,7 +1,7 @@ - + @@ -10,23 +10,23 @@ - + - + - + - + @@ -35,7 +35,7 @@ - + @@ -44,23 +44,23 @@ - + - + - + - + @@ -69,24 +69,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/quorum-1.summary b/pengine/test10/quorum-1.summary index 813a91a..6aff0a5 100644 --- a/pengine/test10/quorum-1.summary +++ b/pengine/test10/quorum-1.summary @@ -16,7 +16,6 @@ Executing cluster transition: * Resource action: rsc2 monitor on node2 * Resource action: rsc3 monitor on node2 * Resource action: rsc3 monitor on node1 - * Pseudo action: all_stopped * Resource action: rsc2 start on node2 * Resource action: rsc3 start on node1 diff --git a/pengine/test10/quorum-2.dot b/pengine/test10/quorum-2.dot index 6fbb758..d8f21a2 100644 --- a/pengine/test10/quorum-2.dot +++ b/pengine/test10/quorum-2.dot @@ -1,10 +1,8 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/quorum-2.exp b/pengine/test10/quorum-2.exp index c9ea21b..468ef1c 100644 --- a/pengine/test10/quorum-2.exp +++ b/pengine/test10/quorum-2.exp @@ -1,7 +1,7 @@ - + @@ -10,23 +10,23 @@ - + - + - + - + @@ -35,7 +35,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -53,24 +53,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/quorum-2.summary b/pengine/test10/quorum-2.summary index fdc8976..61ba9f7 100644 --- a/pengine/test10/quorum-2.summary +++ b/pengine/test10/quorum-2.summary @@ -16,7 +16,6 @@ Executing cluster transition: * Resource action: rsc2 monitor on node2 * Resource action: rsc3 monitor on node2 * Resource action: rsc3 monitor on node1 - * Pseudo action: all_stopped * Resource action: rsc2 start on node2 Revised cluster status: diff --git a/pengine/test10/quorum-3.dot b/pengine/test10/quorum-3.dot index e3cf205..ffb042f 100644 --- a/pengine/test10/quorum-3.dot +++ b/pengine/test10/quorum-3.dot @@ -1,15 +1,12 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "rsc1_start_0 node1" [ style = dashed] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node1" [ style=dashed color="red" fontcolor="black" ] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_start_0 node1" [ style = dashed] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = dashed] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=dashed color="red" fontcolor="black" ] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = dashed] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/quorum-3.exp b/pengine/test10/quorum-3.exp index bf93855..371a304 100644 --- a/pengine/test10/quorum-3.exp +++ b/pengine/test10/quorum-3.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,27 +46,11 @@ - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/quorum-3.summary b/pengine/test10/quorum-3.summary index 50adf18..f061984 100644 --- a/pengine/test10/quorum-3.summary +++ b/pengine/test10/quorum-3.summary @@ -18,7 +18,6 @@ Executing cluster transition: * Resource action: rsc2 monitor on node2 * Resource action: rsc3 monitor on node2 * Resource action: rsc3 monitor on node1 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/quorum-4.exp b/pengine/test10/quorum-4.exp index 282be77..60143ce 100644 --- a/pengine/test10/quorum-4.exp +++ b/pengine/test10/quorum-4.exp @@ -1,33 +1,33 @@ - + - + - + - + - + diff --git a/pengine/test10/quorum-5.exp b/pengine/test10/quorum-5.exp index 1576d42..7450803 100644 --- a/pengine/test10/quorum-5.exp +++ b/pengine/test10/quorum-5.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -27,36 +27,36 @@ - + - + - + - + - + - + @@ -65,39 +65,39 @@ - + - + - + - + - + - + - + diff --git a/pengine/test10/quorum-6.exp b/pengine/test10/quorum-6.exp index 61b1154..ad56e7a 100644 --- a/pengine/test10/quorum-6.exp +++ b/pengine/test10/quorum-6.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,7 +36,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -99,49 +99,49 @@ - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/rebalance-unique-clones.dot b/pengine/test10/rebalance-unique-clones.dot index 11ec623..2c477ae 100644 --- a/pengine/test10/rebalance-unique-clones.dot +++ b/pengine/test10/rebalance-unique-clones.dot @@ -14,7 +14,5 @@ digraph "g" { "P:1_start_0 node2" [ style=bold color="green" fontcolor="black"] "P:1_stop_0 node1" -> "C_stopped_0" [ style = bold] "P:1_stop_0 node1" -> "P:1_start_0 node2" [ style = bold] -"P:1_stop_0 node1" -> "all_stopped" [ style = bold] "P:1_stop_0 node1" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/rebalance-unique-clones.exp b/pengine/test10/rebalance-unique-clones.exp index 66aff56..a5d8ee6 100644 --- a/pengine/test10/rebalance-unique-clones.exp +++ b/pengine/test10/rebalance-unique-clones.exp @@ -1,64 +1,64 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -66,40 +66,28 @@ - + - + - + - + - - - - - - - - - - - - - + diff --git a/pengine/test10/rebalance-unique-clones.summary b/pengine/test10/rebalance-unique-clones.summary index aa2e089..1169dbe 100644 --- a/pengine/test10/rebalance-unique-clones.summary +++ b/pengine/test10/rebalance-unique-clones.summary @@ -14,7 +14,6 @@ Executing cluster transition: * Resource action: P:1 stop on node1 * Pseudo action: C_stopped_0 * Pseudo action: C_start_0 - * Pseudo action: all_stopped * Resource action: P:1 start on node2 * Pseudo action: C_running_0 * Resource action: P:1 monitor=10000 on node2 diff --git a/pengine/test10/rec-node-1.exp b/pengine/test10/rec-node-1.exp index abae4db..2d1c8c4 100644 --- a/pengine/test10/rec-node-1.exp +++ b/pengine/test10/rec-node-1.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,20 +23,20 @@ - + - + - + diff --git a/pengine/test10/rec-node-10.dot b/pengine/test10/rec-node-10.dot index fac66e6..6790639 100644 --- a/pengine/test10/rec-node-10.dot +++ b/pengine/test10/rec-node-10.dot @@ -1,15 +1,12 @@ digraph "g" { -"all_stopped" [ style=dashed color="red" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = dashed] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" [ style=dashed color="red" fontcolor="black" ] -"rsc1_stop_0 node1" -> "all_stopped" [ style = dashed] "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = dashed] "rsc1_stop_0 node1" [ style=dashed color="red" fontcolor="black" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = dashed] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=dashed color="red" fontcolor="black" ] -"rsc2_stop_0 node1" -> "all_stopped" [ style = dashed] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = dashed] "rsc2_stop_0 node1" [ style=dashed color="red" fontcolor="black" ] "stonith-1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/rec-node-10.exp b/pengine/test10/rec-node-10.exp index a0606d9..309764a 100644 --- a/pengine/test10/rec-node-10.exp +++ b/pengine/test10/rec-node-10.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/pengine/test10/rec-node-11.dot b/pengine/test10/rec-node-11.dot index 3b54385..6749d23 100644 --- a/pengine/test10/rec-node-11.dot +++ b/pengine/test10/rec-node-11.dot @@ -1,6 +1,4 @@ digraph "g" { -"all_stopped" -> "stonith-1_start_0 node2" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "group1_running_0" [ style=bold color="green" fontcolor="orange" ] "group1_start_0" -> "group1_running_0" [ style = bold] "group1_start_0" -> "rsc1_start_0 node2" [ style = bold] @@ -18,7 +16,6 @@ digraph "g" { "rsc1_start_0 node2" -> "group1_running_0" [ style = bold] "rsc1_start_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "group1_stopped_0" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="orange" ] @@ -26,27 +23,23 @@ digraph "g" { "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" -> "group1_running_0" [ style = bold] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "group1_stopped_0" [ style = bold] "rsc2_stop_0 node1" -> "rsc1_stop_0 node1" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="orange" ] "rsc3_start_0 node2" -> "group1_start_0" [ style = bold] "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc3_stop_0 node2" -> "all_stopped" [ style = bold] "rsc3_stop_0 node2" -> "rsc3_start_0 node2" [ style = bold] "rsc3_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "stonith 'reboot' node1" -> "group1_stop_0" [ style = bold] +"stonith 'reboot' node1" -> "rsc1_start_0 node2" [ style = bold] "stonith 'reboot' node1" -> "rsc1_stop_0 node1" [ style = bold] +"stonith 'reboot' node1" -> "rsc2_start_0 node2" [ style = bold] "stonith 'reboot' node1" -> "rsc2_stop_0 node1" [ style = bold] -"stonith 'reboot' node1" -> "stonith_complete" [ style = bold] +"stonith 'reboot' node1" -> "rsc3_start_0 node2" [ style = bold] +"stonith 'reboot' node1" -> "stonith-1_start_0 node2" [ style = bold] "stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] "stonith-1_monitor_0 node2" -> "stonith-1_start_0 node2" [ style = bold] "stonith-1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "rsc1_start_0 node2" [ style = bold] -"stonith_complete" -> "rsc2_start_0 node2" [ style = bold] -"stonith_complete" -> "rsc3_start_0 node2" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/rec-node-11.exp b/pengine/test10/rec-node-11.exp index 352771a..eca2455 100644 --- a/pengine/test10/rec-node-11.exp +++ b/pengine/test10/rec-node-11.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,25 +26,25 @@ - + - + - + - + - + @@ -56,62 +56,62 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -120,16 +120,16 @@ - + - + - + @@ -138,32 +138,32 @@ - + - + - + - + - + - + - + @@ -172,13 +172,13 @@ - + - + @@ -187,68 +187,35 @@ - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/rec-node-11.summary b/pengine/test10/rec-node-11.summary index a354e49..cc72f62 100644 --- a/pengine/test10/rec-node-11.summary +++ b/pengine/test10/rec-node-11.summary @@ -21,14 +21,12 @@ Executing cluster transition: * Resource action: rsc1 monitor on node2 * Resource action: rsc2 monitor on node2 * Fencing node1 (reboot) + * Resource action: stonith-1 start on node2 * Pseudo action: group1_stop_0 * Pseudo action: rsc2_stop_0 - * Pseudo action: stonith_complete * Pseudo action: rsc1_stop_0 * Pseudo action: group1_stopped_0 * Resource action: rsc3 stop on node2 - * Pseudo action: all_stopped - * Resource action: stonith-1 start on node2 * Resource action: rsc3 start on node2 * Pseudo action: group1_start_0 * Resource action: rsc1 start on node2 diff --git a/pengine/test10/rec-node-12.dot b/pengine/test10/rec-node-12.dot index db1c68e..df6408b 100644 --- a/pengine/test10/rec-node-12.dot +++ b/pengine/test10/rec-node-12.dot @@ -14,7 +14,6 @@ digraph "g" { "DoFencing_start_0" -> "child_DoFencing:1_start_0 c001n01" [ style = bold] "DoFencing_start_0" -> "child_DoFencing:2_start_0 c001n08" [ style = bold] "DoFencing_start_0" [ style=bold color="green" fontcolor="orange" ] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:0_monitor_0 c001n01" -> "DoFencing_start_0" [ style = bold] "child_DoFencing:0_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:0_monitor_0 c001n03" -> "DoFencing_start_0" [ style = bold] @@ -87,13 +86,10 @@ digraph "g" { "rsc_c001n08_monitor_5000 c001n08" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_start_0 c001n08" -> "rsc_c001n08_monitor_5000 c001n08" [ style = bold] "rsc_c001n08_start_0 c001n08" [ style=bold color="green" fontcolor="black" ] -"stonith 'reboot' c001n02" -> "stonith_complete" [ style = bold] +"stonith 'reboot' c001n02" -> "DcIPaddr_start_0 c001n08" [ style = bold] +"stonith 'reboot' c001n02" -> "rsc_c001n01_start_0 c001n01" [ style = bold] +"stonith 'reboot' c001n02" -> "rsc_c001n02_start_0 c001n01" [ style = bold] +"stonith 'reboot' c001n02" -> "rsc_c001n03_start_0 c001n03" [ style = bold] +"stonith 'reboot' c001n02" -> "rsc_c001n08_start_0 c001n08" [ style = bold] "stonith 'reboot' c001n02" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "DcIPaddr_start_0 c001n08" [ style = bold] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "rsc_c001n01_start_0 c001n01" [ style = bold] -"stonith_complete" -> "rsc_c001n02_start_0 c001n01" [ style = bold] -"stonith_complete" -> "rsc_c001n03_start_0 c001n03" [ style = bold] -"stonith_complete" -> "rsc_c001n08_start_0 c001n08" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/rec-node-12.exp b/pengine/test10/rec-node-12.exp index d503232..4d6b4fc 100644 --- a/pengine/test10/rec-node-12.exp +++ b/pengine/test10/rec-node-12.exp @@ -1,42 +1,42 @@ - + - + - + - + - + - + - + - + @@ -45,7 +45,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -63,42 +63,42 @@ - + - + - + - + - + - + - + - + @@ -107,7 +107,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -125,42 +125,42 @@ - + - + - + - + - + - + - + - + @@ -169,7 +169,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -187,42 +187,42 @@ - + - + - + - + - + - + - + - + @@ -231,7 +231,7 @@ - + @@ -240,7 +240,7 @@ - + @@ -249,42 +249,42 @@ - + - + - + - + - + - + - + - + @@ -293,7 +293,7 @@ - + @@ -302,7 +302,7 @@ - + @@ -311,33 +311,33 @@ - + - + - + - + - + @@ -346,7 +346,7 @@ - + @@ -355,7 +355,7 @@ - + @@ -364,33 +364,33 @@ - + - + - + - + - + @@ -399,7 +399,7 @@ - + @@ -408,7 +408,7 @@ - + @@ -417,33 +417,33 @@ - + - + - + - + - + @@ -452,7 +452,7 @@ - + @@ -461,7 +461,7 @@ - + @@ -470,7 +470,7 @@ - + @@ -479,7 +479,7 @@ - + @@ -488,7 +488,7 @@ - + @@ -497,73 +497,73 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -572,29 +572,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/rec-node-12.summary b/pengine/test10/rec-node-12.summary index 8b2d4e6..ac48939 100644 --- a/pengine/test10/rec-node-12.summary +++ b/pengine/test10/rec-node-12.summary @@ -55,8 +55,6 @@ Executing cluster transition: * Resource action: child_DoFencing:3 monitor on c001n01 * Pseudo action: DoFencing_start_0 * Fencing c001n02 (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped * Resource action: DcIPaddr start on c001n08 * Resource action: rsc_c001n08 start on c001n08 * Resource action: rsc_c001n02 start on c001n01 diff --git a/pengine/test10/rec-node-13.dot b/pengine/test10/rec-node-13.dot index 094c241..077fb14 100644 --- a/pengine/test10/rec-node-13.dot +++ b/pengine/test10/rec-node-13.dot @@ -1,16 +1,11 @@ digraph "g" { -"all_stopped" [ 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:6_stop_0 c001n04" [ 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_msdummy:6_stop_0 c001n04" -> "all_stopped" [ style = bold] "ocf_msdummy:6_stop_0 c001n04" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:6_stop_0 c001n04" [ style=bold color="green" fontcolor="orange" ] "stonith 'reboot' c001n04" -> "master_rsc_1_stop_0" [ style = bold] "stonith 'reboot' c001n04" -> "ocf_msdummy:6_stop_0 c001n04" [ style = bold] -"stonith 'reboot' c001n04" -> "stonith_complete" [ style = bold] "stonith 'reboot' c001n04" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/rec-node-13.exp b/pengine/test10/rec-node-13.exp index a289600..88eaa66 100644 --- a/pengine/test10/rec-node-13.exp +++ b/pengine/test10/rec-node-13.exp @@ -1,7 +1,7 @@ - + @@ -10,28 +10,28 @@ - + - + - + - + - + @@ -43,33 +43,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/rec-node-13.summary b/pengine/test10/rec-node-13.summary index 8bab0db..aaced98 100644 --- a/pengine/test10/rec-node-13.summary +++ b/pengine/test10/rec-node-13.summary @@ -40,10 +40,8 @@ Transition Summary: Executing cluster transition: * Fencing c001n04 (reboot) * Pseudo action: master_rsc_1_stop_0 - * Pseudo action: stonith_complete * Pseudo action: ocf_msdummy:6_stop_0 * Pseudo action: master_rsc_1_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ c001n02 c001n06 c001n07 ] diff --git a/pengine/test10/rec-node-14.dot b/pengine/test10/rec-node-14.dot index 5ceef92..16967c6 100644 --- a/pengine/test10/rec-node-14.dot +++ b/pengine/test10/rec-node-14.dot @@ -1,11 +1,7 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "stonith 'reboot' node1" -> "stonith 'reboot' node3" [ style = bold] "stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] -"stonith 'reboot' node2" -> "stonith_complete" [ style = bold] "stonith 'reboot' node2" [ style=bold color="green" fontcolor="black"] "stonith 'reboot' node3" -> "stonith 'reboot' node2" [ style = bold] "stonith 'reboot' node3" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/rec-node-14.exp b/pengine/test10/rec-node-14.exp index 308ab7e..e95918f 100644 --- a/pengine/test10/rec-node-14.exp +++ b/pengine/test10/rec-node-14.exp @@ -1,30 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -38,7 +14,7 @@ - + @@ -53,7 +29,7 @@ - + diff --git a/pengine/test10/rec-node-14.summary b/pengine/test10/rec-node-14.summary index b5f105e..d026e13 100644 --- a/pengine/test10/rec-node-14.summary +++ b/pengine/test10/rec-node-14.summary @@ -16,8 +16,6 @@ Executing cluster transition: * Fencing node1 (reboot) * Fencing node3 (reboot) * Fencing node2 (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped Revised cluster status: OFFLINE: [ node1 node2 node3 ] diff --git a/pengine/test10/rec-node-15.dot b/pengine/test10/rec-node-15.dot index 9c2c5ed..70dc829 100644 --- a/pengine/test10/rec-node-15.dot +++ b/pengine/test10/rec-node-15.dot @@ -5,7 +5,6 @@ digraph "g" { "Filesystem_13_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "Filesystem_13_stop_0 sapcl02" -> "Filesystem_13_start_0 sapcl01" [ style = bold] "Filesystem_13_stop_0 sapcl02" -> "LVM_12_stop_0 sapcl02" [ style = bold] -"Filesystem_13_stop_0 sapcl02" -> "all_stopped" [ style = bold] "Filesystem_13_stop_0 sapcl02" -> "app02_stopped_0" [ style = bold] "Filesystem_13_stop_0 sapcl02" [ style=bold color="green" fontcolor="black" ] "Filesystem_23_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ] @@ -19,7 +18,6 @@ digraph "g" { "IPaddr_192_168_1_102_start_0 sapcl01" -> "app02_running_0" [ style = bold] "IPaddr_192_168_1_102_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "IPaddr_192_168_1_102_stop_0 sapcl02" -> "IPaddr_192_168_1_102_start_0 sapcl01" [ style = bold] -"IPaddr_192_168_1_102_stop_0 sapcl02" -> "all_stopped" [ style = bold] "IPaddr_192_168_1_102_stop_0 sapcl02" -> "app02_stopped_0" [ style = bold] "IPaddr_192_168_1_102_stop_0 sapcl02" [ style=bold color="green" fontcolor="black" ] "IPaddr_192_168_1_104_monitor_5000 sapcl01" [ style=bold color="green" fontcolor="black" ] @@ -34,7 +32,6 @@ digraph "g" { "LVM_12_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "LVM_12_stop_0 sapcl02" -> "IPaddr_192_168_1_102_stop_0 sapcl02" [ style = bold] "LVM_12_stop_0 sapcl02" -> "LVM_12_start_0 sapcl01" [ style = bold] -"LVM_12_stop_0 sapcl02" -> "all_stopped" [ style = bold] "LVM_12_stop_0 sapcl02" -> "app02_stopped_0" [ style = bold] "LVM_12_stop_0 sapcl02" [ style=bold color="green" fontcolor="black" ] "LVM_22_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ] @@ -42,8 +39,6 @@ digraph "g" { "LVM_22_start_0 sapcl01" -> "LVM_22_monitor_120000 sapcl01" [ style = bold] "LVM_22_start_0 sapcl01" -> "oracle_running_0" [ style = bold] "LVM_22_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] -"all_stopped" -> "stonith-1_start_0 sapcl01" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "app02_running_0" [ style=bold color="green" fontcolor="orange" ] "app02_start_0" -> "Filesystem_13_start_0 sapcl01" [ style = bold] "app02_start_0" -> "IPaddr_192_168_1_102_start_0 sapcl01" [ style = bold] @@ -74,21 +69,19 @@ digraph "g" { "oralsnr_25_start_0 sapcl01" -> "oracle_running_0" [ style = bold] "oralsnr_25_start_0 sapcl01" -> "oralsnr_25_monitor_120000 sapcl01" [ style = bold] "oralsnr_25_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] -"stonith 'reboot' sapcl03" -> "stonith_complete" [ style = bold] +"stonith 'reboot' sapcl03" -> "Filesystem_13_start_0 sapcl01" [ style = bold] +"stonith 'reboot' sapcl03" -> "Filesystem_23_start_0 sapcl01" [ style = bold] +"stonith 'reboot' sapcl03" -> "IPaddr_192_168_1_102_start_0 sapcl01" [ style = bold] +"stonith 'reboot' sapcl03" -> "IPaddr_192_168_1_104_start_0 sapcl01" [ style = bold] +"stonith 'reboot' sapcl03" -> "LVM_12_start_0 sapcl01" [ style = bold] +"stonith 'reboot' sapcl03" -> "LVM_22_start_0 sapcl01" [ style = bold] +"stonith 'reboot' sapcl03" -> "oracle_24_start_0 sapcl01" [ style = bold] +"stonith 'reboot' sapcl03" -> "oralsnr_25_start_0 sapcl01" [ style = bold] +"stonith 'reboot' sapcl03" -> "stonith-1_start_0 sapcl01" [ style = bold] "stonith 'reboot' sapcl03" [ style=bold color="green" fontcolor="black"] "stonith-1_monitor_0 sapcl01" -> "stonith-1_start_0 sapcl01" [ style = bold] "stonith-1_monitor_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "stonith-1_monitor_0 sapcl02" -> "stonith-1_start_0 sapcl01" [ style = bold] "stonith-1_monitor_0 sapcl02" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] -"stonith_complete" -> "Filesystem_13_start_0 sapcl01" [ style = bold] -"stonith_complete" -> "Filesystem_23_start_0 sapcl01" [ style = bold] -"stonith_complete" -> "IPaddr_192_168_1_102_start_0 sapcl01" [ style = bold] -"stonith_complete" -> "IPaddr_192_168_1_104_start_0 sapcl01" [ style = bold] -"stonith_complete" -> "LVM_12_start_0 sapcl01" [ style = bold] -"stonith_complete" -> "LVM_22_start_0 sapcl01" [ style = bold] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "oracle_24_start_0 sapcl01" [ style = bold] -"stonith_complete" -> "oralsnr_25_start_0 sapcl01" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/rec-node-15.exp b/pengine/test10/rec-node-15.exp index 3cd3e81..1207b64 100644 --- a/pengine/test10/rec-node-15.exp +++ b/pengine/test10/rec-node-15.exp @@ -1,26 +1,26 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -38,28 +38,28 @@ - + - + - + - + - + - + @@ -67,214 +67,214 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -282,195 +282,162 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + diff --git a/pengine/test10/rec-node-15.summary b/pengine/test10/rec-node-15.summary index 07355c7..f0ffb44 100644 --- a/pengine/test10/rec-node-15.summary +++ b/pengine/test10/rec-node-15.summary @@ -39,27 +39,25 @@ Executing cluster transition: * Resource action: Filesystem_13 stop on sapcl02 * Pseudo action: oracle_start_0 * Fencing sapcl03 (reboot) + * Resource action: stonith-1 start on sapcl01 * Resource action: LVM_12 stop on sapcl02 - * Pseudo action: stonith_complete - * Resource action: IPaddr_192_168_1_102 stop on sapcl02 * Resource action: IPaddr_192_168_1_104 start on sapcl01 * Resource action: LVM_22 start on sapcl01 * Resource action: Filesystem_23 start on sapcl01 * Resource action: oracle_24 start on sapcl01 * Resource action: oralsnr_25 start on sapcl01 - * Pseudo action: all_stopped - * Resource action: stonith-1 start on sapcl01 - * Pseudo action: app02_stopped_0 - * Pseudo action: app02_start_0 - * Resource action: IPaddr_192_168_1_102 start on sapcl01 - * Resource action: LVM_12 start on sapcl01 - * Resource action: Filesystem_13 start on sapcl01 + * Resource action: IPaddr_192_168_1_102 stop on sapcl02 * Pseudo action: oracle_running_0 * Resource action: IPaddr_192_168_1_104 monitor=5000 on sapcl01 * Resource action: LVM_22 monitor=120000 on sapcl01 * Resource action: Filesystem_23 monitor=120000 on sapcl01 * Resource action: oracle_24 monitor=120000 on sapcl01 * Resource action: oralsnr_25 monitor=120000 on sapcl01 + * Pseudo action: app02_stopped_0 + * Pseudo action: app02_start_0 + * Resource action: IPaddr_192_168_1_102 start on sapcl01 + * Resource action: LVM_12 start on sapcl01 + * Resource action: Filesystem_13 start on sapcl01 * Pseudo action: app02_running_0 * Resource action: IPaddr_192_168_1_102 monitor=5000 on sapcl01 * Resource action: LVM_12 monitor=120000 on sapcl01 diff --git a/pengine/test10/rec-node-2.dot b/pengine/test10/rec-node-2.dot index f932c11..879bd61 100644 --- a/pengine/test10/rec-node-2.dot +++ b/pengine/test10/rec-node-2.dot @@ -1,8 +1,4 @@ digraph "g" { -"all_stopped" -> "rsc1_start_0 node2" [ style = bold] -"all_stopped" -> "rsc3_start_0 node2" [ style = bold] -"all_stopped" -> "stonith-1_start_0 node2" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "group1_running_0" [ style=bold color="green" fontcolor="orange" ] "group1_start_0" -> "group1_running_0" [ style = bold] "group1_start_0" -> "rsc3_start_0 node2" [ style = bold] @@ -37,15 +33,15 @@ digraph "g" { "rsc6_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc6_start_0 node2" -> "group2_running_0" [ style = bold] "rsc6_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"stonith 'reboot' node1" -> "stonith_complete" [ style = bold] +"stonith 'reboot' node1" -> "rsc1_start_0 node2" [ style = bold] +"stonith 'reboot' node1" -> "rsc2_start_0 node2" [ style = bold] +"stonith 'reboot' node1" -> "rsc3_start_0 node2" [ style = bold] +"stonith 'reboot' node1" -> "rsc4_start_0 node2" [ style = bold] +"stonith 'reboot' node1" -> "rsc5_start_0 node2" [ style = bold] +"stonith 'reboot' node1" -> "rsc6_start_0 node2" [ style = bold] +"stonith 'reboot' node1" -> "stonith-1_start_0 node2" [ style = bold] "stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] "stonith-1_monitor_0 node2" -> "stonith-1_start_0 node2" [ style = bold] "stonith-1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "rsc2_start_0 node2" [ style = bold] -"stonith_complete" -> "rsc4_start_0 node2" [ style = bold] -"stonith_complete" -> "rsc5_start_0 node2" [ style = bold] -"stonith_complete" -> "rsc6_start_0 node2" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/rec-node-2.exp b/pengine/test10/rec-node-2.exp index 6b4f86e..292141f 100644 --- a/pengine/test10/rec-node-2.exp +++ b/pengine/test10/rec-node-2.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,23 +26,23 @@ - + - + - + - + @@ -51,23 +51,23 @@ - + - + - + - + @@ -76,25 +76,25 @@ - + - + - + - + - + @@ -102,26 +102,26 @@ - + - + - + - + - + @@ -130,29 +130,29 @@ - + - + - + - + - + - + @@ -161,25 +161,25 @@ - + - + - + - + - + @@ -187,26 +187,26 @@ - + - + - + - + - + @@ -215,29 +215,29 @@ - + - + - + - + - + - + @@ -246,7 +246,7 @@ - + @@ -255,29 +255,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/rec-node-2.summary b/pengine/test10/rec-node-2.summary index 4106abf..59c727b 100644 --- a/pengine/test10/rec-node-2.summary +++ b/pengine/test10/rec-node-2.summary @@ -34,8 +34,6 @@ Executing cluster transition: * Resource action: rsc5 monitor on node2 * Resource action: rsc6 monitor on node2 * Fencing node1 (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped * Resource action: stonith-1 start on node2 * Resource action: rsc1 start on node2 * Resource action: rsc2 start on node2 diff --git a/pengine/test10/rec-node-3.exp b/pengine/test10/rec-node-3.exp index abae4db..2d1c8c4 100644 --- a/pengine/test10/rec-node-3.exp +++ b/pengine/test10/rec-node-3.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,20 +23,20 @@ - + - + - + diff --git a/pengine/test10/rec-node-4.dot b/pengine/test10/rec-node-4.dot index 2e37e11..3a21b60 100644 --- a/pengine/test10/rec-node-4.dot +++ b/pengine/test10/rec-node-4.dot @@ -1,27 +1,21 @@ digraph "g" { -"all_stopped" -> "stonith-1_start_0 node2" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ 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="orange" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="orange" ] +"stonith 'reboot' node1" -> "rsc1_start_0 node2" [ style = bold] "stonith 'reboot' node1" -> "rsc1_stop_0 node1" [ style = bold] +"stonith 'reboot' node1" -> "rsc2_start_0 node2" [ style = bold] "stonith 'reboot' node1" -> "rsc2_stop_0 node1" [ style = bold] -"stonith 'reboot' node1" -> "stonith_complete" [ style = bold] +"stonith 'reboot' node1" -> "stonith-1_start_0 node2" [ style = bold] "stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] "stonith-1_monitor_0 node2" -> "stonith-1_start_0 node2" [ style = bold] "stonith-1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "rsc1_start_0 node2" [ style = bold] -"stonith_complete" -> "rsc2_start_0 node2" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/rec-node-4.exp b/pengine/test10/rec-node-4.exp index 61ec54c..e316d8c 100644 --- a/pengine/test10/rec-node-4.exp +++ b/pengine/test10/rec-node-4.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,26 +26,26 @@ - + - + - + - + - + @@ -57,7 +57,7 @@ - + @@ -66,26 +66,26 @@ - + - + - + - + - + @@ -97,7 +97,7 @@ - + @@ -106,36 +106,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/rec-node-4.summary b/pengine/test10/rec-node-4.summary index 30c9667..26fd2d7 100644 --- a/pengine/test10/rec-node-4.summary +++ b/pengine/test10/rec-node-4.summary @@ -18,11 +18,9 @@ Executing cluster transition: * Resource action: rsc1 monitor on node2 * Resource action: rsc2 monitor on node2 * Fencing node1 (reboot) + * Resource action: stonith-1 start on node2 * Pseudo action: rsc1_stop_0 * Pseudo action: rsc2_stop_0 - * Pseudo action: stonith_complete - * Pseudo action: all_stopped - * Resource action: stonith-1 start on node2 * Resource action: rsc1 start on node2 * Resource action: rsc2 start on node2 diff --git a/pengine/test10/rec-node-5.exp b/pengine/test10/rec-node-5.exp index 7099236..abae4db 100644 --- a/pengine/test10/rec-node-5.exp +++ b/pengine/test10/rec-node-5.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,20 +23,20 @@ - + - + - + diff --git a/pengine/test10/rec-node-6.dot b/pengine/test10/rec-node-6.dot index 2e37e11..3a21b60 100644 --- a/pengine/test10/rec-node-6.dot +++ b/pengine/test10/rec-node-6.dot @@ -1,27 +1,21 @@ digraph "g" { -"all_stopped" -> "stonith-1_start_0 node2" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ 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="orange" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="orange" ] +"stonith 'reboot' node1" -> "rsc1_start_0 node2" [ style = bold] "stonith 'reboot' node1" -> "rsc1_stop_0 node1" [ style = bold] +"stonith 'reboot' node1" -> "rsc2_start_0 node2" [ style = bold] "stonith 'reboot' node1" -> "rsc2_stop_0 node1" [ style = bold] -"stonith 'reboot' node1" -> "stonith_complete" [ style = bold] +"stonith 'reboot' node1" -> "stonith-1_start_0 node2" [ style = bold] "stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] "stonith-1_monitor_0 node2" -> "stonith-1_start_0 node2" [ style = bold] "stonith-1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "rsc1_start_0 node2" [ style = bold] -"stonith_complete" -> "rsc2_start_0 node2" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/rec-node-6.exp b/pengine/test10/rec-node-6.exp index 61ec54c..e316d8c 100644 --- a/pengine/test10/rec-node-6.exp +++ b/pengine/test10/rec-node-6.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,26 +26,26 @@ - + - + - + - + - + @@ -57,7 +57,7 @@ - + @@ -66,26 +66,26 @@ - + - + - + - + - + @@ -97,7 +97,7 @@ - + @@ -106,36 +106,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/rec-node-6.summary b/pengine/test10/rec-node-6.summary index 9a45360..9ad5e48 100644 --- a/pengine/test10/rec-node-6.summary +++ b/pengine/test10/rec-node-6.summary @@ -18,11 +18,9 @@ Executing cluster transition: * Resource action: rsc1 monitor on node2 * Resource action: rsc2 monitor on node2 * Fencing node1 (reboot) + * Resource action: stonith-1 start on node2 * Pseudo action: rsc1_stop_0 * Pseudo action: rsc2_stop_0 - * Pseudo action: stonith_complete - * Pseudo action: all_stopped - * Resource action: stonith-1 start on node2 * Resource action: rsc1 start on node2 * Resource action: rsc2 start on node2 diff --git a/pengine/test10/rec-node-7.dot b/pengine/test10/rec-node-7.dot index 2e37e11..3a21b60 100644 --- a/pengine/test10/rec-node-7.dot +++ b/pengine/test10/rec-node-7.dot @@ -1,27 +1,21 @@ digraph "g" { -"all_stopped" -> "stonith-1_start_0 node2" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ 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="orange" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = bold] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="orange" ] +"stonith 'reboot' node1" -> "rsc1_start_0 node2" [ style = bold] "stonith 'reboot' node1" -> "rsc1_stop_0 node1" [ style = bold] +"stonith 'reboot' node1" -> "rsc2_start_0 node2" [ style = bold] "stonith 'reboot' node1" -> "rsc2_stop_0 node1" [ style = bold] -"stonith 'reboot' node1" -> "stonith_complete" [ style = bold] +"stonith 'reboot' node1" -> "stonith-1_start_0 node2" [ style = bold] "stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] "stonith-1_monitor_0 node2" -> "stonith-1_start_0 node2" [ style = bold] "stonith-1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "rsc1_start_0 node2" [ style = bold] -"stonith_complete" -> "rsc2_start_0 node2" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/rec-node-7.exp b/pengine/test10/rec-node-7.exp index 61ec54c..e316d8c 100644 --- a/pengine/test10/rec-node-7.exp +++ b/pengine/test10/rec-node-7.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,26 +26,26 @@ - + - + - + - + - + @@ -57,7 +57,7 @@ - + @@ -66,26 +66,26 @@ - + - + - + - + - + @@ -97,7 +97,7 @@ - + @@ -106,36 +106,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/rec-node-7.summary b/pengine/test10/rec-node-7.summary index 30c9667..26fd2d7 100644 --- a/pengine/test10/rec-node-7.summary +++ b/pengine/test10/rec-node-7.summary @@ -18,11 +18,9 @@ Executing cluster transition: * Resource action: rsc1 monitor on node2 * Resource action: rsc2 monitor on node2 * Fencing node1 (reboot) + * Resource action: stonith-1 start on node2 * Pseudo action: rsc1_stop_0 * Pseudo action: rsc2_stop_0 - * Pseudo action: stonith_complete - * Pseudo action: all_stopped - * Resource action: stonith-1 start on node2 * Resource action: rsc1 start on node2 * Resource action: rsc2 start on node2 diff --git a/pengine/test10/rec-node-8.dot b/pengine/test10/rec-node-8.dot index f5c426a..758117c 100644 --- a/pengine/test10/rec-node-8.dot +++ b/pengine/test10/rec-node-8.dot @@ -1,15 +1,12 @@ digraph "g" { -"all_stopped" [ style=dashed color="red" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ style = dashed] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" [ style=dashed color="red" fontcolor="black" ] -"rsc1_stop_0 node1" -> "all_stopped" [ style = dashed] "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = dashed] "rsc1_stop_0 node1" [ style=dashed color="red" fontcolor="black" ] "rsc2_monitor_0 node2" -> "rsc2_start_0 node2" [ style = dashed] "rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=dashed color="red" fontcolor="black" ] -"rsc2_stop_0 node1" -> "all_stopped" [ style = dashed] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = dashed] "rsc2_stop_0 node1" [ style=dashed color="red" fontcolor="black" ] "rsc3_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/rec-node-8.exp b/pengine/test10/rec-node-8.exp index 334e62a..78a972c 100644 --- a/pengine/test10/rec-node-8.exp +++ b/pengine/test10/rec-node-8.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/pengine/test10/rec-node-9.exp b/pengine/test10/rec-node-9.exp index 24f965b..44bc38a 100644 --- a/pengine/test10/rec-node-9.exp +++ b/pengine/test10/rec-node-9.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/pengine/test10/rec-rsc-0.dot b/pengine/test10/rec-rsc-0.dot index 2d4deb4..3b4befd 100644 --- a/pengine/test10/rec-rsc-0.dot +++ b/pengine/test10/rec-rsc-0.dot @@ -1,7 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/rec-rsc-0.exp b/pengine/test10/rec-rsc-0.exp index 23f4fee..240412b 100644 --- a/pengine/test10/rec-rsc-0.exp +++ b/pengine/test10/rec-rsc-0.exp @@ -17,20 +17,4 @@ - - - - - - - - - - - - - - - - diff --git a/pengine/test10/rec-rsc-0.summary b/pengine/test10/rec-rsc-0.summary index b3d4686..0cc0f25 100644 --- a/pengine/test10/rec-rsc-0.summary +++ b/pengine/test10/rec-rsc-0.summary @@ -11,7 +11,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on node2 * Resource action: rsc1 stop on node1 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/rec-rsc-1.dot b/pengine/test10/rec-rsc-1.dot index f3755dc..b9bdde0 100644 --- a/pengine/test10/rec-rsc-1.dot +++ b/pengine/test10/rec-rsc-1.dot @@ -1,9 +1,7 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" -> "rsc1_start_0 node2" [ 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 32a3da6..9fb973e 100644 --- a/pengine/test10/rec-rsc-1.exp +++ b/pengine/test10/rec-rsc-1.exp @@ -1,7 +1,7 @@ - + @@ -11,13 +11,13 @@ - + - + @@ -33,17 +33,4 @@ - - - - - - - - - - - - - diff --git a/pengine/test10/rec-rsc-1.summary b/pengine/test10/rec-rsc-1.summary index c8f27d6..e35466e 100644 --- a/pengine/test10/rec-rsc-1.summary +++ b/pengine/test10/rec-rsc-1.summary @@ -10,7 +10,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 monitor on node2 * Resource action: rsc1 stop on node1 - * Pseudo action: all_stopped * Resource action: rsc1 start on node2 Revised cluster status: diff --git a/pengine/test10/rec-rsc-2.dot b/pengine/test10/rec-rsc-2.dot index 88b09df..77fb339 100644 --- a/pengine/test10/rec-rsc-2.dot +++ b/pengine/test10/rec-rsc-2.dot @@ -1,11 +1,9 @@ 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" [ 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 1d5bad7..0e0afbf 100644 --- a/pengine/test10/rec-rsc-2.exp +++ b/pengine/test10/rec-rsc-2.exp @@ -1,7 +1,7 @@ - + @@ -11,13 +11,13 @@ - + - + @@ -46,17 +46,4 @@ - - - - - - - - - - - - - diff --git a/pengine/test10/rec-rsc-2.summary b/pengine/test10/rec-rsc-2.summary index 8dd3a5a..139384a 100644 --- a/pengine/test10/rec-rsc-2.summary +++ b/pengine/test10/rec-rsc-2.summary @@ -11,7 +11,6 @@ Executing cluster transition: * Resource action: rsc1 monitor on node2 * Resource action: rsc1 stop on node1 * Resource action: rsc1 cancel=1 on node1 - * Pseudo action: all_stopped * Resource action: rsc1 start on node1 Revised cluster status: diff --git a/pengine/test10/rec-rsc-3.exp b/pengine/test10/rec-rsc-3.exp index 5eff1fc..9908af9 100644 --- a/pengine/test10/rec-rsc-3.exp +++ b/pengine/test10/rec-rsc-3.exp @@ -1,20 +1,20 @@ - + - + - + diff --git a/pengine/test10/rec-rsc-5.dot b/pengine/test10/rec-rsc-5.dot index d5fc8bf..2d86f4c 100644 --- a/pengine/test10/rec-rsc-5.dot +++ b/pengine/test10/rec-rsc-5.dot @@ -1,27 +1,21 @@ 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" [ 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" [ 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_start_0 node1" [ style = bold] "stonith 'reboot' node2" -> "rsc1_stop_0 node2" [ style = bold] +"stonith 'reboot' node2" -> "rsc2_start_0 node1" [ style = bold] "stonith 'reboot' node2" -> "rsc2_stop_0 node2" [ style = bold] -"stonith 'reboot' node2" -> "stonith_complete" [ style = bold] +"stonith 'reboot' node2" -> "stonith-1_start_0 node1" [ 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 792b328..ff54720 100644 --- a/pengine/test10/rec-rsc-5.exp +++ b/pengine/test10/rec-rsc-5.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,26 +26,26 @@ - + - + - + - + - + @@ -57,7 +57,7 @@ - + @@ -66,26 +66,26 @@ - + - + - + - + - + @@ -97,7 +97,7 @@ - + @@ -106,36 +106,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/rec-rsc-5.summary b/pengine/test10/rec-rsc-5.summary index 4717750..e0ecec3 100644 --- a/pengine/test10/rec-rsc-5.summary +++ b/pengine/test10/rec-rsc-5.summary @@ -18,11 +18,9 @@ Executing cluster transition: * Resource action: rsc1 monitor on node1 * Resource action: rsc2 monitor on node1 * Fencing node2 (reboot) + * Resource action: stonith-1 start on node1 * Pseudo action: rsc1_stop_0 * Pseudo action: rsc2_stop_0 - * Pseudo action: stonith_complete - * Pseudo action: all_stopped - * Resource action: stonith-1 start on node1 * Resource action: rsc1 start on node1 * Resource action: rsc2 start on node1 diff --git a/pengine/test10/rec-rsc-6.dot b/pengine/test10/rec-rsc-6.dot index 747d7d2..06c7c0b 100644 --- a/pengine/test10/rec-rsc-6.dot +++ b/pengine/test10/rec-rsc-6.dot @@ -1,10 +1,7 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"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" ] -"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="black" ] } diff --git a/pengine/test10/rec-rsc-6.exp b/pengine/test10/rec-rsc-6.exp index 6648e00..6299f79 100644 --- a/pengine/test10/rec-rsc-6.exp +++ b/pengine/test10/rec-rsc-6.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,27 +26,11 @@ - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/rec-rsc-6.summary b/pengine/test10/rec-rsc-6.summary index 40222fc..ebc8cfa 100644 --- a/pengine/test10/rec-rsc-6.summary +++ b/pengine/test10/rec-rsc-6.summary @@ -10,7 +10,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on node2 * Resource action: rsc1 stop on node1 - * Pseudo action: all_stopped * Resource action: rsc1 start on node1 Revised cluster status: diff --git a/pengine/test10/rec-rsc-7.dot b/pengine/test10/rec-rsc-7.dot index 2d4deb4..3b4befd 100644 --- a/pengine/test10/rec-rsc-7.dot +++ b/pengine/test10/rec-rsc-7.dot @@ -1,7 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/rec-rsc-7.exp b/pengine/test10/rec-rsc-7.exp index 721d346..240412b 100644 --- a/pengine/test10/rec-rsc-7.exp +++ b/pengine/test10/rec-rsc-7.exp @@ -1,7 +1,7 @@ - + @@ -10,27 +10,11 @@ - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/rec-rsc-7.summary b/pengine/test10/rec-rsc-7.summary index 5238323..2a96a43 100644 --- a/pengine/test10/rec-rsc-7.summary +++ b/pengine/test10/rec-rsc-7.summary @@ -11,7 +11,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on node2 * Resource action: rsc1 stop on node1 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/rec-rsc-9.dot b/pengine/test10/rec-rsc-9.dot index e94de87..de540dd 100644 --- a/pengine/test10/rec-rsc-9.dot +++ b/pengine/test10/rec-rsc-9.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "bar_running_0" -> "foo_start_0" [ style = bold] "bar_running_0" -> "rsc1_start_0 node1" [ style = bold] "bar_running_0" [ style=bold color="green" fontcolor="orange" ] @@ -22,19 +21,16 @@ "foo_stopped_0" -> "foo_start_0" [ style = bold] "foo_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "bar_stop_0" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_start_0 node1" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node1" -> "foo_running_0" [ style = bold] "rsc2_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "foo_stopped_0" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3_start_0 node1" -> "bar_running_0" [ style = bold] "rsc3_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc3_stop_0 node1" -> "all_stopped" [ style = bold] "rsc3_stop_0 node1" -> "bar_stopped_0" [ style = bold] "rsc3_stop_0 node1" -> "rsc3_start_0 node1" [ style = bold] "rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/rec-rsc-9.exp b/pengine/test10/rec-rsc-9.exp index 805a981..24047c2 100644 --- a/pengine/test10/rec-rsc-9.exp +++ b/pengine/test10/rec-rsc-9.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,22 +26,22 @@ - + - + - + - + @@ -49,66 +49,66 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -117,55 +117,55 @@ - + - + - + - + - + - + - + - + - + - + @@ -175,7 +175,7 @@ - + @@ -188,25 +188,7 @@ - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/rec-rsc-9.summary b/pengine/test10/rec-rsc-9.summary index f7beb14..25271c1 100644 --- a/pengine/test10/rec-rsc-9.summary +++ b/pengine/test10/rec-rsc-9.summary @@ -20,7 +20,6 @@ Executing cluster transition: * Pseudo action: foo_stopped_0 * Pseudo action: bar_stop_0 * Resource action: rsc3 stop on node1 - * Pseudo action: all_stopped * Pseudo action: bar_stopped_0 * Pseudo action: bar_start_0 * Resource action: rsc3 start on node1 diff --git a/pengine/test10/reload-becomes-restart.dot b/pengine/test10/reload-becomes-restart.dot index f956d7e..ed3720a 100644 --- a/pengine/test10/reload-becomes-restart.dot +++ b/pengine/test10/reload-becomes-restart.dot @@ -6,7 +6,6 @@ digraph "g" { "Fencing_monitor_120000 node1" [ style=bold color="green" fontcolor="black"] "Fencing_start_0 node1" -> "Fencing_monitor_120000 node1" [ style = bold] "Fencing_start_0 node1" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "cl-rsc1_running_0" -> "cl-rsc2_start_0" [ style = bold] "cl-rsc1_running_0" [ style=bold color="green" fontcolor="orange"] "cl-rsc1_start_0" -> "cl-rsc1_running_0" [ style = bold] @@ -47,7 +46,6 @@ digraph "g" { "rsc2_start_0 node1" -> "cl-rsc2_running_0" [ style = bold] "rsc2_start_0 node1" -> "rsc2_monitor_200000 node1" [ style = bold] "rsc2_start_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "cl-rsc2_stopped_0" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/reload-becomes-restart.exp b/pengine/test10/reload-becomes-restart.exp index 6019c76..63ebff0 100644 --- a/pengine/test10/reload-becomes-restart.exp +++ b/pengine/test10/reload-becomes-restart.exp @@ -1,36 +1,36 @@ - + - + - + - + - + - + @@ -39,7 +39,7 @@ - + @@ -48,33 +48,33 @@ - + - + - + - + - + @@ -83,33 +83,33 @@ - + - + - + - + - + @@ -118,66 +118,66 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -190,42 +190,42 @@ - + - + - + - + - + - + - + @@ -234,22 +234,22 @@ - + - + - + - + @@ -257,49 +257,37 @@ - + - + - + - + - + - + - + - - - - - - - - - - - - - + diff --git a/pengine/test10/reload-becomes-restart.summary b/pengine/test10/reload-becomes-restart.summary index 5a1192a..0d0d5fb 100644 --- a/pengine/test10/reload-becomes-restart.summary +++ b/pengine/test10/reload-becomes-restart.summary @@ -32,7 +32,6 @@ Executing cluster transition: * Resource action: rsc2 stop on node1 * Pseudo action: cl-rsc2_stopped_0 * Pseudo action: cl-rsc2_start_0 - * Pseudo action: all_stopped * Resource action: Fencing monitor=120000 on node1 * Resource action: rsc1:0 monitor=120000 on node2 * Resource action: rsc1:1 monitor=120000 on node1 diff --git a/pengine/test10/remote-connection-unrecoverable.dot b/pengine/test10/remote-connection-unrecoverable.dot index 421c6d7..4cc243b 100644 --- a/pengine/test10/remote-connection-unrecoverable.dot +++ b/pengine/test10/remote-connection-unrecoverable.dot @@ -1,13 +1,9 @@ digraph "g" { -"all_stopped" -> "killer_start_0 node2" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "killer_monitor_60000 node2" [ style=bold color="green" fontcolor="black"] "killer_start_0 node2" -> "killer_monitor_60000 node2" [ style = bold] "killer_start_0 node2" [ style=bold color="green" fontcolor="black"] -"killer_stop_0 node2" -> "all_stopped" [ style = bold] "killer_stop_0 node2" -> "killer_start_0 node2" [ style = bold] "killer_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"remote1_stop_0 node1" -> "all_stopped" [ style = bold] "remote1_stop_0 node1" [ style=bold color="green" fontcolor="orange"] "rsc1_delete_0 remote1" -> "rsc1_start_0 node2" [ style = dashed] "rsc1_delete_0 remote1" [ style=dashed color="red" fontcolor="black"] @@ -16,7 +12,6 @@ digraph "g" { "rsc1_monitor_10000 node2" [ style=bold color="green" fontcolor="black"] "rsc1_start_0 node2" -> "rsc1_monitor_10000 node2" [ style = bold] "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc1_stop_0 remote1" -> "all_stopped" [ style = bold] "rsc1_stop_0 remote1" -> "remote1_stop_0 node1" [ style = bold] "rsc1_stop_0 remote1" -> "rsc1_delete_0 remote1" [ style = dashed] "rsc1_stop_0 remote1" -> "rsc1_start_0 node2" [ style = bold] @@ -34,19 +29,17 @@ digraph "g" { "rsc2_demote_0 node1" -> "rsc2-master_demoted_0" [ style = bold] "rsc2_demote_0 node1" -> "rsc2_stop_0 node1" [ style = bold] "rsc2_demote_0 node1" [ style=bold color="green" fontcolor="orange"] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "rsc2-master_stopped_0" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="orange"] "stonith 'reboot' node1" -> "remote1_stop_0 node1" [ style = bold] +"stonith 'reboot' node1" -> "rsc1_start_0 node2" [ style = bold] "stonith 'reboot' node1" -> "rsc2-master_stop_0" [ style = bold] "stonith 'reboot' node1" -> "rsc2_demote_0 node1" [ style = bold] "stonith 'reboot' node1" -> "rsc2_stop_0 node1" [ style = bold] "stonith 'reboot' node1" -> "stonith 'reboot' remote1" [ style = bold] "stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' remote1" -> "killer_start_0 node2" [ style = bold] +"stonith 'reboot' remote1" -> "rsc1_start_0 node2" [ style = bold] "stonith 'reboot' remote1" -> "rsc1_stop_0 remote1" [ style = bold] -"stonith 'reboot' remote1" -> "stonith_complete" [ style = bold] "stonith 'reboot' remote1" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "rsc1_start_0 node2" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/remote-connection-unrecoverable.exp b/pengine/test10/remote-connection-unrecoverable.exp index a715eae..59132fd 100644 --- a/pengine/test10/remote-connection-unrecoverable.exp +++ b/pengine/test10/remote-connection-unrecoverable.exp @@ -1,7 +1,7 @@ - + @@ -10,13 +10,13 @@ - + - + @@ -25,17 +25,17 @@ - + - + - + @@ -48,45 +48,48 @@ - + - + - + - + - + + + + - + - + - + @@ -95,19 +98,19 @@ - + - + - + @@ -116,16 +119,16 @@ - + - + - + @@ -134,55 +137,55 @@ - + - + - + - + - + - + - + - + - + - + @@ -191,13 +194,13 @@ - + - + @@ -212,42 +215,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/remote-connection-unrecoverable.summary b/pengine/test10/remote-connection-unrecoverable.summary index 528c7b4..efeb765 100644 --- a/pengine/test10/remote-connection-unrecoverable.summary +++ b/pengine/test10/remote-connection-unrecoverable.summary @@ -25,7 +25,8 @@ Executing cluster transition: * Resource action: rsc1 monitor on node2 * Fencing node1 (reboot) * Fencing remote1 (reboot) - * Pseudo action: stonith_complete + * Resource action: killer start on node2 + * Resource action: killer monitor=60000 on node2 * Pseudo action: rsc1_stop_0 * Pseudo action: rsc2-master_demote_0 * Pseudo action: remote1_stop_0 @@ -36,9 +37,6 @@ Executing cluster transition: * Resource action: rsc1 monitor=10000 on node2 * Pseudo action: rsc2_stop_0 * Pseudo action: rsc2-master_stopped_0 - * Pseudo action: all_stopped - * Resource action: killer start on node2 - * Resource action: killer monitor=60000 on node2 Revised cluster status: Online: [ node2 ] diff --git a/pengine/test10/remote-disable.dot b/pengine/test10/remote-disable.dot index fbcea60..5d21b60 100644 --- a/pengine/test10/remote-disable.dot +++ b/pengine/test10/remote-disable.dot @@ -1,8 +1,5 @@ digraph "g" { -"FAKE2_stop_0 remote1" -> "all_stopped" [ style = bold] "FAKE2_stop_0 remote1" -> "remote1_stop_0 18builder" [ style = bold] "FAKE2_stop_0 remote1" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] -"remote1_stop_0 18builder" -> "all_stopped" [ style = bold] "remote1_stop_0 18builder" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/remote-disable.exp b/pengine/test10/remote-disable.exp index 817c5ba..6090002 100644 --- a/pengine/test10/remote-disable.exp +++ b/pengine/test10/remote-disable.exp @@ -1,7 +1,7 @@ - + @@ -11,32 +11,17 @@ - + - + - - - - - - - - - - - - - - - diff --git a/pengine/test10/remote-disable.summary b/pengine/test10/remote-disable.summary index f5de71f..c594e1a 100644 --- a/pengine/test10/remote-disable.summary +++ b/pengine/test10/remote-disable.summary @@ -18,7 +18,6 @@ Transition Summary: Executing cluster transition: * Resource action: FAKE2 stop on remote1 * Resource action: remote1 stop on 18builder - * Pseudo action: all_stopped Revised cluster status: Online: [ 18builder 18node1 18node2 ] diff --git a/pengine/test10/remote-fence-before-reconnect.dot b/pengine/test10/remote-fence-before-reconnect.dot index ef2b047..4ced43e 100644 --- a/pengine/test10/remote-fence-before-reconnect.dot +++ b/pengine/test10/remote-fence-before-reconnect.dot @@ -1,18 +1,12 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] -"c7auto4_stop_0 c7auto1" -> "all_stopped" [ style = bold] "c7auto4_stop_0 c7auto1" [ style=bold color="green" fontcolor="black"] "fake2_monitor_10000 c7auto1" [ style=bold color="green" fontcolor="black"] "fake2_start_0 c7auto1" -> "fake2_monitor_10000 c7auto1" [ style = bold] "fake2_start_0 c7auto1" [ style=bold color="green" fontcolor="black"] -"fake2_stop_0 c7auto4" -> "all_stopped" [ style = bold] "fake2_stop_0 c7auto4" -> "c7auto4_stop_0 c7auto1" [ style = bold] "fake2_stop_0 c7auto4" -> "fake2_start_0 c7auto1" [ style = bold] "fake2_stop_0 c7auto4" [ style=bold color="green" fontcolor="orange"] +"stonith 'reboot' c7auto4" -> "fake2_start_0 c7auto1" [ style = bold] "stonith 'reboot' c7auto4" -> "fake2_stop_0 c7auto4" [ style = bold] -"stonith 'reboot' c7auto4" -> "stonith_complete" [ style = bold] "stonith 'reboot' c7auto4" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "fake2_start_0 c7auto1" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/remote-fence-before-reconnect.exp b/pengine/test10/remote-fence-before-reconnect.exp index 736f64f..f99d9ef 100644 --- a/pengine/test10/remote-fence-before-reconnect.exp +++ b/pengine/test10/remote-fence-before-reconnect.exp @@ -11,42 +11,42 @@ - + - + - + - + - + - + - + @@ -58,36 +58,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/remote-fence-before-reconnect.summary b/pengine/test10/remote-fence-before-reconnect.summary index 0761572..f61e18b 100644 --- a/pengine/test10/remote-fence-before-reconnect.summary +++ b/pengine/test10/remote-fence-before-reconnect.summary @@ -19,10 +19,8 @@ Transition Summary: Executing cluster transition: * Fencing c7auto4 (reboot) * Pseudo action: fake2_stop_0 - * Pseudo action: stonith_complete * Resource action: c7auto4 stop on c7auto1 * Resource action: fake2 start on c7auto1 - * Pseudo action: all_stopped * Resource action: fake2 monitor=10000 on c7auto1 Revised cluster status: diff --git a/pengine/test10/remote-fence-unclean-3.dot b/pengine/test10/remote-fence-unclean-3.dot index 7ae8941..b2c892e 100644 --- a/pengine/test10/remote-fence-unclean-3.dot +++ b/pengine/test10/remote-fence-unclean-3.dot @@ -1,6 +1,4 @@ digraph "g" { -"all_stopped" -> "fence1_start_0 overcloud-controller-0" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "fence1_monitor_0 overcloud-controller-0" -> "fence1_start_0 overcloud-controller-0" [ style = bold] "fence1_monitor_0 overcloud-controller-0" [ style=bold color="green" fontcolor="black"] "fence1_monitor_0 overcloud-controller-1" -> "fence1_start_0 overcloud-controller-0" [ style = bold] @@ -16,7 +14,6 @@ digraph "g" { "galera-bundle-1_monitor_0 overcloud-controller-2" [ style=bold color="green" fontcolor="black"] "galera-bundle-2_monitor_0 overcloud-controller-0" [ style=bold color="green" fontcolor="black"] "galera-bundle-2_monitor_0 overcloud-controller-1" [ style=bold color="green" fontcolor="black"] -"overcloud-novacompute-0_stop_0 overcloud-controller-0" -> "all_stopped" [ style = bold] "overcloud-novacompute-0_stop_0 overcloud-controller-0" [ style=bold color="green" fontcolor="black"] "rabbitmq-bundle-0_monitor_0 overcloud-controller-1" [ style=bold color="green" fontcolor="black"] "rabbitmq-bundle-0_monitor_0 overcloud-controller-2" [ style=bold color="green" fontcolor="black"] @@ -30,8 +27,6 @@ digraph "g" { "redis-bundle-1_monitor_0 overcloud-controller-2" [ style=bold color="green" fontcolor="black"] "redis-bundle-2_monitor_0 overcloud-controller-0" [ style=bold color="green" fontcolor="black"] "redis-bundle-2_monitor_0 overcloud-controller-1" [ style=bold color="green" fontcolor="black"] -"stonith 'reboot' overcloud-novacompute-0" -> "stonith_complete" [ style = bold] +"stonith 'reboot' overcloud-novacompute-0" -> "fence1_start_0 overcloud-controller-0" [ style = bold] "stonith 'reboot' overcloud-novacompute-0" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/remote-fence-unclean-3.exp b/pengine/test10/remote-fence-unclean-3.exp index 070ba86..02a1900 100644 --- a/pengine/test10/remote-fence-unclean-3.exp +++ b/pengine/test10/remote-fence-unclean-3.exp @@ -1,42 +1,42 @@ - + - + - + - + - + - + - + - + @@ -45,7 +45,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -102,7 +102,7 @@ - + @@ -111,7 +111,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -147,7 +147,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -165,7 +165,7 @@ - + @@ -174,7 +174,7 @@ - + @@ -183,7 +183,7 @@ - + @@ -192,7 +192,7 @@ - + @@ -201,7 +201,7 @@ - + @@ -210,7 +210,7 @@ - + @@ -219,7 +219,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -237,19 +237,7 @@ - - - - - - - - - - - - - + @@ -258,19 +246,4 @@ - - - - - - - - - - - - - - - diff --git a/pengine/test10/remote-fence-unclean-3.summary b/pengine/test10/remote-fence-unclean-3.summary index 5abed37..9e29a0c 100644 --- a/pengine/test10/remote-fence-unclean-3.summary +++ b/pengine/test10/remote-fence-unclean-3.summary @@ -62,8 +62,6 @@ Executing cluster transition: * Resource action: redis-bundle-2 monitor on overcloud-controller-1 * Resource action: redis-bundle-2 monitor on overcloud-controller-0 * Fencing overcloud-novacompute-0 (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped * Resource action: fence1 start on overcloud-controller-0 * Resource action: fence1 monitor=60000 on overcloud-controller-0 diff --git a/pengine/test10/remote-fence-unclean.dot b/pengine/test10/remote-fence-unclean.dot index 76a676d..24958bf 100644 --- a/pengine/test10/remote-fence-unclean.dot +++ b/pengine/test10/remote-fence-unclean.dot @@ -3,35 +3,27 @@ "FAKE2_start_0 18builder" -> "FAKE2_monitor_60000 18builder" [ style = bold] "FAKE2_start_0 18builder" [ style=bold color="green" fontcolor="black"] "FAKE2_stop_0 remote1" -> "FAKE2_start_0 18builder" [ style = bold] -"FAKE2_stop_0 remote1" -> "all_stopped" [ style = bold] "FAKE2_stop_0 remote1" -> "remote1_stop_0 18node1" [ style = bold] "FAKE2_stop_0 remote1" [ style=bold color="green" fontcolor="orange"] "FAKE3_monitor_60000 18node1" [ style=bold color="green" fontcolor="black"] "FAKE3_start_0 18node1" -> "FAKE3_monitor_60000 18node1" [ style = bold] "FAKE3_start_0 18node1" [ style=bold color="green" fontcolor="black"] "FAKE3_stop_0 18builder" -> "FAKE3_start_0 18node1" [ style = bold] -"FAKE3_stop_0 18builder" -> "all_stopped" [ style = bold] "FAKE3_stop_0 18builder" [ style=bold color="green" fontcolor="black"] "FAKE4_monitor_60000 18node2" [ style=bold color="green" fontcolor="black"] "FAKE4_start_0 18node2" -> "FAKE4_monitor_60000 18node2" [ style = bold] "FAKE4_start_0 18node2" [ style=bold color="green" fontcolor="black"] "FAKE4_stop_0 18node1" -> "FAKE4_start_0 18node2" [ style = bold] -"FAKE4_stop_0 18node1" -> "all_stopped" [ style = bold] "FAKE4_stop_0 18node1" [ style=bold color="green" fontcolor="black"] -"all_stopped" -> "remote1_start_0 18node1" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "remote1_monitor_60000 18node1" [ style=bold color="green" fontcolor="black"] "remote1_start_0 18node1" -> "remote1_monitor_60000 18node1" [ style = bold] "remote1_start_0 18node1" [ style=bold color="green" fontcolor="black"] -"remote1_stop_0 18node1" -> "all_stopped" [ style = bold] "remote1_stop_0 18node1" -> "remote1_start_0 18node1" [ style = bold] "remote1_stop_0 18node1" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' remote1" -> "FAKE2_start_0 18builder" [ style = bold] "stonith 'reboot' remote1" -> "FAKE2_stop_0 remote1" [ style = bold] -"stonith 'reboot' remote1" -> "stonith_complete" [ style = bold] +"stonith 'reboot' remote1" -> "FAKE3_start_0 18node1" [ style = bold] +"stonith 'reboot' remote1" -> "FAKE4_start_0 18node2" [ style = bold] +"stonith 'reboot' remote1" -> "remote1_start_0 18node1" [ style = bold] "stonith 'reboot' remote1" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "FAKE2_start_0 18builder" [ style = bold] -"stonith_complete" -> "FAKE3_start_0 18node1" [ style = bold] -"stonith_complete" -> "FAKE4_start_0 18node2" [ style = bold] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/remote-fence-unclean.exp b/pengine/test10/remote-fence-unclean.exp index f77d7f6..35bd590 100644 --- a/pengine/test10/remote-fence-unclean.exp +++ b/pengine/test10/remote-fence-unclean.exp @@ -1,17 +1,17 @@ - + - + - + @@ -27,7 +27,7 @@ - + @@ -40,42 +40,42 @@ - + - + - + - + - + - + - + @@ -87,36 +87,36 @@ - + - + - + - + - + - + @@ -125,36 +125,36 @@ - + - + - + - + - + - + @@ -163,42 +163,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/remote-fence-unclean.summary b/pengine/test10/remote-fence-unclean.summary index adfe730..e0aa8cf 100644 --- a/pengine/test10/remote-fence-unclean.summary +++ b/pengine/test10/remote-fence-unclean.summary @@ -22,17 +22,15 @@ Executing cluster transition: * Resource action: FAKE4 stop on 18node1 * Fencing remote1 (reboot) * Pseudo action: FAKE2_stop_0 - * Pseudo action: stonith_complete - * Resource action: remote1 stop on 18node1 - * Resource action: FAKE2 start on 18builder * Resource action: FAKE3 start on 18node1 * Resource action: FAKE4 start on 18node2 - * Pseudo action: all_stopped + * Resource action: remote1 stop on 18node1 + * Resource action: FAKE2 start on 18builder + * Resource action: FAKE3 monitor=60000 on 18node1 + * Resource action: FAKE4 monitor=60000 on 18node2 * Resource action: remote1 start on 18node1 * Resource action: remote1 monitor=60000 on 18node1 * Resource action: FAKE2 monitor=60000 on 18builder - * Resource action: FAKE3 monitor=60000 on 18node1 - * Resource action: FAKE4 monitor=60000 on 18node2 Revised cluster status: Online: [ 18builder 18node1 18node2 ] diff --git a/pengine/test10/remote-fence-unclean2.dot b/pengine/test10/remote-fence-unclean2.dot index 6cff564..08b2db8 100644 --- a/pengine/test10/remote-fence-unclean2.dot +++ b/pengine/test10/remote-fence-unclean2.dot @@ -1,10 +1,5 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] -"fake_stop_0 rhel7-alt4" -> "all_stopped" [ style = bold] "fake_stop_0 rhel7-alt4" [ style=bold color="green" fontcolor="orange"] "stonith 'reboot' rhel7-alt4" -> "fake_stop_0 rhel7-alt4" [ style = bold] -"stonith 'reboot' rhel7-alt4" -> "stonith_complete" [ style = bold] "stonith 'reboot' rhel7-alt4" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/remote-fence-unclean2.exp b/pengine/test10/remote-fence-unclean2.exp index c9c45ae..2f55ad8 100644 --- a/pengine/test10/remote-fence-unclean2.exp +++ b/pengine/test10/remote-fence-unclean2.exp @@ -1,7 +1,7 @@ - + @@ -13,33 +13,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/remote-fence-unclean2.summary b/pengine/test10/remote-fence-unclean2.summary index 2538823..98d48b8 100644 --- a/pengine/test10/remote-fence-unclean2.summary +++ b/pengine/test10/remote-fence-unclean2.summary @@ -16,8 +16,6 @@ Transition Summary: Executing cluster transition: * Fencing rhel7-alt4 (reboot) * Pseudo action: fake_stop_0 - * Pseudo action: stonith_complete - * Pseudo action: all_stopped Revised cluster status: Node rhel7-alt1 (1): standby diff --git a/pengine/test10/remote-move.dot b/pengine/test10/remote-move.dot index e5d62e7..c51806b 100644 --- a/pengine/test10/remote-move.dot +++ b/pengine/test10/remote-move.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "remote1_migrate_from_0 18node1" -> "remote1_start_0 18node1" [ style = bold] "remote1_migrate_from_0 18node1" -> "remote1_stop_0 18builder" [ style = bold] "remote1_migrate_from_0 18node1" [ style=bold color="green" fontcolor="black"] @@ -8,13 +7,11 @@ "remote1_monitor_60000 18node1" [ style=bold color="green" fontcolor="black"] "remote1_start_0 18node1" -> "remote1_monitor_60000 18node1" [ style = bold] "remote1_start_0 18node1" [ style=bold color="green" fontcolor="orange"] -"remote1_stop_0 18builder" -> "all_stopped" [ style = bold] "remote1_stop_0 18builder" -> "remote1_start_0 18node1" [ style = bold] "remote1_stop_0 18builder" [ style=bold color="green" fontcolor="black"] "shooter_monitor_60000 18builder" [ style=bold color="green" fontcolor="black"] "shooter_start_0 18builder" -> "shooter_monitor_60000 18builder" [ style = bold] "shooter_start_0 18builder" [ style=bold color="green" fontcolor="black"] -"shooter_stop_0 18node1" -> "all_stopped" [ style = bold] "shooter_stop_0 18node1" -> "shooter_start_0 18builder" [ style = bold] "shooter_stop_0 18node1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/remote-move.exp b/pengine/test10/remote-move.exp index ca12109..c48eba8 100644 --- a/pengine/test10/remote-move.exp +++ b/pengine/test10/remote-move.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,20 +36,20 @@ - + - + - + @@ -58,57 +58,42 @@ - + - + - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/remote-move.summary b/pengine/test10/remote-move.summary index d876a3f..dcff7bf 100644 --- a/pengine/test10/remote-move.summary +++ b/pengine/test10/remote-move.summary @@ -20,7 +20,6 @@ Executing cluster transition: * Resource action: shooter start on 18builder * Resource action: remote1 migrate_from on 18node1 * Resource action: remote1 stop on 18builder - * Pseudo action: all_stopped * Resource action: shooter monitor=60000 on 18builder * Pseudo action: remote1_start_0 * Resource action: remote1 monitor=60000 on 18node1 diff --git a/pengine/test10/remote-orphaned.dot b/pengine/test10/remote-orphaned.dot index aa2dc40..8e35e1d 100644 --- a/pengine/test10/remote-orphaned.dot +++ b/pengine/test10/remote-orphaned.dot @@ -3,21 +3,17 @@ "Connectivity_stop_0" -> "ping-1_stop_0 remote1" [ style = bold] "Connectivity_stop_0" [ style=bold color="green" fontcolor="orange"] "Connectivity_stopped_0" [ style=bold color="green" fontcolor="orange"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "ping-1_stop_0 remote1" -> "Connectivity_stopped_0" [ style = bold] -"ping-1_stop_0 remote1" -> "all_stopped" [ style = bold] "ping-1_stop_0 remote1" -> "remote1_stop_0 18node1" [ style = bold] "ping-1_stop_0 remote1" [ style=bold color="green" fontcolor="black"] "remote1_delete_0 18node1" [ style=bold color="green" fontcolor="black"] "remote1_delete_0 18node3" [ style=bold color="green" fontcolor="black"] -"remote1_stop_0 18node1" -> "all_stopped" [ style = bold] "remote1_stop_0 18node1" -> "remote1_delete_0 18node1" [ style = bold] "remote1_stop_0 18node1" -> "remote1_delete_0 18node3" [ style = bold] "remote1_stop_0 18node1" [ style=bold color="green" fontcolor="black"] "rsc_18node2_monitor_5000 18node1" [ style=bold color="green" fontcolor="black"] "rsc_18node2_start_0 18node1" -> "rsc_18node2_monitor_5000 18node1" [ style = bold] "rsc_18node2_start_0 18node1" [ style=bold color="green" fontcolor="black"] -"rsc_18node2_stop_0 remote1" -> "all_stopped" [ style = bold] "rsc_18node2_stop_0 remote1" -> "remote1_stop_0 18node1" [ style = bold] "rsc_18node2_stop_0 remote1" -> "rsc_18node2_start_0 18node1" [ style = bold] "rsc_18node2_stop_0 remote1" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/remote-orphaned.exp b/pengine/test10/remote-orphaned.exp index 4ac6bf9..a19d2ec 100644 --- a/pengine/test10/remote-orphaned.exp +++ b/pengine/test10/remote-orphaned.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,35 +36,35 @@ - + - + - + - + - + - + @@ -72,7 +72,7 @@ - + @@ -82,54 +82,36 @@ - + - + - + - + - + - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/remote-orphaned.summary b/pengine/test10/remote-orphaned.summary index f205007..d6df1c3 100644 --- a/pengine/test10/remote-orphaned.summary +++ b/pengine/test10/remote-orphaned.summary @@ -38,7 +38,6 @@ Executing cluster transition: * Resource action: remote1 stop on 18node1 * Resource action: remote1 delete on 18node3 * Resource action: remote1 delete on 18node1 - * Pseudo action: all_stopped * Resource action: rsc_18node2 monitor=5000 on 18node1 Revised cluster status: diff --git a/pengine/test10/remote-partial-migrate.dot b/pengine/test10/remote-partial-migrate.dot index 20f9f2f..a25b8ac 100644 --- a/pengine/test10/remote-partial-migrate.dot +++ b/pengine/test10/remote-partial-migrate.dot @@ -12,7 +12,6 @@ "FAKE16_start_0 pcmk_remote3" -> "FAKE16_monitor_10000 pcmk_remote3" [ style = bold] "FAKE16_start_0 pcmk_remote3" [ style=bold color="green" fontcolor="black"] "FAKE16_stop_0 pcmk1" -> "FAKE16_start_0 pcmk_remote3" [ style = bold] -"FAKE16_stop_0 pcmk1" -> "all_stopped" [ style = bold] "FAKE16_stop_0 pcmk1" [ style=bold color="green" fontcolor="black"] "FAKE22_monitor_10000 pcmk1" [ style=bold color="green" fontcolor="black"] "FAKE22_start_0 pcmk1" -> "FAKE22_monitor_10000 pcmk1" [ style = bold] @@ -21,7 +20,6 @@ "FAKE23_start_0 pcmk_remote1" -> "FAKE23_monitor_10000 pcmk_remote1" [ style = bold] "FAKE23_start_0 pcmk_remote1" [ style=bold color="green" fontcolor="black"] "FAKE23_stop_0 pcmk1" -> "FAKE23_start_0 pcmk_remote1" [ style = bold] -"FAKE23_stop_0 pcmk1" -> "all_stopped" [ style = bold] "FAKE23_stop_0 pcmk1" [ style=bold color="green" fontcolor="black"] "FAKE26_monitor_10000 pcmk1" [ style=bold color="green" fontcolor="black"] "FAKE26_start_0 pcmk1" -> "FAKE26_monitor_10000 pcmk1" [ style = bold] @@ -33,7 +31,6 @@ "FAKE30_start_0 pcmk_remote2" -> "FAKE30_monitor_10000 pcmk_remote2" [ style = bold] "FAKE30_start_0 pcmk_remote2" [ style=bold color="green" fontcolor="black"] "FAKE30_stop_0 pcmk1" -> "FAKE30_start_0 pcmk_remote2" [ style = bold] -"FAKE30_stop_0 pcmk1" -> "all_stopped" [ style = bold] "FAKE30_stop_0 pcmk1" [ style=bold color="green" fontcolor="black"] "FAKE36_monitor_10000 pcmk1" [ style=bold color="green" fontcolor="black"] "FAKE36_start_0 pcmk1" -> "FAKE36_monitor_10000 pcmk1" [ style = bold] @@ -42,7 +39,6 @@ "FAKE37_start_0 pcmk2" -> "FAKE37_monitor_10000 pcmk2" [ style = bold] "FAKE37_start_0 pcmk2" [ style=bold color="green" fontcolor="black"] "FAKE37_stop_0 pcmk1" -> "FAKE37_start_0 pcmk2" [ style = bold] -"FAKE37_stop_0 pcmk1" -> "all_stopped" [ style = bold] "FAKE37_stop_0 pcmk1" [ style=bold color="green" fontcolor="black"] "FAKE43_monitor_10000 pcmk1" [ style=bold color="green" fontcolor="black"] "FAKE43_start_0 pcmk1" -> "FAKE43_monitor_10000 pcmk1" [ style = bold] @@ -51,7 +47,6 @@ "FAKE44_start_0 pcmk2" -> "FAKE44_monitor_10000 pcmk2" [ style = bold] "FAKE44_start_0 pcmk2" [ style=bold color="green" fontcolor="black"] "FAKE44_stop_0 pcmk1" -> "FAKE44_start_0 pcmk2" [ style = bold] -"FAKE44_stop_0 pcmk1" -> "all_stopped" [ style = bold] "FAKE44_stop_0 pcmk1" [ style=bold color="green" fontcolor="black"] "FAKE4_monitor_10000 pcmk_remote3" [ style=bold color="green" fontcolor="black"] "FAKE4_start_0 pcmk_remote3" -> "FAKE4_monitor_10000 pcmk_remote3" [ style = bold] @@ -63,21 +58,19 @@ "FAKE9_start_0 pcmk1" -> "FAKE9_monitor_10000 pcmk1" [ style = bold] "FAKE9_start_0 pcmk1" [ style=bold color="green" fontcolor="black"] "FAKE9_stop_0 pcmk_remote3" -> "FAKE9_start_0 pcmk1" [ style = bold] -"FAKE9_stop_0 pcmk_remote3" -> "all_stopped" [ style = bold] "FAKE9_stop_0 pcmk_remote3" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "pcmk_remote3_migrate_from_0 pcmk2" -> "pcmk_remote3_start_0 pcmk2" [ style = bold] "pcmk_remote3_migrate_from_0 pcmk2" -> "pcmk_remote3_stop_0 pcmk1" [ style = bold] "pcmk_remote3_migrate_from_0 pcmk2" [ style=bold color="green" fontcolor="black"] "pcmk_remote3_monitor_60000 pcmk2" [ style=bold color="green" fontcolor="black"] "pcmk_remote3_start_0 pcmk2" -> "FAKE16_monitor_10000 pcmk_remote3" [ style = bold] "pcmk_remote3_start_0 pcmk2" -> "FAKE16_start_0 pcmk_remote3" [ style = bold] +"pcmk_remote3_start_0 pcmk2" -> "FAKE16_stop_0 pcmk1" [ style = bold] "pcmk_remote3_start_0 pcmk2" -> "FAKE4_monitor_10000 pcmk_remote3" [ style = bold] "pcmk_remote3_start_0 pcmk2" -> "FAKE4_start_0 pcmk_remote3" [ style = bold] "pcmk_remote3_start_0 pcmk2" -> "FAKE9_stop_0 pcmk_remote3" [ style = bold] "pcmk_remote3_start_0 pcmk2" -> "pcmk_remote3_monitor_60000 pcmk2" [ style = bold] "pcmk_remote3_start_0 pcmk2" [ style=bold color="green" fontcolor="orange"] -"pcmk_remote3_stop_0 pcmk1" -> "all_stopped" [ style = bold] "pcmk_remote3_stop_0 pcmk1" -> "pcmk_remote3_start_0 pcmk2" [ style = bold] "pcmk_remote3_stop_0 pcmk1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/remote-partial-migrate.exp b/pengine/test10/remote-partial-migrate.exp index 9a4a723..b0120ec 100644 --- a/pengine/test10/remote-partial-migrate.exp +++ b/pengine/test10/remote-partial-migrate.exp @@ -1,7 +1,7 @@ - + @@ -10,129 +10,129 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -141,20 +141,20 @@ - + - + - + @@ -163,20 +163,20 @@ - + - + - + @@ -185,61 +185,65 @@ - + - + - + - + - + - + - + - + + + + + - + - + - + @@ -248,33 +252,33 @@ - + - + - + - + - + @@ -283,20 +287,20 @@ - + - + - + @@ -305,20 +309,20 @@ - + - + - + @@ -327,33 +331,33 @@ - + - + - + - + - + @@ -362,20 +366,20 @@ - + - + - + @@ -384,33 +388,33 @@ - + - + - + - + - + @@ -419,20 +423,20 @@ - + - + - + @@ -441,33 +445,33 @@ - + - + - + - + - + @@ -476,54 +480,24 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/remote-partial-migrate.summary b/pengine/test10/remote-partial-migrate.summary index 7d28db4..346b3e6 100644 --- a/pengine/test10/remote-partial-migrate.summary +++ b/pengine/test10/remote-partial-migrate.summary @@ -86,7 +86,6 @@ Executing cluster transition: * Resource action: FAKE10 start on pcmk1 * Resource action: FAKE13 start on pcmk2 * Resource action: FAKE15 start on pcmk3 - * Resource action: FAKE16 stop on pcmk1 * Resource action: FAKE22 start on pcmk1 * Resource action: FAKE23 stop on pcmk1 * Resource action: FAKE26 start on pcmk1 @@ -103,7 +102,7 @@ Executing cluster transition: * Resource action: FAKE10 monitor=10000 on pcmk1 * Resource action: FAKE13 monitor=10000 on pcmk2 * Resource action: FAKE15 monitor=10000 on pcmk3 - * Resource action: FAKE16 start on pcmk_remote3 + * Resource action: FAKE16 stop on pcmk1 * Resource action: FAKE22 monitor=10000 on pcmk1 * Resource action: FAKE23 start on pcmk_remote1 * Resource action: FAKE26 monitor=10000 on pcmk1 @@ -114,16 +113,16 @@ Executing cluster transition: * Resource action: FAKE43 monitor=10000 on pcmk1 * Resource action: FAKE44 start on pcmk2 * Resource action: FAKE50 monitor=10000 on pcmk1 - * Pseudo action: all_stopped * Resource action: pcmk_remote3 monitor=60000 on pcmk2 * Resource action: FAKE4 monitor=10000 on pcmk_remote3 * Resource action: FAKE9 start on pcmk1 - * Resource action: FAKE16 monitor=10000 on pcmk_remote3 + * Resource action: FAKE16 start on pcmk_remote3 * Resource action: FAKE23 monitor=10000 on pcmk_remote1 * Resource action: FAKE30 monitor=10000 on pcmk_remote2 * Resource action: FAKE37 monitor=10000 on pcmk2 * Resource action: FAKE44 monitor=10000 on pcmk2 * Resource action: FAKE9 monitor=10000 on pcmk1 + * Resource action: FAKE16 monitor=10000 on pcmk_remote3 Revised cluster status: Online: [ pcmk1 pcmk2 pcmk3 ] diff --git a/pengine/test10/remote-partial-migrate2.dot b/pengine/test10/remote-partial-migrate2.dot index 17c8bf3..40797e4 100644 --- a/pengine/test10/remote-partial-migrate2.dot +++ b/pengine/test10/remote-partial-migrate2.dot @@ -3,123 +3,114 @@ "FAKE12_start_0 pcmk2" -> "FAKE12_monitor_10000 pcmk2" [ style = bold] "FAKE12_start_0 pcmk2" [ style=bold color="green" fontcolor="black"] "FAKE12_stop_0 pcmk1" -> "FAKE12_start_0 pcmk2" [ style = bold] -"FAKE12_stop_0 pcmk1" -> "all_stopped" [ style = bold] "FAKE12_stop_0 pcmk1" [ style=bold color="green" fontcolor="black"] "FAKE14_monitor_10000 pcmk_remote1" [ style=bold color="green" fontcolor="black"] "FAKE14_start_0 pcmk_remote1" -> "FAKE14_monitor_10000 pcmk_remote1" [ style = bold] "FAKE14_start_0 pcmk_remote1" [ style=bold color="green" fontcolor="black"] "FAKE14_stop_0 pcmk2" -> "FAKE14_start_0 pcmk_remote1" [ style = bold] -"FAKE14_stop_0 pcmk2" -> "all_stopped" [ style = bold] "FAKE14_stop_0 pcmk2" [ style=bold color="green" fontcolor="black"] "FAKE17_monitor_10000 pcmk_remote4" [ style=bold color="green" fontcolor="black"] "FAKE17_start_0 pcmk_remote4" -> "FAKE17_monitor_10000 pcmk_remote4" [ style = bold] "FAKE17_start_0 pcmk_remote4" [ style=bold color="green" fontcolor="black"] "FAKE17_stop_0 pcmk_remote1" -> "FAKE17_start_0 pcmk_remote4" [ style = bold] -"FAKE17_stop_0 pcmk_remote1" -> "all_stopped" [ style = bold] "FAKE17_stop_0 pcmk_remote1" [ style=bold color="green" fontcolor="black"] "FAKE25_monitor_10000 pcmk_remote4" [ style=bold color="green" fontcolor="black"] "FAKE25_start_0 pcmk_remote4" -> "FAKE25_monitor_10000 pcmk_remote4" [ style = bold] "FAKE25_start_0 pcmk_remote4" [ style=bold color="green" fontcolor="black"] "FAKE25_stop_0 pcmk_remote1" -> "FAKE25_start_0 pcmk_remote4" [ style = bold] -"FAKE25_stop_0 pcmk_remote1" -> "all_stopped" [ style = bold] "FAKE25_stop_0 pcmk_remote1" [ style=bold color="green" fontcolor="black"] "FAKE28_monitor_10000 pcmk1" [ style=bold color="green" fontcolor="black"] "FAKE28_start_0 pcmk1" -> "FAKE28_monitor_10000 pcmk1" [ style = bold] "FAKE28_start_0 pcmk1" [ style=bold color="green" fontcolor="black"] "FAKE28_stop_0 pcmk3" -> "FAKE28_start_0 pcmk1" [ style = bold] -"FAKE28_stop_0 pcmk3" -> "all_stopped" [ style = bold] "FAKE28_stop_0 pcmk3" [ style=bold color="green" fontcolor="black"] "FAKE30_monitor_10000 pcmk_remote1" [ style=bold color="green" fontcolor="black"] "FAKE30_start_0 pcmk_remote1" -> "FAKE30_monitor_10000 pcmk_remote1" [ style = bold] "FAKE30_start_0 pcmk_remote1" [ style=bold color="green" fontcolor="black"] "FAKE30_stop_0 pcmk1" -> "FAKE30_start_0 pcmk_remote1" [ style = bold] -"FAKE30_stop_0 pcmk1" -> "all_stopped" [ style = bold] "FAKE30_stop_0 pcmk1" [ style=bold color="green" fontcolor="black"] "FAKE33_monitor_10000 pcmk_remote4" [ style=bold color="green" fontcolor="black"] "FAKE33_start_0 pcmk_remote4" -> "FAKE33_monitor_10000 pcmk_remote4" [ style = bold] "FAKE33_start_0 pcmk_remote4" [ style=bold color="green" fontcolor="black"] "FAKE33_stop_0 pcmk_remote1" -> "FAKE33_start_0 pcmk_remote4" [ style = bold] -"FAKE33_stop_0 pcmk_remote1" -> "all_stopped" [ style = bold] "FAKE33_stop_0 pcmk_remote1" [ style=bold color="green" fontcolor="black"] "FAKE38_monitor_10000 pcmk_remote1" [ style=bold color="green" fontcolor="black"] "FAKE38_start_0 pcmk_remote1" -> "FAKE38_monitor_10000 pcmk_remote1" [ style = bold] "FAKE38_start_0 pcmk_remote1" [ style=bold color="green" fontcolor="black"] "FAKE38_stop_0 pcmk2" -> "FAKE38_start_0 pcmk_remote1" [ style = bold] -"FAKE38_stop_0 pcmk2" -> "all_stopped" [ style = bold] "FAKE38_stop_0 pcmk2" [ style=bold color="green" fontcolor="black"] "FAKE39_monitor_10000 pcmk_remote2" [ style=bold color="green" fontcolor="black"] "FAKE39_start_0 pcmk_remote2" -> "FAKE39_monitor_10000 pcmk_remote2" [ style = bold] "FAKE39_start_0 pcmk_remote2" [ style=bold color="green" fontcolor="black"] "FAKE39_stop_0 pcmk1" -> "FAKE39_start_0 pcmk_remote2" [ style = bold] -"FAKE39_stop_0 pcmk1" -> "all_stopped" [ style = bold] "FAKE39_stop_0 pcmk1" [ style=bold color="green" fontcolor="black"] "FAKE41_monitor_10000 pcmk_remote4" [ style=bold color="green" fontcolor="black"] "FAKE41_start_0 pcmk_remote4" -> "FAKE41_monitor_10000 pcmk_remote4" [ style = bold] "FAKE41_start_0 pcmk_remote4" [ style=bold color="green" fontcolor="black"] "FAKE41_stop_0 pcmk_remote2" -> "FAKE41_start_0 pcmk_remote4" [ style = bold] -"FAKE41_stop_0 pcmk_remote2" -> "all_stopped" [ style = bold] "FAKE41_stop_0 pcmk_remote2" [ style=bold color="green" fontcolor="black"] "FAKE47_monitor_10000 pcmk_remote2" [ style=bold color="green" fontcolor="black"] "FAKE47_start_0 pcmk_remote2" -> "FAKE47_monitor_10000 pcmk_remote2" [ style = bold] "FAKE47_start_0 pcmk_remote2" [ style=bold color="green" fontcolor="black"] "FAKE47_stop_0 pcmk_remote1" -> "FAKE47_start_0 pcmk_remote2" [ style = bold] -"FAKE47_stop_0 pcmk_remote1" -> "all_stopped" [ style = bold] "FAKE47_stop_0 pcmk_remote1" [ style=bold color="green" fontcolor="black"] "FAKE48_monitor_10000 pcmk_remote3" [ style=bold color="green" fontcolor="black"] "FAKE48_start_0 pcmk_remote3" -> "FAKE48_monitor_10000 pcmk_remote3" [ style = bold] "FAKE48_start_0 pcmk_remote3" [ style=bold color="green" fontcolor="black"] "FAKE48_stop_0 pcmk1" -> "FAKE48_start_0 pcmk_remote3" [ style = bold] -"FAKE48_stop_0 pcmk1" -> "all_stopped" [ style = bold] "FAKE48_stop_0 pcmk1" [ style=bold color="green" fontcolor="black"] "FAKE49_monitor_10000 pcmk_remote4" [ style=bold color="green" fontcolor="black"] "FAKE49_start_0 pcmk_remote4" -> "FAKE49_monitor_10000 pcmk_remote4" [ style = bold] "FAKE49_start_0 pcmk_remote4" [ style=bold color="green" fontcolor="black"] "FAKE49_stop_0 pcmk_remote3" -> "FAKE49_start_0 pcmk_remote4" [ style = bold] -"FAKE49_stop_0 pcmk_remote3" -> "all_stopped" [ style = bold] "FAKE49_stop_0 pcmk_remote3" [ style=bold color="green" fontcolor="black"] "FAKE5_monitor_10000 pcmk_remote4" [ style=bold color="green" fontcolor="black"] "FAKE5_start_0 pcmk_remote4" -> "FAKE5_monitor_10000 pcmk_remote4" [ style = bold] "FAKE5_start_0 pcmk_remote4" [ style=bold color="green" fontcolor="black"] "FAKE5_stop_0 pcmk1" -> "FAKE5_start_0 pcmk_remote4" [ style = bold] -"FAKE5_stop_0 pcmk1" -> "all_stopped" [ style = bold] "FAKE5_stop_0 pcmk1" [ style=bold color="green" fontcolor="black"] "FAKE9_monitor_10000 pcmk_remote4" [ style=bold color="green" fontcolor="black"] "FAKE9_start_0 pcmk_remote4" -> "FAKE9_monitor_10000 pcmk_remote4" [ style = bold] "FAKE9_start_0 pcmk_remote4" [ style=bold color="green" fontcolor="black"] "FAKE9_stop_0 pcmk2" -> "FAKE9_start_0 pcmk_remote4" [ style = bold] -"FAKE9_stop_0 pcmk2" -> "all_stopped" [ style = bold] "FAKE9_stop_0 pcmk2" [ style=bold color="green" fontcolor="black"] -"all_stopped" -> "pcmk_remote5_start_0 pcmk2" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "pcmk_remote2_migrate_from_0 pcmk1" -> "pcmk_remote2_start_0 pcmk1" [ style = bold] "pcmk_remote2_migrate_from_0 pcmk1" -> "pcmk_remote2_stop_0 pcmk3" [ style = bold] "pcmk_remote2_migrate_from_0 pcmk1" [ style=bold color="green" fontcolor="black"] "pcmk_remote2_monitor_60000 pcmk1" [ style=bold color="green" fontcolor="black"] "pcmk_remote2_start_0 pcmk1" -> "FAKE39_monitor_10000 pcmk_remote2" [ style = bold] "pcmk_remote2_start_0 pcmk1" -> "FAKE39_start_0 pcmk_remote2" [ style = bold] +"pcmk_remote2_start_0 pcmk1" -> "FAKE39_stop_0 pcmk1" [ style = bold] "pcmk_remote2_start_0 pcmk1" -> "FAKE41_stop_0 pcmk_remote2" [ style = bold] "pcmk_remote2_start_0 pcmk1" -> "FAKE47_monitor_10000 pcmk_remote2" [ style = bold] "pcmk_remote2_start_0 pcmk1" -> "FAKE47_start_0 pcmk_remote2" [ style = bold] +"pcmk_remote2_start_0 pcmk1" -> "FAKE47_stop_0 pcmk_remote1" [ style = bold] "pcmk_remote2_start_0 pcmk1" -> "pcmk_remote2_monitor_60000 pcmk1" [ style = bold] "pcmk_remote2_start_0 pcmk1" [ style=bold color="green" fontcolor="orange"] -"pcmk_remote2_stop_0 pcmk3" -> "all_stopped" [ style = bold] "pcmk_remote2_stop_0 pcmk3" -> "pcmk_remote2_start_0 pcmk1" [ style = bold] "pcmk_remote2_stop_0 pcmk3" [ style=bold color="green" fontcolor="black"] "pcmk_remote4_monitor_60000 pcmk2" [ style=bold color="green" fontcolor="black"] "pcmk_remote4_start_0 pcmk2" -> "FAKE17_monitor_10000 pcmk_remote4" [ style = bold] "pcmk_remote4_start_0 pcmk2" -> "FAKE17_start_0 pcmk_remote4" [ style = bold] +"pcmk_remote4_start_0 pcmk2" -> "FAKE17_stop_0 pcmk_remote1" [ style = bold] "pcmk_remote4_start_0 pcmk2" -> "FAKE25_monitor_10000 pcmk_remote4" [ style = bold] "pcmk_remote4_start_0 pcmk2" -> "FAKE25_start_0 pcmk_remote4" [ style = bold] +"pcmk_remote4_start_0 pcmk2" -> "FAKE25_stop_0 pcmk_remote1" [ style = bold] "pcmk_remote4_start_0 pcmk2" -> "FAKE33_monitor_10000 pcmk_remote4" [ style = bold] "pcmk_remote4_start_0 pcmk2" -> "FAKE33_start_0 pcmk_remote4" [ style = bold] +"pcmk_remote4_start_0 pcmk2" -> "FAKE33_stop_0 pcmk_remote1" [ style = bold] "pcmk_remote4_start_0 pcmk2" -> "FAKE41_monitor_10000 pcmk_remote4" [ style = bold] "pcmk_remote4_start_0 pcmk2" -> "FAKE41_start_0 pcmk_remote4" [ style = bold] +"pcmk_remote4_start_0 pcmk2" -> "FAKE41_stop_0 pcmk_remote2" [ style = bold] "pcmk_remote4_start_0 pcmk2" -> "FAKE49_monitor_10000 pcmk_remote4" [ style = bold] "pcmk_remote4_start_0 pcmk2" -> "FAKE49_start_0 pcmk_remote4" [ style = bold] +"pcmk_remote4_start_0 pcmk2" -> "FAKE49_stop_0 pcmk_remote3" [ style = bold] "pcmk_remote4_start_0 pcmk2" -> "FAKE5_monitor_10000 pcmk_remote4" [ style = bold] "pcmk_remote4_start_0 pcmk2" -> "FAKE5_start_0 pcmk_remote4" [ style = bold] +"pcmk_remote4_start_0 pcmk2" -> "FAKE5_stop_0 pcmk1" [ style = bold] "pcmk_remote4_start_0 pcmk2" -> "FAKE9_monitor_10000 pcmk_remote4" [ style = bold] "pcmk_remote4_start_0 pcmk2" -> "FAKE9_start_0 pcmk_remote4" [ style = bold] +"pcmk_remote4_start_0 pcmk2" -> "FAKE9_stop_0 pcmk2" [ style = bold] "pcmk_remote4_start_0 pcmk2" -> "pcmk_remote4_monitor_60000 pcmk2" [ style = bold] "pcmk_remote4_start_0 pcmk2" [ style=bold color="green" fontcolor="black"] "pcmk_remote5_migrate_from_0 pcmk2" -> "pcmk_remote5_start_0 pcmk2" [ style = bold] @@ -130,26 +121,23 @@ "pcmk_remote5_monitor_60000 pcmk2" [ style=bold color="green" fontcolor="black"] "pcmk_remote5_start_0 pcmk2" -> "pcmk_remote5_monitor_60000 pcmk2" [ style = bold] "pcmk_remote5_start_0 pcmk2" [ style=bold color="green" fontcolor="orange"] -"pcmk_remote5_stop_0 pcmk1" -> "all_stopped" [ style = bold] "pcmk_remote5_stop_0 pcmk1" -> "pcmk_remote5_start_0 pcmk2" [ style = bold] "pcmk_remote5_stop_0 pcmk1" [ style=bold color="green" fontcolor="black"] -"stonith 'reboot' pcmk4" -> "stonith_complete" [ style = bold] +"stonith 'reboot' pcmk4" -> "FAKE12_start_0 pcmk2" [ style = bold] +"stonith 'reboot' pcmk4" -> "FAKE14_start_0 pcmk_remote1" [ style = bold] +"stonith 'reboot' pcmk4" -> "FAKE17_start_0 pcmk_remote4" [ style = bold] +"stonith 'reboot' pcmk4" -> "FAKE25_start_0 pcmk_remote4" [ style = bold] +"stonith 'reboot' pcmk4" -> "FAKE28_start_0 pcmk1" [ style = bold] +"stonith 'reboot' pcmk4" -> "FAKE30_start_0 pcmk_remote1" [ style = bold] +"stonith 'reboot' pcmk4" -> "FAKE33_start_0 pcmk_remote4" [ style = bold] +"stonith 'reboot' pcmk4" -> "FAKE38_start_0 pcmk_remote1" [ style = bold] +"stonith 'reboot' pcmk4" -> "FAKE39_start_0 pcmk_remote2" [ style = bold] +"stonith 'reboot' pcmk4" -> "FAKE41_start_0 pcmk_remote4" [ style = bold] +"stonith 'reboot' pcmk4" -> "FAKE47_start_0 pcmk_remote2" [ style = bold] +"stonith 'reboot' pcmk4" -> "FAKE48_start_0 pcmk_remote3" [ style = bold] +"stonith 'reboot' pcmk4" -> "FAKE49_start_0 pcmk_remote4" [ style = bold] +"stonith 'reboot' pcmk4" -> "FAKE5_start_0 pcmk_remote4" [ style = bold] +"stonith 'reboot' pcmk4" -> "FAKE9_start_0 pcmk_remote4" [ style = bold] +"stonith 'reboot' pcmk4" -> "pcmk_remote5_start_0 pcmk2" [ style = bold] "stonith 'reboot' pcmk4" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "FAKE12_start_0 pcmk2" [ style = bold] -"stonith_complete" -> "FAKE14_start_0 pcmk_remote1" [ style = bold] -"stonith_complete" -> "FAKE17_start_0 pcmk_remote4" [ style = bold] -"stonith_complete" -> "FAKE25_start_0 pcmk_remote4" [ style = bold] -"stonith_complete" -> "FAKE28_start_0 pcmk1" [ style = bold] -"stonith_complete" -> "FAKE30_start_0 pcmk_remote1" [ style = bold] -"stonith_complete" -> "FAKE33_start_0 pcmk_remote4" [ style = bold] -"stonith_complete" -> "FAKE38_start_0 pcmk_remote1" [ style = bold] -"stonith_complete" -> "FAKE39_start_0 pcmk_remote2" [ style = bold] -"stonith_complete" -> "FAKE41_start_0 pcmk_remote4" [ style = bold] -"stonith_complete" -> "FAKE47_start_0 pcmk_remote2" [ style = bold] -"stonith_complete" -> "FAKE48_start_0 pcmk_remote3" [ style = bold] -"stonith_complete" -> "FAKE49_start_0 pcmk_remote4" [ style = bold] -"stonith_complete" -> "FAKE5_start_0 pcmk_remote4" [ style = bold] -"stonith_complete" -> "FAKE9_start_0 pcmk_remote4" [ style = bold] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/remote-partial-migrate2.exp b/pengine/test10/remote-partial-migrate2.exp index bae190c..473b5c3 100644 --- a/pengine/test10/remote-partial-migrate2.exp +++ b/pengine/test10/remote-partial-migrate2.exp @@ -1,7 +1,7 @@ - + @@ -10,61 +10,61 @@ - + - + - + - + - + - + - + - + - + - + @@ -73,20 +73,20 @@ - + - + - + @@ -95,168 +95,176 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + + - + - + - + - + - + - + - + - + - + + + + + - + - + - + - + - + - + @@ -265,36 +273,36 @@ - + - + - + - + - + - + @@ -303,124 +311,132 @@ - + - + - + - + - + - + - + - + - + + + + + - + - + - + - + - + - + - + - + - + + + + + - + - + - + - + - + - + @@ -429,36 +445,36 @@ - + - + - + - + - + - + @@ -467,80 +483,84 @@ - + - + - + - + - + - + - + - + - + + + + + - + - + - + - + - + - + @@ -549,172 +569,183 @@ - + - + - + - + - + - + - + - + - + + + + + - + - + - + - + - + - + - + - + - + + + + - + - + - + - + - + - + - + - + - + + + + + - + - + - + - + - + - + @@ -723,124 +754,53 @@ - + - + - + - + - + - + - + - + - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/remote-partial-migrate2.summary b/pengine/test10/remote-partial-migrate2.summary index 6b6428d..b1c92ac 100644 --- a/pengine/test10/remote-partial-migrate2.summary +++ b/pengine/test10/remote-partial-migrate2.summary @@ -98,8 +98,6 @@ Executing cluster transition: * Resource action: FAKE30 stop on pcmk1 * Resource action: FAKE33 stop on pcmk_remote1 * Resource action: FAKE38 stop on pcmk2 - * Resource action: FAKE39 stop on pcmk1 - * Resource action: FAKE47 stop on pcmk_remote1 * Resource action: FAKE48 stop on pcmk1 * Resource action: FAKE49 stop on pcmk_remote3 * Fencing pcmk4 (reboot) @@ -107,11 +105,6 @@ Executing cluster transition: * Resource action: pcmk_remote4 monitor=60000 on pcmk2 * Resource action: pcmk_remote5 migrate_from on pcmk2 * Resource action: pcmk_remote5 stop on pcmk1 - * Resource action: FAKE41 stop on pcmk_remote2 - * Pseudo action: stonith_complete - * Pseudo action: all_stopped - * Resource action: pcmk_remote2 monitor=60000 on pcmk1 - * Pseudo action: pcmk_remote5_start_0 * Resource action: FAKE5 start on pcmk_remote4 * Resource action: FAKE9 start on pcmk_remote4 * Resource action: FAKE12 start on pcmk2 @@ -122,12 +115,13 @@ Executing cluster transition: * Resource action: FAKE30 start on pcmk_remote1 * Resource action: FAKE33 start on pcmk_remote4 * Resource action: FAKE38 start on pcmk_remote1 - * Resource action: FAKE39 start on pcmk_remote2 - * Resource action: FAKE41 start on pcmk_remote4 - * Resource action: FAKE47 start on pcmk_remote2 + * Resource action: FAKE39 stop on pcmk1 + * Resource action: FAKE41 stop on pcmk_remote2 + * Resource action: FAKE47 stop on pcmk_remote1 * Resource action: FAKE48 start on pcmk_remote3 * Resource action: FAKE49 start on pcmk_remote4 - * Resource action: pcmk_remote5 monitor=60000 on pcmk2 + * Resource action: pcmk_remote2 monitor=60000 on pcmk1 + * Pseudo action: pcmk_remote5_start_0 * Resource action: FAKE5 monitor=10000 on pcmk_remote4 * Resource action: FAKE9 monitor=10000 on pcmk_remote4 * Resource action: FAKE12 monitor=10000 on pcmk2 @@ -138,11 +132,15 @@ Executing cluster transition: * Resource action: FAKE30 monitor=10000 on pcmk_remote1 * Resource action: FAKE33 monitor=10000 on pcmk_remote4 * Resource action: FAKE38 monitor=10000 on pcmk_remote1 + * Resource action: FAKE39 start on pcmk_remote2 + * Resource action: FAKE41 start on pcmk_remote4 + * Resource action: FAKE47 start on pcmk_remote2 + * Resource action: FAKE48 monitor=10000 on pcmk_remote3 + * Resource action: FAKE49 monitor=10000 on pcmk_remote4 + * Resource action: pcmk_remote5 monitor=60000 on pcmk2 * Resource action: FAKE39 monitor=10000 on pcmk_remote2 * Resource action: FAKE41 monitor=10000 on pcmk_remote4 * Resource action: FAKE47 monitor=10000 on pcmk_remote2 - * Resource action: FAKE48 monitor=10000 on pcmk_remote3 - * Resource action: FAKE49 monitor=10000 on pcmk_remote4 Revised cluster status: Online: [ pcmk1 pcmk2 pcmk3 ] diff --git a/pengine/test10/remote-probe-disable.dot b/pengine/test10/remote-probe-disable.dot index e2f06ed..253e945 100644 --- a/pengine/test10/remote-probe-disable.dot +++ b/pengine/test10/remote-probe-disable.dot @@ -7,7 +7,5 @@ digraph "g" { "FAKE3_monitor_0 remote1" [ style=bold color="green" fontcolor="black"] "FAKE4_monitor_0 remote1" -> "remote1_stop_0 18builder" [ style = bold] "FAKE4_monitor_0 remote1" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] -"remote1_stop_0 18builder" -> "all_stopped" [ style = bold] "remote1_stop_0 18builder" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/remote-probe-disable.exp b/pengine/test10/remote-probe-disable.exp index a911392..a45b1bf 100644 --- a/pengine/test10/remote-probe-disable.exp +++ b/pengine/test10/remote-probe-disable.exp @@ -1,7 +1,7 @@ - + @@ -11,22 +11,22 @@ - + - + - + - + - + @@ -35,7 +35,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -53,23 +53,11 @@ - + - - - - - - - - - - - - diff --git a/pengine/test10/remote-probe-disable.summary b/pengine/test10/remote-probe-disable.summary index 527120f..e3b7780 100644 --- a/pengine/test10/remote-probe-disable.summary +++ b/pengine/test10/remote-probe-disable.summary @@ -20,7 +20,6 @@ Executing cluster transition: * Resource action: FAKE3 monitor on remote1 * Resource action: FAKE4 monitor on remote1 * Resource action: remote1 stop on 18builder - * Pseudo action: all_stopped Revised cluster status: Online: [ 18builder 18node1 18node2 ] diff --git a/pengine/test10/remote-reconnect-delay.dot b/pengine/test10/remote-reconnect-delay.dot index 42c2cef..2e1c270 100644 --- a/pengine/test10/remote-reconnect-delay.dot +++ b/pengine/test10/remote-reconnect-delay.dot @@ -3,7 +3,5 @@ digraph "g" { "Fencing_start_0 rhel7-2" -> "Fencing_monitor_120000 rhel7-2" [ style = bold] "Fencing_start_0 rhel7-2" [ style=bold color="green" fontcolor="black"] "Fencing_stop_0 rhel7-2" -> "Fencing_start_0 rhel7-2" [ style = bold] -"Fencing_stop_0 rhel7-2" -> "all_stopped" [ style = bold] "Fencing_stop_0 rhel7-2" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/remote-reconnect-delay.exp b/pengine/test10/remote-reconnect-delay.exp index fc616c2..52b50e3 100644 --- a/pengine/test10/remote-reconnect-delay.exp +++ b/pengine/test10/remote-reconnect-delay.exp @@ -1,7 +1,7 @@ - + @@ -10,14 +10,14 @@ - + - + @@ -30,19 +30,7 @@ - - - - - - - - - - - - - + diff --git a/pengine/test10/remote-reconnect-delay.summary b/pengine/test10/remote-reconnect-delay.summary index bd46eae..7594f44 100644 --- a/pengine/test10/remote-reconnect-delay.summary +++ b/pengine/test10/remote-reconnect-delay.summary @@ -34,7 +34,6 @@ Executing cluster transition: * Resource action: Fencing stop on rhel7-2 * Resource action: Fencing start on rhel7-2 * Resource action: Fencing monitor=120000 on rhel7-2 - * Pseudo action: all_stopped Using the original execution date of: 2017-08-21 17:12:54Z Revised cluster status: diff --git a/pengine/test10/remote-recover-all.dot b/pengine/test10/remote-recover-all.dot index 5b79602..1f967c5 100644 --- a/pengine/test10/remote-recover-all.dot +++ b/pengine/test10/remote-recover-all.dot @@ -1,17 +1,10 @@ digraph "g" { -"all_stopped" -> "galera-0_start_0 controller-2" [ style = bold] -"all_stopped" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold] -"all_stopped" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold] -"all_stopped" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "galera-0_monitor_20000 controller-2" [ style=bold color="green" fontcolor="black"] "galera-0_start_0 controller-2" -> "galera-0_monitor_20000 controller-2" [ style = bold] "galera-0_start_0 controller-2" -> "galera_monitor_10000 galera-0" [ style = bold] "galera-0_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"galera-0_stop_0 controller-1" -> "all_stopped" [ style = bold] "galera-0_stop_0 controller-1" -> "galera-0_start_0 controller-2" [ style = bold] "galera-0_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] -"galera-2_stop_0 controller-1" -> "all_stopped" [ style = bold] "galera-2_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "galera-master_demote_0" -> "galera-master_demoted_0" [ style = bold] "galera-master_demote_0" -> "galera_demote_0 galera-2" [ style = bold] @@ -26,7 +19,6 @@ digraph "g" { "galera_demote_0 galera-2" -> "galera_stop_0 galera-2" [ style = bold] "galera_demote_0 galera-2" [ style=bold color="green" fontcolor="orange"] "galera_monitor_10000 galera-0" [ style=bold color="green" fontcolor="black"] -"galera_stop_0 galera-2" -> "all_stopped" [ style = bold] "galera_stop_0 galera-2" -> "galera-2_stop_0 controller-1" [ style = bold] "galera_stop_0 galera-2" -> "galera-master_stopped_0" [ style = bold] "galera_stop_0 galera-2" [ style=bold color="green" fontcolor="orange"] @@ -37,34 +29,28 @@ digraph "g" { "haproxy-clone_stopped_0" -> "ip-172.17.1.17_stop_0 controller-1" [ style = bold] "haproxy-clone_stopped_0" -> "ip-172.17.4.11_stop_0 controller-1" [ style = bold] "haproxy-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] -"haproxy_stop_0 controller-1" -> "all_stopped" [ style = bold] "haproxy_stop_0 controller-1" -> "haproxy-clone_stopped_0" [ style = bold] "haproxy_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "ip-172.17.1.14_monitor_10000 controller-2" [ style=bold color="green" fontcolor="black"] "ip-172.17.1.14_start_0 controller-2" -> "ip-172.17.1.14_monitor_10000 controller-2" [ style = bold] "ip-172.17.1.14_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"ip-172.17.1.14_stop_0 controller-1" -> "all_stopped" [ style = bold] "ip-172.17.1.14_stop_0 controller-1" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold] "ip-172.17.1.14_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "ip-172.17.1.17_monitor_10000 controller-2" [ style=bold color="green" fontcolor="black"] "ip-172.17.1.17_start_0 controller-2" -> "ip-172.17.1.17_monitor_10000 controller-2" [ style = bold] "ip-172.17.1.17_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"ip-172.17.1.17_stop_0 controller-1" -> "all_stopped" [ style = bold] "ip-172.17.1.17_stop_0 controller-1" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold] "ip-172.17.1.17_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "ip-172.17.4.11_monitor_10000 controller-2" [ style=bold color="green" fontcolor="black"] "ip-172.17.4.11_start_0 controller-2" -> "ip-172.17.4.11_monitor_10000 controller-2" [ style = bold] "ip-172.17.4.11_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"ip-172.17.4.11_stop_0 controller-1" -> "all_stopped" [ style = bold] "ip-172.17.4.11_stop_0 controller-1" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold] "ip-172.17.4.11_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] -"messaging-1_stop_0 controller-1" -> "all_stopped" [ style = bold] "messaging-1_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "rabbitmq-clone_stop_0" -> "rabbitmq-clone_stopped_0" [ style = bold] "rabbitmq-clone_stop_0" -> "rabbitmq_stop_0 messaging-1" [ style = bold] "rabbitmq-clone_stop_0" [ style=bold color="green" fontcolor="orange"] "rabbitmq-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rabbitmq_confirmed-post_notify_stonith_0" -> "all_stopped" [ style = bold] "rabbitmq_confirmed-post_notify_stonith_0" [ style=bold color="green" fontcolor="orange"] "rabbitmq_post_notify_stonith_0 messaging-0" -> "rabbitmq_confirmed-post_notify_stonith_0" [ style = bold] "rabbitmq_post_notify_stonith_0 messaging-0" [ style=bold color="green" fontcolor="black"] @@ -74,11 +60,9 @@ digraph "g" { "rabbitmq_post_notify_stonith_0" -> "rabbitmq_post_notify_stonith_0 messaging-0" [ style = bold] "rabbitmq_post_notify_stonith_0" -> "rabbitmq_post_notify_stonith_0 messaging-2" [ style = bold] "rabbitmq_post_notify_stonith_0" [ style=bold color="green" fontcolor="orange"] -"rabbitmq_stop_0 messaging-1" -> "all_stopped" [ style = bold] "rabbitmq_stop_0 messaging-1" -> "messaging-1_stop_0 controller-1" [ style = bold] "rabbitmq_stop_0 messaging-1" -> "rabbitmq-clone_stopped_0" [ style = bold] "rabbitmq_stop_0 messaging-1" [ style=bold color="green" fontcolor="orange"] -"redis-master_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "redis-master_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"] "redis-master_confirmed-pre_notify_stop_0" -> "redis-master_post_notify_stopped_0" [ style = bold] "redis-master_confirmed-pre_notify_stop_0" -> "redis-master_stop_0" [ style = bold] @@ -96,7 +80,6 @@ digraph "g" { "redis-master_stop_0" [ style=bold color="green" fontcolor="orange"] "redis-master_stopped_0" -> "redis-master_post_notify_stopped_0" [ style = bold] "redis-master_stopped_0" [ style=bold color="green" fontcolor="orange"] -"redis_confirmed-post_notify_stonith_0" -> "all_stopped" [ style = bold] "redis_confirmed-post_notify_stonith_0" [ style=bold color="green" fontcolor="orange"] "redis_post_notify_stonith_0 controller-0" -> "redis-master_confirmed-post_notify_stopped_0" [ style = bold] "redis_post_notify_stonith_0 controller-0" -> "redis_confirmed-post_notify_stonith_0" [ style = bold] @@ -112,14 +95,16 @@ digraph "g" { "redis_pre_notify_stop_0 controller-0" [ style=bold color="green" fontcolor="black"] "redis_pre_notify_stop_0 controller-2" -> "redis-master_confirmed-pre_notify_stop_0" [ style = bold] "redis_pre_notify_stop_0 controller-2" [ style=bold color="green" fontcolor="black"] -"redis_stop_0 controller-1" -> "all_stopped" [ style = bold] "redis_stop_0 controller-1" -> "redis-master_stopped_0" [ style = bold] "redis_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "stonith 'reboot' controller-1" -> "galera-2_stop_0 controller-1" [ style = bold] "stonith 'reboot' controller-1" -> "haproxy-clone_stop_0" [ style = bold] "stonith 'reboot' controller-1" -> "haproxy_stop_0 controller-1" [ style = bold] +"stonith 'reboot' controller-1" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold] "stonith 'reboot' controller-1" -> "ip-172.17.1.14_stop_0 controller-1" [ style = bold] +"stonith 'reboot' controller-1" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold] "stonith 'reboot' controller-1" -> "ip-172.17.1.17_stop_0 controller-1" [ style = bold] +"stonith 'reboot' controller-1" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold] "stonith 'reboot' controller-1" -> "ip-172.17.4.11_stop_0 controller-1" [ style = bold] "stonith 'reboot' controller-1" -> "messaging-1_stop_0 controller-1" [ style = bold] "stonith 'reboot' controller-1" -> "redis-master_stop_0" [ style = bold] @@ -127,37 +112,42 @@ digraph "g" { "stonith 'reboot' controller-1" -> "redis_stop_0 controller-1" [ style = bold] "stonith 'reboot' controller-1" -> "stonith 'reboot' galera-2" [ style = bold] "stonith 'reboot' controller-1" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' galera-2" -> "galera-0_start_0 controller-2" [ style = bold] "stonith 'reboot' galera-2" -> "galera-master_stop_0" [ style = bold] "stonith 'reboot' galera-2" -> "galera_demote_0 galera-2" [ style = bold] "stonith 'reboot' galera-2" -> "galera_stop_0 galera-2" [ style = bold] +"stonith 'reboot' galera-2" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold] +"stonith 'reboot' galera-2" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold] +"stonith 'reboot' galera-2" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold] "stonith 'reboot' galera-2" -> "stonith 'reboot' messaging-1" [ style = bold] +"stonith 'reboot' galera-2" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold] +"stonith 'reboot' galera-2" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold] +"stonith 'reboot' galera-2" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold] "stonith 'reboot' galera-2" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' messaging-1" -> "galera-0_start_0 controller-2" [ style = bold] +"stonith 'reboot' messaging-1" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold] +"stonith 'reboot' messaging-1" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold] +"stonith 'reboot' messaging-1" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold] "stonith 'reboot' messaging-1" -> "rabbitmq-clone_stop_0" [ style = bold] "stonith 'reboot' messaging-1" -> "rabbitmq_post_notify_stonith_0" [ style = bold] "stonith 'reboot' messaging-1" -> "rabbitmq_stop_0 messaging-1" [ style = bold] -"stonith 'reboot' messaging-1" -> "stonith_complete" [ style = bold] +"stonith 'reboot' messaging-1" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold] +"stonith 'reboot' messaging-1" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold] +"stonith 'reboot' messaging-1" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold] "stonith 'reboot' messaging-1" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-5254005bdbb5_monitor_60000 controller-2" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" -> "stonith-fence_ipmilan-5254005bdbb5_monitor_60000 controller-2" [ style = bold] "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" -> "all_stopped" [ style = bold] "stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold] "stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "stonith-fence_ipmilan-525400b4f6bd_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" -> "stonith-fence_ipmilan-525400b4f6bd_monitor_60000 controller-0" [ style = bold] "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style=bold color="green" fontcolor="black"] -"stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" -> "all_stopped" [ style = bold] "stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold] "stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-525400bbf613_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_monitor_60000 controller-0" [ style = bold] "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style=bold color="green" fontcolor="black"] -"stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" -> "all_stopped" [ style = bold] "stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold] "stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold] -"stonith_complete" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold] -"stonith_complete" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/remote-recover-all.exp b/pengine/test10/remote-recover-all.exp index fd2cf82..bd9fb9a 100644 --- a/pengine/test10/remote-recover-all.exp +++ b/pengine/test10/remote-recover-all.exp @@ -1,7 +1,7 @@ - + @@ -10,42 +10,45 @@ - + - + - + - + - + - + + + + - + @@ -53,7 +56,7 @@ - + @@ -62,138 +65,138 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -206,28 +209,28 @@ - + - + - + - + - + @@ -235,55 +238,55 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -295,7 +298,7 @@ - + @@ -304,122 +307,122 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -427,22 +430,22 @@ - + - + - + - + @@ -451,42 +454,48 @@ - + - + - + - + - + + + + - + + + + - + @@ -495,42 +504,48 @@ - + - + - + - + - + + + + + + + - + - + @@ -539,42 +554,48 @@ - + - + - + - + - + - + + + + + + + - + @@ -583,13 +604,13 @@ - + - + @@ -598,28 +619,28 @@ - + - + - + - + - + @@ -631,7 +652,7 @@ - + @@ -640,17 +661,20 @@ - + - + + + + - + @@ -663,13 +687,13 @@ - + - + @@ -678,17 +702,20 @@ - + - + + + + - + @@ -701,42 +728,45 @@ - + - + - + - + - + + + + - + - + @@ -744,7 +774,7 @@ - + @@ -753,13 +783,13 @@ - + - + @@ -774,78 +804,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/remote-recover-all.summary b/pengine/test10/remote-recover-all.summary index ba074e5..865f39a 100644 --- a/pengine/test10/remote-recover-all.summary +++ b/pengine/test10/remote-recover-all.summary @@ -78,15 +78,22 @@ Executing cluster transition: * Pseudo action: haproxy_stop_0 * Pseudo action: haproxy-clone_stopped_0 * Fencing messaging-1 (reboot) - * Pseudo action: stonith_complete + * Resource action: galera-0 start on controller-2 * Pseudo action: rabbitmq_post_notify_stop_0 * Pseudo action: rabbitmq-clone_stop_0 * Pseudo action: galera_stop_0 + * Resource action: galera monitor=10000 on galera-0 * Pseudo action: galera-master_stopped_0 * Pseudo action: redis-master_post_notify_stopped_0 * Pseudo action: ip-172.17.1.14_stop_0 * Pseudo action: ip-172.17.1.17_stop_0 * Pseudo action: ip-172.17.4.11_stop_0 + * Resource action: stonith-fence_ipmilan-525400bbf613 start on controller-0 + * Resource action: stonith-fence_ipmilan-525400bbf613 monitor=60000 on controller-0 + * Resource action: stonith-fence_ipmilan-525400b4f6bd start on controller-0 + * Resource action: stonith-fence_ipmilan-525400b4f6bd monitor=60000 on controller-0 + * Resource action: stonith-fence_ipmilan-5254005bdbb5 start on controller-2 + * Resource action: galera-0 monitor=20000 on controller-2 * Pseudo action: galera-2_stop_0 * Resource action: rabbitmq notify on messaging-2 * Resource action: rabbitmq notify on messaging-0 @@ -99,21 +106,12 @@ Executing cluster transition: * Resource action: ip-172.17.1.14 start on controller-2 * Resource action: ip-172.17.1.17 start on controller-2 * Resource action: ip-172.17.4.11 start on controller-2 + * Resource action: stonith-fence_ipmilan-5254005bdbb5 monitor=60000 on controller-2 * Pseudo action: messaging-1_stop_0 * Pseudo action: redis_notified_0 * Resource action: ip-172.17.1.14 monitor=10000 on controller-2 * Resource action: ip-172.17.1.17 monitor=10000 on controller-2 * Resource action: ip-172.17.4.11 monitor=10000 on controller-2 - * Pseudo action: all_stopped - * Resource action: galera-0 start on controller-2 - * Resource action: galera monitor=10000 on galera-0 - * Resource action: stonith-fence_ipmilan-525400bbf613 start on controller-0 - * Resource action: stonith-fence_ipmilan-525400bbf613 monitor=60000 on controller-0 - * Resource action: stonith-fence_ipmilan-525400b4f6bd start on controller-0 - * Resource action: stonith-fence_ipmilan-525400b4f6bd monitor=60000 on controller-0 - * Resource action: stonith-fence_ipmilan-5254005bdbb5 start on controller-2 - * Resource action: galera-0 monitor=20000 on controller-2 - * Resource action: stonith-fence_ipmilan-5254005bdbb5 monitor=60000 on controller-2 Using the original execution date of: 2017-05-03 13:33:24Z Revised cluster status: diff --git a/pengine/test10/remote-recover-connection.dot b/pengine/test10/remote-recover-connection.dot index 6cd342f..bf6cca1 100644 --- a/pengine/test10/remote-recover-connection.dot +++ b/pengine/test10/remote-recover-connection.dot @@ -1,17 +1,14 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "galera-0_monitor_20000 controller-2" [ style=bold color="green" fontcolor="black"] "galera-0_start_0 controller-2" -> "galera-0_monitor_20000 controller-2" [ style = bold] "galera-0_start_0 controller-2" -> "galera_monitor_10000 galera-0" [ style = bold] "galera-0_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"galera-0_stop_0 controller-1" -> "all_stopped" [ style = bold] "galera-0_stop_0 controller-1" -> "galera-0_start_0 controller-2" [ style = bold] "galera-0_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "galera-2_monitor_20000 controller-2" [ style=bold color="green" fontcolor="black"] "galera-2_start_0 controller-2" -> "galera-2_monitor_20000 controller-2" [ style = bold] "galera-2_start_0 controller-2" -> "galera_monitor_10000 galera-2" [ style = bold] "galera-2_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"galera-2_stop_0 controller-1" -> "all_stopped" [ style = bold] "galera-2_stop_0 controller-1" -> "galera-2_start_0 controller-2" [ style = bold] "galera-2_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "galera_monitor_10000 galera-0" [ style=bold color="green" fontcolor="black"] @@ -23,36 +20,30 @@ digraph "g" { "haproxy-clone_stopped_0" -> "ip-172.17.1.17_stop_0 controller-1" [ style = bold] "haproxy-clone_stopped_0" -> "ip-172.17.4.11_stop_0 controller-1" [ style = bold] "haproxy-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] -"haproxy_stop_0 controller-1" -> "all_stopped" [ style = bold] "haproxy_stop_0 controller-1" -> "haproxy-clone_stopped_0" [ style = bold] "haproxy_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "ip-172.17.1.14_monitor_10000 controller-2" [ style=bold color="green" fontcolor="black"] "ip-172.17.1.14_start_0 controller-2" -> "ip-172.17.1.14_monitor_10000 controller-2" [ style = bold] "ip-172.17.1.14_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"ip-172.17.1.14_stop_0 controller-1" -> "all_stopped" [ style = bold] "ip-172.17.1.14_stop_0 controller-1" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold] "ip-172.17.1.14_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "ip-172.17.1.17_monitor_10000 controller-2" [ style=bold color="green" fontcolor="black"] "ip-172.17.1.17_start_0 controller-2" -> "ip-172.17.1.17_monitor_10000 controller-2" [ style = bold] "ip-172.17.1.17_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"ip-172.17.1.17_stop_0 controller-1" -> "all_stopped" [ style = bold] "ip-172.17.1.17_stop_0 controller-1" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold] "ip-172.17.1.17_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "ip-172.17.4.11_monitor_10000 controller-2" [ style=bold color="green" fontcolor="black"] "ip-172.17.4.11_start_0 controller-2" -> "ip-172.17.4.11_monitor_10000 controller-2" [ style = bold] "ip-172.17.4.11_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"ip-172.17.4.11_stop_0 controller-1" -> "all_stopped" [ style = bold] "ip-172.17.4.11_stop_0 controller-1" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold] "ip-172.17.4.11_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "messaging-1_monitor_20000 controller-2" [ style=bold color="green" fontcolor="black"] "messaging-1_start_0 controller-2" -> "messaging-1_monitor_20000 controller-2" [ style = bold] "messaging-1_start_0 controller-2" -> "rabbitmq_monitor_10000 messaging-1" [ style = bold] "messaging-1_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"messaging-1_stop_0 controller-1" -> "all_stopped" [ style = bold] "messaging-1_stop_0 controller-1" -> "messaging-1_start_0 controller-2" [ style = bold] "messaging-1_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "rabbitmq_monitor_10000 messaging-1" [ style=bold color="green" fontcolor="black"] -"redis-master_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "redis-master_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"] "redis-master_confirmed-pre_notify_stop_0" -> "redis-master_post_notify_stopped_0" [ style = bold] "redis-master_confirmed-pre_notify_stop_0" -> "redis-master_stop_0" [ style = bold] @@ -70,7 +61,6 @@ digraph "g" { "redis-master_stop_0" [ style=bold color="green" fontcolor="orange"] "redis-master_stopped_0" -> "redis-master_post_notify_stopped_0" [ style = bold] "redis-master_stopped_0" [ style=bold color="green" fontcolor="orange"] -"redis_confirmed-post_notify_stonith_0" -> "all_stopped" [ style = bold] "redis_confirmed-post_notify_stonith_0" [ style=bold color="green" fontcolor="orange"] "redis_post_notify_stonith_0 controller-0" -> "redis-master_confirmed-post_notify_stopped_0" [ style = bold] "redis_post_notify_stonith_0 controller-0" -> "redis_confirmed-post_notify_stonith_0" [ style = bold] @@ -86,40 +76,33 @@ digraph "g" { "redis_pre_notify_stop_0 controller-0" [ style=bold color="green" fontcolor="black"] "redis_pre_notify_stop_0 controller-2" -> "redis-master_confirmed-pre_notify_stop_0" [ style = bold] "redis_pre_notify_stop_0 controller-2" [ style=bold color="green" fontcolor="black"] -"redis_stop_0 controller-1" -> "all_stopped" [ style = bold] "redis_stop_0 controller-1" -> "redis-master_stopped_0" [ style = bold] "redis_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "stonith 'reboot' controller-1" -> "haproxy-clone_stop_0" [ style = bold] "stonith 'reboot' controller-1" -> "haproxy_stop_0 controller-1" [ style = bold] +"stonith 'reboot' controller-1" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold] "stonith 'reboot' controller-1" -> "ip-172.17.1.14_stop_0 controller-1" [ style = bold] +"stonith 'reboot' controller-1" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold] "stonith 'reboot' controller-1" -> "ip-172.17.1.17_stop_0 controller-1" [ style = bold] +"stonith 'reboot' controller-1" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold] "stonith 'reboot' controller-1" -> "ip-172.17.4.11_stop_0 controller-1" [ style = bold] "stonith 'reboot' controller-1" -> "redis-master_stop_0" [ style = bold] "stonith 'reboot' controller-1" -> "redis_post_notify_stonith_0" [ style = bold] "stonith 'reboot' controller-1" -> "redis_stop_0 controller-1" [ style = bold] -"stonith 'reboot' controller-1" -> "stonith_complete" [ style = bold] "stonith 'reboot' controller-1" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-5254005bdbb5_monitor_60000 controller-2" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" -> "stonith-fence_ipmilan-5254005bdbb5_monitor_60000 controller-2" [ style = bold] "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" -> "all_stopped" [ style = bold] "stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold] "stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "stonith-fence_ipmilan-525400b4f6bd_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" -> "stonith-fence_ipmilan-525400b4f6bd_monitor_60000 controller-0" [ style = bold] "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style=bold color="green" fontcolor="black"] -"stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" -> "all_stopped" [ style = bold] "stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold] "stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-525400bbf613_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_monitor_60000 controller-0" [ style = bold] "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style=bold color="green" fontcolor="black"] -"stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" -> "all_stopped" [ style = bold] "stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold] "stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold] -"stonith_complete" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold] -"stonith_complete" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/remote-recover-connection.exp b/pengine/test10/remote-recover-connection.exp index a9dd475..fc8f69d 100644 --- a/pengine/test10/remote-recover-connection.exp +++ b/pengine/test10/remote-recover-connection.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -35,33 +35,33 @@ - + - + - + - + - + @@ -69,33 +69,33 @@ - + - + - + - + - + @@ -110,7 +110,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -136,31 +136,31 @@ - + - + - + - + - + - + @@ -172,7 +172,7 @@ - + @@ -181,122 +181,122 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -304,22 +304,22 @@ - + - + - + - + @@ -328,42 +328,42 @@ - + - + - + - + - + - + - + @@ -372,42 +372,42 @@ - + - + - + - + - + - + - + @@ -416,42 +416,42 @@ - + - + - + - + - + - + - + @@ -460,13 +460,13 @@ - + - + @@ -475,28 +475,28 @@ - + - + - + - + - + @@ -508,7 +508,7 @@ - + @@ -517,14 +517,14 @@ - + - + @@ -537,13 +537,13 @@ - + - + @@ -552,14 +552,14 @@ - + - + @@ -572,39 +572,39 @@ - + - + - + - + - + - + @@ -612,69 +612,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/remote-recover-connection.summary b/pengine/test10/remote-recover-connection.summary index 8246cd9..f190721 100644 --- a/pengine/test10/remote-recover-connection.summary +++ b/pengine/test10/remote-recover-connection.summary @@ -77,7 +77,6 @@ Executing cluster transition: * Pseudo action: redis-master_stop_0 * Pseudo action: haproxy-clone_stop_0 * Resource action: stonith-fence_ipmilan-5254005bdbb5 start on controller-2 - * Pseudo action: stonith_complete * Resource action: messaging-1 monitor=20000 on controller-2 * Resource action: galera-0 monitor=20000 on controller-2 * Resource action: galera-2 monitor=20000 on controller-2 @@ -100,7 +99,6 @@ Executing cluster transition: * Resource action: ip-172.17.1.14 monitor=10000 on controller-2 * Resource action: ip-172.17.1.17 monitor=10000 on controller-2 * Resource action: ip-172.17.4.11 monitor=10000 on controller-2 - * Pseudo action: all_stopped Using the original execution date of: 2017-05-03 13:33:24Z Revised cluster status: diff --git a/pengine/test10/remote-recover-fail.dot b/pengine/test10/remote-recover-fail.dot index 3375687..1e41e02 100644 --- a/pengine/test10/remote-recover-fail.dot +++ b/pengine/test10/remote-recover-fail.dot @@ -6,7 +6,6 @@ "FAKE2_start_0 rhel7-auto3" -> "FAKE2_monitor_10000 rhel7-auto3" [ style = bold] "FAKE2_start_0 rhel7-auto3" [ style=bold color="green" fontcolor="black"] "FAKE2_stop_0 rhel7-auto4" -> "FAKE2_start_0 rhel7-auto3" [ style = bold] -"FAKE2_stop_0 rhel7-auto4" -> "all_stopped" [ style = bold] "FAKE2_stop_0 rhel7-auto4" -> "rhel7-auto4_stop_0 rhel7-auto2" [ style = bold] "FAKE2_stop_0 rhel7-auto4" [ style=bold color="green" fontcolor="orange"] "FAKE3_monitor_10000 rhel7-auto2" [ style=bold color="green" fontcolor="black"] @@ -15,24 +14,18 @@ "FAKE6_start_0 rhel7-auto2" -> "FAKE6_monitor_10000 rhel7-auto2" [ style = bold] "FAKE6_start_0 rhel7-auto2" [ style=bold color="green" fontcolor="black"] "FAKE6_stop_0 rhel7-auto4" -> "FAKE6_start_0 rhel7-auto2" [ style = bold] -"FAKE6_stop_0 rhel7-auto4" -> "all_stopped" [ style = bold] "FAKE6_stop_0 rhel7-auto4" -> "rhel7-auto4_stop_0 rhel7-auto2" [ style = bold] "FAKE6_stop_0 rhel7-auto4" [ style=bold color="green" fontcolor="orange"] -"all_stopped" -> "rhel7-auto4_start_0 rhel7-auto2" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "rhel7-auto4_monitor_60000 rhel7-auto2" [ style=bold color="green" fontcolor="black"] "rhel7-auto4_start_0 rhel7-auto2" -> "rhel7-auto4_monitor_60000 rhel7-auto2" [ style = bold] "rhel7-auto4_start_0 rhel7-auto2" [ style=bold color="green" fontcolor="black"] -"rhel7-auto4_stop_0 rhel7-auto2" -> "all_stopped" [ style = bold] "rhel7-auto4_stop_0 rhel7-auto2" -> "rhel7-auto4_start_0 rhel7-auto2" [ style = bold] "rhel7-auto4_stop_0 rhel7-auto2" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' rhel7-auto4" -> "FAKE1_start_0 rhel7-auto2" [ style = bold] +"stonith 'reboot' rhel7-auto4" -> "FAKE2_start_0 rhel7-auto3" [ style = bold] "stonith 'reboot' rhel7-auto4" -> "FAKE2_stop_0 rhel7-auto4" [ style = bold] +"stonith 'reboot' rhel7-auto4" -> "FAKE6_start_0 rhel7-auto2" [ style = bold] "stonith 'reboot' rhel7-auto4" -> "FAKE6_stop_0 rhel7-auto4" [ style = bold] -"stonith 'reboot' rhel7-auto4" -> "stonith_complete" [ style = bold] +"stonith 'reboot' rhel7-auto4" -> "rhel7-auto4_start_0 rhel7-auto2" [ style = bold] "stonith 'reboot' rhel7-auto4" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "FAKE1_start_0 rhel7-auto2" [ style = bold] -"stonith_complete" -> "FAKE2_start_0 rhel7-auto3" [ style = bold] -"stonith_complete" -> "FAKE6_start_0 rhel7-auto2" [ style = bold] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/remote-recover-fail.exp b/pengine/test10/remote-recover-fail.exp index f908566..d231419 100644 --- a/pengine/test10/remote-recover-fail.exp +++ b/pengine/test10/remote-recover-fail.exp @@ -1,20 +1,20 @@ - + - + - + @@ -24,7 +24,7 @@ - + @@ -40,71 +40,71 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -116,7 +116,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -134,36 +134,36 @@ - + - + - + - + - + - + @@ -175,39 +175,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/remote-recover-fail.summary b/pengine/test10/remote-recover-fail.summary index d4e1aab..eedee8f 100644 --- a/pengine/test10/remote-recover-fail.summary +++ b/pengine/test10/remote-recover-fail.summary @@ -24,16 +24,14 @@ Executing cluster transition: * Resource action: FAKE3 monitor=10000 on rhel7-auto2 * Resource action: FAKE4 monitor=10000 on rhel7-auto3 * Fencing rhel7-auto4 (reboot) + * Resource action: FAKE1 start on rhel7-auto2 * Pseudo action: FAKE2_stop_0 * Pseudo action: FAKE6_stop_0 - * Pseudo action: stonith_complete * Resource action: rhel7-auto4 stop on rhel7-auto2 - * Resource action: FAKE1 start on rhel7-auto2 + * Resource action: FAKE1 monitor=10000 on rhel7-auto2 * Resource action: FAKE2 start on rhel7-auto3 * Resource action: FAKE6 start on rhel7-auto2 - * Pseudo action: all_stopped * Resource action: rhel7-auto4 start on rhel7-auto2 - * Resource action: FAKE1 monitor=10000 on rhel7-auto2 * Resource action: FAKE2 monitor=10000 on rhel7-auto3 * Resource action: FAKE6 monitor=10000 on rhel7-auto2 * Resource action: rhel7-auto4 monitor=60000 on rhel7-auto2 diff --git a/pengine/test10/remote-recover-no-resources.dot b/pengine/test10/remote-recover-no-resources.dot index 8c2f783..a46c305 100644 --- a/pengine/test10/remote-recover-no-resources.dot +++ b/pengine/test10/remote-recover-no-resources.dot @@ -1,17 +1,10 @@ digraph "g" { -"all_stopped" -> "galera-0_start_0 controller-2" [ style = bold] -"all_stopped" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold] -"all_stopped" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold] -"all_stopped" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "galera-0_monitor_20000 controller-2" [ style=bold color="green" fontcolor="black"] "galera-0_start_0 controller-2" -> "galera-0_monitor_20000 controller-2" [ style = bold] "galera-0_start_0 controller-2" -> "galera_monitor_10000 galera-0" [ style = bold] "galera-0_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"galera-0_stop_0 controller-1" -> "all_stopped" [ style = bold] "galera-0_stop_0 controller-1" -> "galera-0_start_0 controller-2" [ style = bold] "galera-0_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] -"galera-2_stop_0 controller-1" -> "all_stopped" [ style = bold] "galera-2_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "galera_monitor_10000 galera-0" [ style=bold color="green" fontcolor="black"] "haproxy-clone_stop_0" -> "haproxy-clone_stopped_0" [ style = bold] @@ -21,34 +14,28 @@ digraph "g" { "haproxy-clone_stopped_0" -> "ip-172.17.1.17_stop_0 controller-1" [ style = bold] "haproxy-clone_stopped_0" -> "ip-172.17.4.11_stop_0 controller-1" [ style = bold] "haproxy-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] -"haproxy_stop_0 controller-1" -> "all_stopped" [ style = bold] "haproxy_stop_0 controller-1" -> "haproxy-clone_stopped_0" [ style = bold] "haproxy_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "ip-172.17.1.14_monitor_10000 controller-2" [ style=bold color="green" fontcolor="black"] "ip-172.17.1.14_start_0 controller-2" -> "ip-172.17.1.14_monitor_10000 controller-2" [ style = bold] "ip-172.17.1.14_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"ip-172.17.1.14_stop_0 controller-1" -> "all_stopped" [ style = bold] "ip-172.17.1.14_stop_0 controller-1" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold] "ip-172.17.1.14_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "ip-172.17.1.17_monitor_10000 controller-2" [ style=bold color="green" fontcolor="black"] "ip-172.17.1.17_start_0 controller-2" -> "ip-172.17.1.17_monitor_10000 controller-2" [ style = bold] "ip-172.17.1.17_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"ip-172.17.1.17_stop_0 controller-1" -> "all_stopped" [ style = bold] "ip-172.17.1.17_stop_0 controller-1" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold] "ip-172.17.1.17_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "ip-172.17.4.11_monitor_10000 controller-2" [ style=bold color="green" fontcolor="black"] "ip-172.17.4.11_start_0 controller-2" -> "ip-172.17.4.11_monitor_10000 controller-2" [ style = bold] "ip-172.17.4.11_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"ip-172.17.4.11_stop_0 controller-1" -> "all_stopped" [ style = bold] "ip-172.17.4.11_stop_0 controller-1" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold] "ip-172.17.4.11_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] -"messaging-1_stop_0 controller-1" -> "all_stopped" [ style = bold] "messaging-1_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "rabbitmq-clone_stop_0" -> "rabbitmq-clone_stopped_0" [ style = bold] "rabbitmq-clone_stop_0" -> "rabbitmq_stop_0 messaging-1" [ style = bold] "rabbitmq-clone_stop_0" [ style=bold color="green" fontcolor="orange"] "rabbitmq-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rabbitmq_confirmed-post_notify_stonith_0" -> "all_stopped" [ style = bold] "rabbitmq_confirmed-post_notify_stonith_0" [ style=bold color="green" fontcolor="orange"] "rabbitmq_post_notify_stonith_0 messaging-0" -> "rabbitmq_confirmed-post_notify_stonith_0" [ style = bold] "rabbitmq_post_notify_stonith_0 messaging-0" [ style=bold color="green" fontcolor="black"] @@ -58,11 +45,9 @@ digraph "g" { "rabbitmq_post_notify_stonith_0" -> "rabbitmq_post_notify_stonith_0 messaging-0" [ style = bold] "rabbitmq_post_notify_stonith_0" -> "rabbitmq_post_notify_stonith_0 messaging-2" [ style = bold] "rabbitmq_post_notify_stonith_0" [ style=bold color="green" fontcolor="orange"] -"rabbitmq_stop_0 messaging-1" -> "all_stopped" [ style = bold] "rabbitmq_stop_0 messaging-1" -> "messaging-1_stop_0 controller-1" [ style = bold] "rabbitmq_stop_0 messaging-1" -> "rabbitmq-clone_stopped_0" [ style = bold] "rabbitmq_stop_0 messaging-1" [ style=bold color="green" fontcolor="orange"] -"redis-master_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "redis-master_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"] "redis-master_confirmed-pre_notify_stop_0" -> "redis-master_post_notify_stopped_0" [ style = bold] "redis-master_confirmed-pre_notify_stop_0" -> "redis-master_stop_0" [ style = bold] @@ -80,7 +65,6 @@ digraph "g" { "redis-master_stop_0" [ style=bold color="green" fontcolor="orange"] "redis-master_stopped_0" -> "redis-master_post_notify_stopped_0" [ style = bold] "redis-master_stopped_0" [ style=bold color="green" fontcolor="orange"] -"redis_confirmed-post_notify_stonith_0" -> "all_stopped" [ style = bold] "redis_confirmed-post_notify_stonith_0" [ style=bold color="green" fontcolor="orange"] "redis_post_notify_stonith_0 controller-0" -> "redis-master_confirmed-post_notify_stopped_0" [ style = bold] "redis_post_notify_stonith_0 controller-0" -> "redis_confirmed-post_notify_stonith_0" [ style = bold] @@ -96,14 +80,16 @@ digraph "g" { "redis_pre_notify_stop_0 controller-0" [ style=bold color="green" fontcolor="black"] "redis_pre_notify_stop_0 controller-2" -> "redis-master_confirmed-pre_notify_stop_0" [ style = bold] "redis_pre_notify_stop_0 controller-2" [ style=bold color="green" fontcolor="black"] -"redis_stop_0 controller-1" -> "all_stopped" [ style = bold] "redis_stop_0 controller-1" -> "redis-master_stopped_0" [ style = bold] "redis_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "stonith 'reboot' controller-1" -> "galera-2_stop_0 controller-1" [ style = bold] "stonith 'reboot' controller-1" -> "haproxy-clone_stop_0" [ style = bold] "stonith 'reboot' controller-1" -> "haproxy_stop_0 controller-1" [ style = bold] +"stonith 'reboot' controller-1" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold] "stonith 'reboot' controller-1" -> "ip-172.17.1.14_stop_0 controller-1" [ style = bold] +"stonith 'reboot' controller-1" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold] "stonith 'reboot' controller-1" -> "ip-172.17.1.17_stop_0 controller-1" [ style = bold] +"stonith 'reboot' controller-1" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold] "stonith 'reboot' controller-1" -> "ip-172.17.4.11_stop_0 controller-1" [ style = bold] "stonith 'reboot' controller-1" -> "messaging-1_stop_0 controller-1" [ style = bold] "stonith 'reboot' controller-1" -> "redis-master_stop_0" [ style = bold] @@ -111,32 +97,30 @@ digraph "g" { "stonith 'reboot' controller-1" -> "redis_stop_0 controller-1" [ style = bold] "stonith 'reboot' controller-1" -> "stonith 'reboot' messaging-1" [ style = bold] "stonith 'reboot' controller-1" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' messaging-1" -> "galera-0_start_0 controller-2" [ style = bold] +"stonith 'reboot' messaging-1" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold] +"stonith 'reboot' messaging-1" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold] +"stonith 'reboot' messaging-1" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold] "stonith 'reboot' messaging-1" -> "rabbitmq-clone_stop_0" [ style = bold] "stonith 'reboot' messaging-1" -> "rabbitmq_post_notify_stonith_0" [ style = bold] "stonith 'reboot' messaging-1" -> "rabbitmq_stop_0 messaging-1" [ style = bold] -"stonith 'reboot' messaging-1" -> "stonith_complete" [ style = bold] +"stonith 'reboot' messaging-1" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold] +"stonith 'reboot' messaging-1" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold] +"stonith 'reboot' messaging-1" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold] "stonith 'reboot' messaging-1" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-5254005bdbb5_monitor_60000 controller-2" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" -> "stonith-fence_ipmilan-5254005bdbb5_monitor_60000 controller-2" [ style = bold] "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" -> "all_stopped" [ style = bold] "stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold] "stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "stonith-fence_ipmilan-525400b4f6bd_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" -> "stonith-fence_ipmilan-525400b4f6bd_monitor_60000 controller-0" [ style = bold] "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style=bold color="green" fontcolor="black"] -"stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" -> "all_stopped" [ style = bold] "stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold] "stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-525400bbf613_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_monitor_60000 controller-0" [ style = bold] "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style=bold color="green" fontcolor="black"] -"stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" -> "all_stopped" [ style = bold] "stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold] "stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold] -"stonith_complete" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold] -"stonith_complete" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/remote-recover-no-resources.exp b/pengine/test10/remote-recover-no-resources.exp index 09b012b..932d2c4 100644 --- a/pengine/test10/remote-recover-no-resources.exp +++ b/pengine/test10/remote-recover-no-resources.exp @@ -1,7 +1,7 @@ - + @@ -10,42 +10,42 @@ - + - + - + - + - + - + - + @@ -53,7 +53,7 @@ - + @@ -65,99 +65,99 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -170,31 +170,31 @@ - + - + - + - + - + - + @@ -206,7 +206,7 @@ - + @@ -215,122 +215,122 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -338,22 +338,22 @@ - + - + - + - + @@ -362,42 +362,45 @@ - + - + - + - + - + + + + - + - + @@ -406,42 +409,45 @@ - + - + - + - + - + - + + + + - + @@ -450,42 +456,45 @@ - + - + - + - + - + + + + - + - + @@ -494,13 +503,13 @@ - + - + @@ -509,28 +518,28 @@ - + - + - + - + - + @@ -542,7 +551,7 @@ - + @@ -551,17 +560,17 @@ - + - + - + @@ -574,13 +583,13 @@ - + - + @@ -589,17 +598,17 @@ - + - + - + @@ -612,42 +621,42 @@ - + - + - + - + - + - + - + @@ -655,7 +664,7 @@ - + @@ -670,75 +679,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/remote-recover-no-resources.summary b/pengine/test10/remote-recover-no-resources.summary index bed02d0..9527161 100644 --- a/pengine/test10/remote-recover-no-resources.summary +++ b/pengine/test10/remote-recover-no-resources.summary @@ -68,13 +68,20 @@ Executing cluster transition: * Pseudo action: redis-master_stop_0 * Pseudo action: haproxy-clone_stop_0 * Fencing messaging-1 (reboot) - * Pseudo action: stonith_complete + * Resource action: galera-0 start on controller-2 * Pseudo action: rabbitmq_post_notify_stop_0 * Pseudo action: rabbitmq-clone_stop_0 + * Resource action: galera monitor=10000 on galera-0 * Pseudo action: redis_stop_0 * Pseudo action: redis-master_stopped_0 * Pseudo action: haproxy_stop_0 * Pseudo action: haproxy-clone_stopped_0 + * Resource action: stonith-fence_ipmilan-525400bbf613 start on controller-0 + * Resource action: stonith-fence_ipmilan-525400bbf613 monitor=60000 on controller-0 + * Resource action: stonith-fence_ipmilan-525400b4f6bd start on controller-0 + * Resource action: stonith-fence_ipmilan-525400b4f6bd monitor=60000 on controller-0 + * Resource action: stonith-fence_ipmilan-5254005bdbb5 start on controller-2 + * Resource action: galera-0 monitor=20000 on controller-2 * Resource action: rabbitmq notify on messaging-2 * Resource action: rabbitmq notify on messaging-0 * Pseudo action: rabbitmq_notified_0 @@ -84,6 +91,7 @@ Executing cluster transition: * Pseudo action: ip-172.17.1.14_stop_0 * Pseudo action: ip-172.17.1.17_stop_0 * Pseudo action: ip-172.17.4.11_stop_0 + * Resource action: stonith-fence_ipmilan-5254005bdbb5 monitor=60000 on controller-2 * Pseudo action: messaging-1_stop_0 * Resource action: redis notify on controller-0 * Resource action: redis notify on controller-2 @@ -95,16 +103,6 @@ Executing cluster transition: * Resource action: ip-172.17.1.14 monitor=10000 on controller-2 * Resource action: ip-172.17.1.17 monitor=10000 on controller-2 * Resource action: ip-172.17.4.11 monitor=10000 on controller-2 - * Pseudo action: all_stopped - * Resource action: galera-0 start on controller-2 - * Resource action: galera monitor=10000 on galera-0 - * Resource action: stonith-fence_ipmilan-525400bbf613 start on controller-0 - * Resource action: stonith-fence_ipmilan-525400bbf613 monitor=60000 on controller-0 - * Resource action: stonith-fence_ipmilan-525400b4f6bd start on controller-0 - * Resource action: stonith-fence_ipmilan-525400b4f6bd monitor=60000 on controller-0 - * Resource action: stonith-fence_ipmilan-5254005bdbb5 start on controller-2 - * Resource action: galera-0 monitor=20000 on controller-2 - * Resource action: stonith-fence_ipmilan-5254005bdbb5 monitor=60000 on controller-2 Using the original execution date of: 2017-05-03 13:33:24Z Revised cluster status: diff --git a/pengine/test10/remote-recover-unknown.dot b/pengine/test10/remote-recover-unknown.dot index 8ce59b4..a883eb4 100644 --- a/pengine/test10/remote-recover-unknown.dot +++ b/pengine/test10/remote-recover-unknown.dot @@ -1,17 +1,10 @@ digraph "g" { -"all_stopped" -> "galera-0_start_0 controller-2" [ style = bold] -"all_stopped" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold] -"all_stopped" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold] -"all_stopped" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "galera-0_monitor_20000 controller-2" [ style=bold color="green" fontcolor="black"] "galera-0_start_0 controller-2" -> "galera-0_monitor_20000 controller-2" [ style = bold] "galera-0_start_0 controller-2" -> "galera_monitor_10000 galera-0" [ style = bold] "galera-0_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"galera-0_stop_0 controller-1" -> "all_stopped" [ style = bold] "galera-0_stop_0 controller-1" -> "galera-0_start_0 controller-2" [ style = bold] "galera-0_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] -"galera-2_stop_0 controller-1" -> "all_stopped" [ style = bold] "galera-2_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "galera_monitor_0 galera-2" [ style=dashed color="red" fontcolor="black"] "galera_monitor_10000 galera-0" [ style=bold color="green" fontcolor="black"] @@ -22,34 +15,28 @@ digraph "g" { "haproxy-clone_stopped_0" -> "ip-172.17.1.17_stop_0 controller-1" [ style = bold] "haproxy-clone_stopped_0" -> "ip-172.17.4.11_stop_0 controller-1" [ style = bold] "haproxy-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] -"haproxy_stop_0 controller-1" -> "all_stopped" [ style = bold] "haproxy_stop_0 controller-1" -> "haproxy-clone_stopped_0" [ style = bold] "haproxy_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "ip-172.17.1.14_monitor_10000 controller-2" [ style=bold color="green" fontcolor="black"] "ip-172.17.1.14_start_0 controller-2" -> "ip-172.17.1.14_monitor_10000 controller-2" [ style = bold] "ip-172.17.1.14_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"ip-172.17.1.14_stop_0 controller-1" -> "all_stopped" [ style = bold] "ip-172.17.1.14_stop_0 controller-1" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold] "ip-172.17.1.14_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "ip-172.17.1.17_monitor_10000 controller-2" [ style=bold color="green" fontcolor="black"] "ip-172.17.1.17_start_0 controller-2" -> "ip-172.17.1.17_monitor_10000 controller-2" [ style = bold] "ip-172.17.1.17_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"ip-172.17.1.17_stop_0 controller-1" -> "all_stopped" [ style = bold] "ip-172.17.1.17_stop_0 controller-1" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold] "ip-172.17.1.17_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "ip-172.17.4.11_monitor_10000 controller-2" [ style=bold color="green" fontcolor="black"] "ip-172.17.4.11_start_0 controller-2" -> "ip-172.17.4.11_monitor_10000 controller-2" [ style = bold] "ip-172.17.4.11_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"ip-172.17.4.11_stop_0 controller-1" -> "all_stopped" [ style = bold] "ip-172.17.4.11_stop_0 controller-1" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold] "ip-172.17.4.11_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] -"messaging-1_stop_0 controller-1" -> "all_stopped" [ style = bold] "messaging-1_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "rabbitmq-clone_stop_0" -> "rabbitmq-clone_stopped_0" [ style = bold] "rabbitmq-clone_stop_0" -> "rabbitmq_stop_0 messaging-1" [ style = bold] "rabbitmq-clone_stop_0" [ style=bold color="green" fontcolor="orange"] "rabbitmq-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rabbitmq_confirmed-post_notify_stonith_0" -> "all_stopped" [ style = bold] "rabbitmq_confirmed-post_notify_stonith_0" [ style=bold color="green" fontcolor="orange"] "rabbitmq_post_notify_stonith_0 messaging-0" -> "rabbitmq_confirmed-post_notify_stonith_0" [ style = bold] "rabbitmq_post_notify_stonith_0 messaging-0" [ style=bold color="green" fontcolor="black"] @@ -59,11 +46,9 @@ digraph "g" { "rabbitmq_post_notify_stonith_0" -> "rabbitmq_post_notify_stonith_0 messaging-0" [ style = bold] "rabbitmq_post_notify_stonith_0" -> "rabbitmq_post_notify_stonith_0 messaging-2" [ style = bold] "rabbitmq_post_notify_stonith_0" [ style=bold color="green" fontcolor="orange"] -"rabbitmq_stop_0 messaging-1" -> "all_stopped" [ style = bold] "rabbitmq_stop_0 messaging-1" -> "messaging-1_stop_0 controller-1" [ style = bold] "rabbitmq_stop_0 messaging-1" -> "rabbitmq-clone_stopped_0" [ style = bold] "rabbitmq_stop_0 messaging-1" [ style=bold color="green" fontcolor="orange"] -"redis-master_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "redis-master_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"] "redis-master_confirmed-pre_notify_stop_0" -> "redis-master_post_notify_stopped_0" [ style = bold] "redis-master_confirmed-pre_notify_stop_0" -> "redis-master_stop_0" [ style = bold] @@ -81,7 +66,6 @@ digraph "g" { "redis-master_stop_0" [ style=bold color="green" fontcolor="orange"] "redis-master_stopped_0" -> "redis-master_post_notify_stopped_0" [ style = bold] "redis-master_stopped_0" [ style=bold color="green" fontcolor="orange"] -"redis_confirmed-post_notify_stonith_0" -> "all_stopped" [ style = bold] "redis_confirmed-post_notify_stonith_0" [ style=bold color="green" fontcolor="orange"] "redis_post_notify_stonith_0 controller-0" -> "redis-master_confirmed-post_notify_stopped_0" [ style = bold] "redis_post_notify_stonith_0 controller-0" -> "redis_confirmed-post_notify_stonith_0" [ style = bold] @@ -97,14 +81,16 @@ digraph "g" { "redis_pre_notify_stop_0 controller-0" [ style=bold color="green" fontcolor="black"] "redis_pre_notify_stop_0 controller-2" -> "redis-master_confirmed-pre_notify_stop_0" [ style = bold] "redis_pre_notify_stop_0 controller-2" [ style=bold color="green" fontcolor="black"] -"redis_stop_0 controller-1" -> "all_stopped" [ style = bold] "redis_stop_0 controller-1" -> "redis-master_stopped_0" [ style = bold] "redis_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "stonith 'reboot' controller-1" -> "galera-2_stop_0 controller-1" [ style = bold] "stonith 'reboot' controller-1" -> "haproxy-clone_stop_0" [ style = bold] "stonith 'reboot' controller-1" -> "haproxy_stop_0 controller-1" [ style = bold] +"stonith 'reboot' controller-1" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold] "stonith 'reboot' controller-1" -> "ip-172.17.1.14_stop_0 controller-1" [ style = bold] +"stonith 'reboot' controller-1" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold] "stonith 'reboot' controller-1" -> "ip-172.17.1.17_stop_0 controller-1" [ style = bold] +"stonith 'reboot' controller-1" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold] "stonith 'reboot' controller-1" -> "ip-172.17.4.11_stop_0 controller-1" [ style = bold] "stonith 'reboot' controller-1" -> "messaging-1_stop_0 controller-1" [ style = bold] "stonith 'reboot' controller-1" -> "redis-master_stop_0" [ style = bold] @@ -112,34 +98,39 @@ digraph "g" { "stonith 'reboot' controller-1" -> "redis_stop_0 controller-1" [ style = bold] "stonith 'reboot' controller-1" -> "stonith 'reboot' galera-2" [ style = bold] "stonith 'reboot' controller-1" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' galera-2" -> "galera-0_start_0 controller-2" [ style = bold] +"stonith 'reboot' galera-2" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold] +"stonith 'reboot' galera-2" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold] +"stonith 'reboot' galera-2" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold] "stonith 'reboot' galera-2" -> "stonith 'reboot' messaging-1" [ style = bold] +"stonith 'reboot' galera-2" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold] +"stonith 'reboot' galera-2" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold] +"stonith 'reboot' galera-2" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold] "stonith 'reboot' galera-2" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' messaging-1" -> "galera-0_start_0 controller-2" [ style = bold] +"stonith 'reboot' messaging-1" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold] +"stonith 'reboot' messaging-1" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold] +"stonith 'reboot' messaging-1" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold] "stonith 'reboot' messaging-1" -> "rabbitmq-clone_stop_0" [ style = bold] "stonith 'reboot' messaging-1" -> "rabbitmq_post_notify_stonith_0" [ style = bold] "stonith 'reboot' messaging-1" -> "rabbitmq_stop_0 messaging-1" [ style = bold] -"stonith 'reboot' messaging-1" -> "stonith_complete" [ style = bold] +"stonith 'reboot' messaging-1" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold] +"stonith 'reboot' messaging-1" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold] +"stonith 'reboot' messaging-1" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold] "stonith 'reboot' messaging-1" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-5254005bdbb5_monitor_60000 controller-2" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" -> "stonith-fence_ipmilan-5254005bdbb5_monitor_60000 controller-2" [ style = bold] "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" -> "all_stopped" [ style = bold] "stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold] "stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "stonith-fence_ipmilan-525400b4f6bd_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" -> "stonith-fence_ipmilan-525400b4f6bd_monitor_60000 controller-0" [ style = bold] "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style=bold color="green" fontcolor="black"] -"stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" -> "all_stopped" [ style = bold] "stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold] "stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-525400bbf613_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_monitor_60000 controller-0" [ style = bold] "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style=bold color="green" fontcolor="black"] -"stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" -> "all_stopped" [ style = bold] "stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold] "stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold] -"stonith_complete" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold] -"stonith_complete" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/remote-recover-unknown.exp b/pengine/test10/remote-recover-unknown.exp index 0a1d170..67c9cbc 100644 --- a/pengine/test10/remote-recover-unknown.exp +++ b/pengine/test10/remote-recover-unknown.exp @@ -1,7 +1,7 @@ - + @@ -10,42 +10,45 @@ - + - + - + - + - + - + + + + - + @@ -53,7 +56,7 @@ - + @@ -65,99 +68,99 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -170,31 +173,31 @@ - + - + - + - + - + - + @@ -206,7 +209,7 @@ - + @@ -215,122 +218,122 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -338,22 +341,22 @@ - + - + - + - + @@ -362,42 +365,48 @@ - + - + - + - + - + + + + - + + + + - + @@ -406,42 +415,48 @@ - + - + - + - + - + + + + + + + - + - + @@ -450,42 +465,48 @@ - + - + - + - + - + - + + + + + + + - + @@ -494,13 +515,13 @@ - + - + @@ -509,28 +530,28 @@ - + - + - + - + - + @@ -542,7 +563,7 @@ - + @@ -551,17 +572,20 @@ - + - + - + + + + @@ -574,13 +598,13 @@ - + - + @@ -589,17 +613,20 @@ - + - + + + + - + @@ -612,42 +639,45 @@ - + - + - + - + - + + + + - + - + @@ -655,7 +685,7 @@ - + @@ -670,7 +700,7 @@ - + @@ -679,81 +709,12 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/remote-recover-unknown.summary b/pengine/test10/remote-recover-unknown.summary index d47f174..78a60d0 100644 --- a/pengine/test10/remote-recover-unknown.summary +++ b/pengine/test10/remote-recover-unknown.summary @@ -70,13 +70,20 @@ Executing cluster transition: * Pseudo action: haproxy-clone_stop_0 * Fencing galera-2 (reboot) * Fencing messaging-1 (reboot) - * Pseudo action: stonith_complete + * Resource action: galera-0 start on controller-2 * Pseudo action: rabbitmq_post_notify_stop_0 * Pseudo action: rabbitmq-clone_stop_0 + * Resource action: galera monitor=10000 on galera-0 * Pseudo action: redis_stop_0 * Pseudo action: redis-master_stopped_0 * Pseudo action: haproxy_stop_0 * Pseudo action: haproxy-clone_stopped_0 + * Resource action: stonith-fence_ipmilan-525400bbf613 start on controller-0 + * Resource action: stonith-fence_ipmilan-525400bbf613 monitor=60000 on controller-0 + * Resource action: stonith-fence_ipmilan-525400b4f6bd start on controller-0 + * Resource action: stonith-fence_ipmilan-525400b4f6bd monitor=60000 on controller-0 + * Resource action: stonith-fence_ipmilan-5254005bdbb5 start on controller-2 + * Resource action: galera-0 monitor=20000 on controller-2 * Resource action: rabbitmq notify on messaging-2 * Resource action: rabbitmq notify on messaging-0 * Pseudo action: rabbitmq_notified_0 @@ -86,6 +93,7 @@ Executing cluster transition: * Pseudo action: ip-172.17.1.14_stop_0 * Pseudo action: ip-172.17.1.17_stop_0 * Pseudo action: ip-172.17.4.11_stop_0 + * Resource action: stonith-fence_ipmilan-5254005bdbb5 monitor=60000 on controller-2 * Pseudo action: messaging-1_stop_0 * Resource action: redis notify on controller-0 * Resource action: redis notify on controller-2 @@ -97,16 +105,6 @@ Executing cluster transition: * Resource action: ip-172.17.1.14 monitor=10000 on controller-2 * Resource action: ip-172.17.1.17 monitor=10000 on controller-2 * Resource action: ip-172.17.4.11 monitor=10000 on controller-2 - * Pseudo action: all_stopped - * Resource action: galera-0 start on controller-2 - * Resource action: galera monitor=10000 on galera-0 - * Resource action: stonith-fence_ipmilan-525400bbf613 start on controller-0 - * Resource action: stonith-fence_ipmilan-525400bbf613 monitor=60000 on controller-0 - * Resource action: stonith-fence_ipmilan-525400b4f6bd start on controller-0 - * Resource action: stonith-fence_ipmilan-525400b4f6bd monitor=60000 on controller-0 - * Resource action: stonith-fence_ipmilan-5254005bdbb5 start on controller-2 - * Resource action: galera-0 monitor=20000 on controller-2 - * Resource action: stonith-fence_ipmilan-5254005bdbb5 monitor=60000 on controller-2 Using the original execution date of: 2017-05-03 13:33:24Z Revised cluster status: diff --git a/pengine/test10/remote-recover.exp b/pengine/test10/remote-recover.exp index 1fab2f1..918db8d 100644 --- a/pengine/test10/remote-recover.exp +++ b/pengine/test10/remote-recover.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,20 +23,20 @@ - + - + - + @@ -45,14 +45,14 @@ - + - + diff --git a/pengine/test10/remote-recovery.dot b/pengine/test10/remote-recovery.dot index 6cd342f..bf6cca1 100644 --- a/pengine/test10/remote-recovery.dot +++ b/pengine/test10/remote-recovery.dot @@ -1,17 +1,14 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "galera-0_monitor_20000 controller-2" [ style=bold color="green" fontcolor="black"] "galera-0_start_0 controller-2" -> "galera-0_monitor_20000 controller-2" [ style = bold] "galera-0_start_0 controller-2" -> "galera_monitor_10000 galera-0" [ style = bold] "galera-0_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"galera-0_stop_0 controller-1" -> "all_stopped" [ style = bold] "galera-0_stop_0 controller-1" -> "galera-0_start_0 controller-2" [ style = bold] "galera-0_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "galera-2_monitor_20000 controller-2" [ style=bold color="green" fontcolor="black"] "galera-2_start_0 controller-2" -> "galera-2_monitor_20000 controller-2" [ style = bold] "galera-2_start_0 controller-2" -> "galera_monitor_10000 galera-2" [ style = bold] "galera-2_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"galera-2_stop_0 controller-1" -> "all_stopped" [ style = bold] "galera-2_stop_0 controller-1" -> "galera-2_start_0 controller-2" [ style = bold] "galera-2_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "galera_monitor_10000 galera-0" [ style=bold color="green" fontcolor="black"] @@ -23,36 +20,30 @@ digraph "g" { "haproxy-clone_stopped_0" -> "ip-172.17.1.17_stop_0 controller-1" [ style = bold] "haproxy-clone_stopped_0" -> "ip-172.17.4.11_stop_0 controller-1" [ style = bold] "haproxy-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] -"haproxy_stop_0 controller-1" -> "all_stopped" [ style = bold] "haproxy_stop_0 controller-1" -> "haproxy-clone_stopped_0" [ style = bold] "haproxy_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "ip-172.17.1.14_monitor_10000 controller-2" [ style=bold color="green" fontcolor="black"] "ip-172.17.1.14_start_0 controller-2" -> "ip-172.17.1.14_monitor_10000 controller-2" [ style = bold] "ip-172.17.1.14_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"ip-172.17.1.14_stop_0 controller-1" -> "all_stopped" [ style = bold] "ip-172.17.1.14_stop_0 controller-1" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold] "ip-172.17.1.14_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "ip-172.17.1.17_monitor_10000 controller-2" [ style=bold color="green" fontcolor="black"] "ip-172.17.1.17_start_0 controller-2" -> "ip-172.17.1.17_monitor_10000 controller-2" [ style = bold] "ip-172.17.1.17_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"ip-172.17.1.17_stop_0 controller-1" -> "all_stopped" [ style = bold] "ip-172.17.1.17_stop_0 controller-1" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold] "ip-172.17.1.17_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "ip-172.17.4.11_monitor_10000 controller-2" [ style=bold color="green" fontcolor="black"] "ip-172.17.4.11_start_0 controller-2" -> "ip-172.17.4.11_monitor_10000 controller-2" [ style = bold] "ip-172.17.4.11_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"ip-172.17.4.11_stop_0 controller-1" -> "all_stopped" [ style = bold] "ip-172.17.4.11_stop_0 controller-1" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold] "ip-172.17.4.11_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "messaging-1_monitor_20000 controller-2" [ style=bold color="green" fontcolor="black"] "messaging-1_start_0 controller-2" -> "messaging-1_monitor_20000 controller-2" [ style = bold] "messaging-1_start_0 controller-2" -> "rabbitmq_monitor_10000 messaging-1" [ style = bold] "messaging-1_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"messaging-1_stop_0 controller-1" -> "all_stopped" [ style = bold] "messaging-1_stop_0 controller-1" -> "messaging-1_start_0 controller-2" [ style = bold] "messaging-1_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "rabbitmq_monitor_10000 messaging-1" [ style=bold color="green" fontcolor="black"] -"redis-master_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "redis-master_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"] "redis-master_confirmed-pre_notify_stop_0" -> "redis-master_post_notify_stopped_0" [ style = bold] "redis-master_confirmed-pre_notify_stop_0" -> "redis-master_stop_0" [ style = bold] @@ -70,7 +61,6 @@ digraph "g" { "redis-master_stop_0" [ style=bold color="green" fontcolor="orange"] "redis-master_stopped_0" -> "redis-master_post_notify_stopped_0" [ style = bold] "redis-master_stopped_0" [ style=bold color="green" fontcolor="orange"] -"redis_confirmed-post_notify_stonith_0" -> "all_stopped" [ style = bold] "redis_confirmed-post_notify_stonith_0" [ style=bold color="green" fontcolor="orange"] "redis_post_notify_stonith_0 controller-0" -> "redis-master_confirmed-post_notify_stopped_0" [ style = bold] "redis_post_notify_stonith_0 controller-0" -> "redis_confirmed-post_notify_stonith_0" [ style = bold] @@ -86,40 +76,33 @@ digraph "g" { "redis_pre_notify_stop_0 controller-0" [ style=bold color="green" fontcolor="black"] "redis_pre_notify_stop_0 controller-2" -> "redis-master_confirmed-pre_notify_stop_0" [ style = bold] "redis_pre_notify_stop_0 controller-2" [ style=bold color="green" fontcolor="black"] -"redis_stop_0 controller-1" -> "all_stopped" [ style = bold] "redis_stop_0 controller-1" -> "redis-master_stopped_0" [ style = bold] "redis_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "stonith 'reboot' controller-1" -> "haproxy-clone_stop_0" [ style = bold] "stonith 'reboot' controller-1" -> "haproxy_stop_0 controller-1" [ style = bold] +"stonith 'reboot' controller-1" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold] "stonith 'reboot' controller-1" -> "ip-172.17.1.14_stop_0 controller-1" [ style = bold] +"stonith 'reboot' controller-1" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold] "stonith 'reboot' controller-1" -> "ip-172.17.1.17_stop_0 controller-1" [ style = bold] +"stonith 'reboot' controller-1" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold] "stonith 'reboot' controller-1" -> "ip-172.17.4.11_stop_0 controller-1" [ style = bold] "stonith 'reboot' controller-1" -> "redis-master_stop_0" [ style = bold] "stonith 'reboot' controller-1" -> "redis_post_notify_stonith_0" [ style = bold] "stonith 'reboot' controller-1" -> "redis_stop_0 controller-1" [ style = bold] -"stonith 'reboot' controller-1" -> "stonith_complete" [ style = bold] "stonith 'reboot' controller-1" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-5254005bdbb5_monitor_60000 controller-2" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" -> "stonith-fence_ipmilan-5254005bdbb5_monitor_60000 controller-2" [ style = bold] "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" -> "all_stopped" [ style = bold] "stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" -> "stonith-fence_ipmilan-5254005bdbb5_start_0 controller-2" [ style = bold] "stonith-fence_ipmilan-5254005bdbb5_stop_0 controller-1" [ style=bold color="green" fontcolor="orange"] "stonith-fence_ipmilan-525400b4f6bd_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" -> "stonith-fence_ipmilan-525400b4f6bd_monitor_60000 controller-0" [ style = bold] "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style=bold color="green" fontcolor="black"] -"stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" -> "all_stopped" [ style = bold] "stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" -> "stonith-fence_ipmilan-525400b4f6bd_start_0 controller-0" [ style = bold] "stonith-fence_ipmilan-525400b4f6bd_stop_0 controller-0" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-525400bbf613_monitor_60000 controller-0" [ style=bold color="green" fontcolor="black"] "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_monitor_60000 controller-0" [ style = bold] "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style=bold color="green" fontcolor="black"] -"stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" -> "all_stopped" [ style = bold] "stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" -> "stonith-fence_ipmilan-525400bbf613_start_0 controller-0" [ style = bold] "stonith-fence_ipmilan-525400bbf613_stop_0 controller-0" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "ip-172.17.1.14_start_0 controller-2" [ style = bold] -"stonith_complete" -> "ip-172.17.1.17_start_0 controller-2" [ style = bold] -"stonith_complete" -> "ip-172.17.4.11_start_0 controller-2" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/remote-recovery.exp b/pengine/test10/remote-recovery.exp index a9dd475..fc8f69d 100644 --- a/pengine/test10/remote-recovery.exp +++ b/pengine/test10/remote-recovery.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -35,33 +35,33 @@ - + - + - + - + - + @@ -69,33 +69,33 @@ - + - + - + - + - + @@ -110,7 +110,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -136,31 +136,31 @@ - + - + - + - + - + - + @@ -172,7 +172,7 @@ - + @@ -181,122 +181,122 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -304,22 +304,22 @@ - + - + - + - + @@ -328,42 +328,42 @@ - + - + - + - + - + - + - + @@ -372,42 +372,42 @@ - + - + - + - + - + - + - + @@ -416,42 +416,42 @@ - + - + - + - + - + - + - + @@ -460,13 +460,13 @@ - + - + @@ -475,28 +475,28 @@ - + - + - + - + - + @@ -508,7 +508,7 @@ - + @@ -517,14 +517,14 @@ - + - + @@ -537,13 +537,13 @@ - + - + @@ -552,14 +552,14 @@ - + - + @@ -572,39 +572,39 @@ - + - + - + - + - + - + @@ -612,69 +612,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/remote-recovery.summary b/pengine/test10/remote-recovery.summary index 8246cd9..f190721 100644 --- a/pengine/test10/remote-recovery.summary +++ b/pengine/test10/remote-recovery.summary @@ -77,7 +77,6 @@ Executing cluster transition: * Pseudo action: redis-master_stop_0 * Pseudo action: haproxy-clone_stop_0 * Resource action: stonith-fence_ipmilan-5254005bdbb5 start on controller-2 - * Pseudo action: stonith_complete * Resource action: messaging-1 monitor=20000 on controller-2 * Resource action: galera-0 monitor=20000 on controller-2 * Resource action: galera-2 monitor=20000 on controller-2 @@ -100,7 +99,6 @@ Executing cluster transition: * Resource action: ip-172.17.1.14 monitor=10000 on controller-2 * Resource action: ip-172.17.1.17 monitor=10000 on controller-2 * Resource action: ip-172.17.4.11 monitor=10000 on controller-2 - * Pseudo action: all_stopped Using the original execution date of: 2017-05-03 13:33:24Z Revised cluster status: diff --git a/pengine/test10/remote-stale-node-entry.exp b/pengine/test10/remote-stale-node-entry.exp index 892f68a..0a0048d 100644 --- a/pengine/test10/remote-stale-node-entry.exp +++ b/pengine/test10/remote-stale-node-entry.exp @@ -1,39 +1,39 @@ - + - + - + - + - + - + - + @@ -42,7 +42,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -60,26 +60,26 @@ - + - + - + - + - + @@ -88,7 +88,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -106,39 +106,39 @@ - + - + - + - + - + - + - + @@ -147,7 +147,7 @@ - + @@ -156,7 +156,7 @@ - + @@ -165,39 +165,39 @@ - + - + - + - + - + - + - + @@ -206,7 +206,7 @@ - + @@ -215,7 +215,7 @@ - + @@ -224,39 +224,39 @@ - + - + - + - + - + - + - + @@ -265,7 +265,7 @@ - + @@ -274,7 +274,7 @@ - + @@ -283,39 +283,39 @@ - + - + - + - + - + - + - + @@ -324,7 +324,7 @@ - + @@ -333,7 +333,7 @@ - + @@ -342,33 +342,33 @@ - + - + - + - + - + @@ -377,33 +377,33 @@ - + - + - + - + - + @@ -412,33 +412,33 @@ - + - + - + - + - + @@ -447,46 +447,46 @@ - + - + - + - + - + - + - + - + - + - + @@ -495,7 +495,7 @@ - + @@ -504,7 +504,7 @@ - + @@ -513,7 +513,7 @@ - + @@ -522,7 +522,7 @@ - + @@ -531,7 +531,7 @@ - + @@ -540,7 +540,7 @@ - + @@ -549,7 +549,7 @@ - + @@ -558,7 +558,7 @@ - + @@ -567,7 +567,7 @@ - + @@ -576,7 +576,7 @@ - + @@ -585,7 +585,7 @@ - + @@ -594,7 +594,7 @@ - + @@ -603,7 +603,7 @@ - + @@ -612,7 +612,7 @@ - + diff --git a/pengine/test10/remote-start-fail.dot b/pengine/test10/remote-start-fail.dot index 26c9f33..aa33577 100644 --- a/pengine/test10/remote-start-fail.dot +++ b/pengine/test10/remote-start-fail.dot @@ -1,9 +1,7 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "rhel7-auto4_monitor_60000 rhel7-auto3" [ style=bold color="green" fontcolor="black"] "rhel7-auto4_start_0 rhel7-auto3" -> "rhel7-auto4_monitor_60000 rhel7-auto3" [ style = bold] "rhel7-auto4_start_0 rhel7-auto3" [ style=bold color="green" fontcolor="black"] -"rhel7-auto4_stop_0 rhel7-auto2" -> "all_stopped" [ style = bold] "rhel7-auto4_stop_0 rhel7-auto2" -> "rhel7-auto4_start_0 rhel7-auto3" [ style = bold] "rhel7-auto4_stop_0 rhel7-auto2" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/remote-start-fail.exp b/pengine/test10/remote-start-fail.exp index 1be99e6..a71c908 100644 --- a/pengine/test10/remote-start-fail.exp +++ b/pengine/test10/remote-start-fail.exp @@ -1,20 +1,20 @@ - + - + - + @@ -37,16 +37,4 @@ - - - - - - - - - - - - diff --git a/pengine/test10/remote-start-fail.summary b/pengine/test10/remote-start-fail.summary index aa08600..4a93b9a 100644 --- a/pengine/test10/remote-start-fail.summary +++ b/pengine/test10/remote-start-fail.summary @@ -11,7 +11,6 @@ Transition Summary: Executing cluster transition: * Resource action: rhel7-auto4 stop on rhel7-auto2 - * Pseudo action: all_stopped * Resource action: rhel7-auto4 start on rhel7-auto3 * Resource action: rhel7-auto4 monitor=60000 on rhel7-auto3 diff --git a/pengine/test10/remote-startup-probes.dot b/pengine/test10/remote-startup-probes.dot index 7174acf..e7cbefe 100644 --- a/pengine/test10/remote-startup-probes.dot +++ b/pengine/test10/remote-startup-probes.dot @@ -5,7 +5,6 @@ "FAKE1_start_0 18node2" -> "FAKE1_monitor_60000 18node2" [ style = bold] "FAKE1_start_0 18node2" [ style=bold color="green" fontcolor="black"] "FAKE1_stop_0 18builder" -> "FAKE1_start_0 18node2" [ style = bold] -"FAKE1_stop_0 18builder" -> "all_stopped" [ style = bold] "FAKE1_stop_0 18builder" [ style=bold color="green" fontcolor="black"] "FAKE2_monitor_0 remote1" -> "FAKE2_start_0 remote1" [ style = bold] "FAKE2_monitor_0 remote1" [ style=bold color="green" fontcolor="black"] @@ -13,16 +12,15 @@ "FAKE2_start_0 remote1" -> "FAKE2_monitor_60000 remote1" [ style = bold] "FAKE2_start_0 remote1" [ style=bold color="green" fontcolor="black"] "FAKE2_stop_0 18node2" -> "FAKE2_start_0 remote1" [ style = bold] -"FAKE2_stop_0 18node2" -> "all_stopped" [ style = bold] "FAKE2_stop_0 18node2" [ style=bold color="green" fontcolor="black"] "FAKE3_monitor_0 remote1" [ style=bold color="green" fontcolor="black"] "FAKE4_monitor_0 remote1" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "remote1_monitor_60000 18builder" [ style=bold color="green" fontcolor="black"] "remote1_start_0 18builder" -> "FAKE1_monitor_0 remote1" [ style = bold] "remote1_start_0 18builder" -> "FAKE2_monitor_0 remote1" [ style = bold] "remote1_start_0 18builder" -> "FAKE2_monitor_60000 remote1" [ style = bold] "remote1_start_0 18builder" -> "FAKE2_start_0 remote1" [ style = bold] +"remote1_start_0 18builder" -> "FAKE2_stop_0 18node2" [ style = bold] "remote1_start_0 18builder" -> "FAKE3_monitor_0 remote1" [ style = bold] "remote1_start_0 18builder" -> "FAKE4_monitor_0 remote1" [ style = bold] "remote1_start_0 18builder" -> "remote1_monitor_60000 18builder" [ style = bold] diff --git a/pengine/test10/remote-startup-probes.exp b/pengine/test10/remote-startup-probes.exp index 7ab0693..8ad95e9 100644 --- a/pengine/test10/remote-startup-probes.exp +++ b/pengine/test10/remote-startup-probes.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,36 +23,36 @@ - + - + - + - + - + - + @@ -61,112 +61,101 @@ - + - + - + - + - + - + - + - + - + - + - + + + + + - + - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/remote-startup-probes.summary b/pengine/test10/remote-startup-probes.summary index 3e21d65..0890a6a 100644 --- a/pengine/test10/remote-startup-probes.summary +++ b/pengine/test10/remote-startup-probes.summary @@ -23,7 +23,6 @@ Executing cluster transition: * Resource action: FAKE2 monitor on remote1 * Resource action: FAKE3 monitor on remote1 * Resource action: FAKE4 monitor on remote1 - * Pseudo action: all_stopped * Resource action: remote1 monitor=60000 on 18builder * Resource action: FAKE1 start on 18node2 * Resource action: FAKE2 start on remote1 diff --git a/pengine/test10/remote-startup.dot b/pengine/test10/remote-startup.dot index 1727843..98bd2a8 100644 --- a/pengine/test10/remote-startup.dot +++ b/pengine/test10/remote-startup.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "fake_monitor_0 18builder" -> "fake_start_0 18node2" [ style = bold] "fake_monitor_0 18builder" [ style=bold color="green" fontcolor="black"] "fake_monitor_0 18node1" -> "fake_start_0 18node2" [ style = bold] @@ -22,7 +21,6 @@ "shooter_monitor_60000 18node1" [ style=bold color="green" fontcolor="black"] "shooter_start_0 18node1" -> "shooter_monitor_60000 18node1" [ style = bold] "shooter_start_0 18node1" [ style=bold color="green" fontcolor="black"] -"shooter_stop_0 18builder" -> "all_stopped" [ style = bold] "shooter_stop_0 18builder" -> "shooter_start_0 18node1" [ style = bold] "shooter_stop_0 18builder" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/remote-startup.exp b/pengine/test10/remote-startup.exp index ac26ece..636154e 100644 --- a/pengine/test10/remote-startup.exp +++ b/pengine/test10/remote-startup.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,42 +36,42 @@ - + - + - + - + - + - + - + - + @@ -80,7 +80,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -98,39 +98,39 @@ - + - + - + - + - + - + - + @@ -139,7 +139,7 @@ - + @@ -148,23 +148,11 @@ - + - - - - - - - - - - - - diff --git a/pengine/test10/remote-startup.summary b/pengine/test10/remote-startup.summary index 4eb6887..993e1e5 100644 --- a/pengine/test10/remote-startup.summary +++ b/pengine/test10/remote-startup.summary @@ -20,7 +20,6 @@ Executing cluster transition: * Resource action: remote1 monitor on 18node2 * Resource action: remote1 monitor on 18node1 * Resource action: remote1 monitor on 18builder - * Pseudo action: all_stopped * Resource action: shooter start on 18node1 * Resource action: remote1 start on 18builder * Resource action: shooter monitor=60000 on 18node1 diff --git a/pengine/test10/remote-unclean2.dot b/pengine/test10/remote-unclean2.dot index 2311a72..0bca514 100644 --- a/pengine/test10/remote-unclean2.dot +++ b/pengine/test10/remote-unclean2.dot @@ -1,14 +1,9 @@ digraph "g" { -"all_stopped" -> "rhel7-auto4_start_0 rhel7-auto1" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "rhel7-auto4_monitor_60000 rhel7-auto1" [ style=bold color="green" fontcolor="black"] "rhel7-auto4_start_0 rhel7-auto1" -> "rhel7-auto4_monitor_60000 rhel7-auto1" [ style = bold] "rhel7-auto4_start_0 rhel7-auto1" [ style=bold color="green" fontcolor="black"] -"rhel7-auto4_stop_0 rhel7-auto1" -> "all_stopped" [ style = bold] "rhel7-auto4_stop_0 rhel7-auto1" -> "rhel7-auto4_start_0 rhel7-auto1" [ style = bold] "rhel7-auto4_stop_0 rhel7-auto1" [ style=bold color="green" fontcolor="black"] -"stonith 'reboot' rhel7-auto4" -> "stonith_complete" [ style = bold] +"stonith 'reboot' rhel7-auto4" -> "rhel7-auto4_start_0 rhel7-auto1" [ style = bold] "stonith 'reboot' rhel7-auto4" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/remote-unclean2.exp b/pengine/test10/remote-unclean2.exp index 2c73d82..11e6fe1 100644 --- a/pengine/test10/remote-unclean2.exp +++ b/pengine/test10/remote-unclean2.exp @@ -1,17 +1,17 @@ - + - + - + @@ -36,39 +36,12 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/remote-unclean2.summary b/pengine/test10/remote-unclean2.summary index e1666b5..1cdc878 100644 --- a/pengine/test10/remote-unclean2.summary +++ b/pengine/test10/remote-unclean2.summary @@ -13,8 +13,6 @@ Transition Summary: Executing cluster transition: * Resource action: rhel7-auto4 stop on rhel7-auto1 * Fencing rhel7-auto4 (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped * Resource action: rhel7-auto4 start on rhel7-auto1 * Resource action: rhel7-auto4 monitor=60000 on rhel7-auto1 diff --git a/pengine/test10/reprobe-target_rc.exp b/pengine/test10/reprobe-target_rc.exp index 9b1b6a0..36c3288 100644 --- a/pengine/test10/reprobe-target_rc.exp +++ b/pengine/test10/reprobe-target_rc.exp @@ -1,7 +1,7 @@ - + @@ -9,7 +9,7 @@ - + diff --git a/pengine/test10/resource-discovery.exp b/pengine/test10/resource-discovery.exp index 365c9e5..f62c257 100644 --- a/pengine/test10/resource-discovery.exp +++ b/pengine/test10/resource-discovery.exp @@ -1,42 +1,42 @@ - + - + - + - + - + - + - + - + @@ -45,7 +45,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -72,42 +72,42 @@ - + - + - + - + - + - + - + - + @@ -116,7 +116,7 @@ - + @@ -125,7 +125,7 @@ - + @@ -134,7 +134,7 @@ - + @@ -143,33 +143,33 @@ - + - + - + - + - + @@ -178,36 +178,36 @@ - + - + - + - + - + - + @@ -216,7 +216,7 @@ - + @@ -225,33 +225,33 @@ - + - + - + - + - + @@ -260,33 +260,33 @@ - + - + - + - + - + @@ -295,64 +295,64 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -361,7 +361,7 @@ - + @@ -370,7 +370,7 @@ - + @@ -379,7 +379,7 @@ - + @@ -388,33 +388,33 @@ - + - + - + - + - + @@ -423,111 +423,111 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -536,33 +536,33 @@ - + - + - + - + - + @@ -571,59 +571,59 @@ - + - + - + - + - + - + - + - + - + @@ -632,118 +632,118 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -751,39 +751,39 @@ - + - + - + - + - + - + - + @@ -792,7 +792,7 @@ - + @@ -801,42 +801,42 @@ - + - + - + - + - + - + - + - + @@ -845,7 +845,7 @@ - + diff --git a/pengine/test10/route-remote-notify.dot b/pengine/test10/route-remote-notify.dot index c473321..4b6fbb0 100644 --- a/pengine/test10/route-remote-notify.dot +++ b/pengine/test10/route-remote-notify.dot @@ -1,9 +1,7 @@ digraph "g" { "Cancel rabbitmq-bundle-1_monitor_30000 controller-1" [ style=bold color="green" fontcolor="black"] "Cancel rabbitmq-bundle-2_monitor_30000 controller-2" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "do_shutdown controller-0" [ style=bold color="green" fontcolor="black"] -"haproxy-bundle-docker-0_stop_0 controller-0" -> "all_stopped" [ style = bold] "haproxy-bundle-docker-0_stop_0 controller-0" -> "do_shutdown controller-0" [ style = bold] "haproxy-bundle-docker-0_stop_0 controller-0" -> "haproxy-bundle_stopped_0" [ style = bold] "haproxy-bundle-docker-0_stop_0 controller-0" [ style=bold color="green" fontcolor="black"] @@ -15,14 +13,12 @@ digraph "g" { "ip-172.17.1.11_monitor_10000 controller-1" [ style=bold color="green" fontcolor="black"] "ip-172.17.1.11_start_0 controller-1" -> "ip-172.17.1.11_monitor_10000 controller-1" [ style = bold] "ip-172.17.1.11_start_0 controller-1" [ style=bold color="green" fontcolor="black"] -"ip-172.17.1.11_stop_0 controller-0" -> "all_stopped" [ style = bold] "ip-172.17.1.11_stop_0 controller-0" -> "do_shutdown controller-0" [ style = bold] "ip-172.17.1.11_stop_0 controller-0" -> "ip-172.17.1.11_start_0 controller-1" [ style = bold] "ip-172.17.1.11_stop_0 controller-0" [ style=bold color="green" fontcolor="black"] "ip-192.168.24.12_monitor_10000 controller-2" [ style=bold color="green" fontcolor="black"] "ip-192.168.24.12_start_0 controller-2" -> "ip-192.168.24.12_monitor_10000 controller-2" [ style = bold] "ip-192.168.24.12_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"ip-192.168.24.12_stop_0 controller-0" -> "all_stopped" [ style = bold] "ip-192.168.24.12_stop_0 controller-0" -> "do_shutdown controller-0" [ style = bold] "ip-192.168.24.12_stop_0 controller-0" -> "ip-192.168.24.12_start_0 controller-2" [ style = bold] "ip-192.168.24.12_stop_0 controller-0" [ style=bold color="green" fontcolor="black"] @@ -30,7 +26,6 @@ digraph "g" { "openstack-cinder-volume-docker-0_start_0 controller-2" -> "openstack-cinder-volume-docker-0_monitor_60000 controller-2" [ style = bold] "openstack-cinder-volume-docker-0_start_0 controller-2" -> "openstack-cinder-volume_running_0" [ style = bold] "openstack-cinder-volume-docker-0_start_0 controller-2" [ style=bold color="green" fontcolor="black"] -"openstack-cinder-volume-docker-0_stop_0 controller-0" -> "all_stopped" [ style = bold] "openstack-cinder-volume-docker-0_stop_0 controller-0" -> "do_shutdown controller-0" [ style = bold] "openstack-cinder-volume-docker-0_stop_0 controller-0" -> "openstack-cinder-volume-docker-0_start_0 controller-2" [ style = bold] "openstack-cinder-volume-docker-0_stop_0 controller-0" -> "openstack-cinder-volume_stopped_0" [ style = bold] @@ -46,7 +41,6 @@ digraph "g" { "rabbitmq-bundle-0_start_0 controller-1" -> "rabbitmq_monitor_10000 rabbitmq-bundle-0" [ style = dashed] "rabbitmq-bundle-0_start_0 controller-1" -> "rabbitmq_start_0 rabbitmq-bundle-0" [ style = dashed] "rabbitmq-bundle-0_start_0 controller-1" [ style=dashed color="red" fontcolor="black"] -"rabbitmq-bundle-0_stop_0 controller-0" -> "all_stopped" [ style = bold] "rabbitmq-bundle-0_stop_0 controller-0" -> "do_shutdown controller-0" [ style = bold] "rabbitmq-bundle-0_stop_0 controller-0" -> "rabbitmq-bundle-0_start_0 controller-1" [ style = dashed] "rabbitmq-bundle-0_stop_0 controller-0" -> "rabbitmq-bundle-docker-0_stop_0 controller-0" [ style = bold] @@ -55,7 +49,6 @@ digraph "g" { "rabbitmq-bundle-2_monitor_60000 controller-2" [ style=bold color="green" fontcolor="black"] "rabbitmq-bundle-clone_confirmed-post_notify_running_0" -> "rabbitmq-bundle_running_0" [ style = bold] "rabbitmq-bundle-clone_confirmed-post_notify_running_0" [ style=bold color="green" fontcolor="orange"] -"rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "all_stopped" [ style = bold] "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "rabbitmq-bundle-clone_pre_notify_start_0" [ style = bold] "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" -> "rabbitmq-bundle_stopped_0" [ style = bold] "rabbitmq-bundle-clone_confirmed-post_notify_stopped_0" [ style=bold color="green" fontcolor="orange"] @@ -89,7 +82,6 @@ digraph "g" { "rabbitmq-bundle-clone_stopped_0" -> "rabbitmq-bundle-clone_post_notify_stopped_0" [ style = bold] "rabbitmq-bundle-clone_stopped_0" -> "rabbitmq-bundle-clone_start_0" [ style = bold] "rabbitmq-bundle-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rabbitmq-bundle-docker-0_stop_0 controller-0" -> "all_stopped" [ style = bold] "rabbitmq-bundle-docker-0_stop_0 controller-0" -> "do_shutdown controller-0" [ style = bold] "rabbitmq-bundle-docker-0_stop_0 controller-0" -> "rabbitmq-bundle_stopped_0" [ style = bold] "rabbitmq-bundle-docker-0_stop_0 controller-0" [ style=bold color="green" fontcolor="black"] @@ -113,7 +105,6 @@ digraph "g" { "rabbitmq_start_0 rabbitmq-bundle-0" -> "rabbitmq-bundle-clone_running_0" [ style = dashed] "rabbitmq_start_0 rabbitmq-bundle-0" -> "rabbitmq_monitor_10000 rabbitmq-bundle-0" [ style = dashed] "rabbitmq_start_0 rabbitmq-bundle-0" [ style=dashed color="red" fontcolor="black"] -"rabbitmq_stop_0 rabbitmq-bundle-0" -> "all_stopped" [ style = bold] "rabbitmq_stop_0 rabbitmq-bundle-0" -> "rabbitmq-bundle-0_stop_0 controller-0" [ style = bold] "rabbitmq_stop_0 rabbitmq-bundle-0" -> "rabbitmq-bundle-clone_stopped_0" [ style = bold] "rabbitmq_stop_0 rabbitmq-bundle-0" -> "rabbitmq_start_0 rabbitmq-bundle-0" [ style = dashed] diff --git a/pengine/test10/route-remote-notify.exp b/pengine/test10/route-remote-notify.exp index 339555e..0cbaea7 100644 --- a/pengine/test10/route-remote-notify.exp +++ b/pengine/test10/route-remote-notify.exp @@ -1,142 +1,142 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -144,131 +144,131 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -278,13 +278,13 @@ - + - + @@ -302,7 +302,7 @@ - + @@ -320,140 +320,140 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -462,40 +462,40 @@ - + - + - + - + - + - + - + - + - + @@ -503,19 +503,19 @@ - + - + - + @@ -523,19 +523,19 @@ - + - + - + @@ -543,22 +543,22 @@ - + - + - + - + @@ -566,46 +566,13 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/route-remote-notify.summary b/pengine/test10/route-remote-notify.summary index 79b676c..7d48a66 100644 --- a/pengine/test10/route-remote-notify.summary +++ b/pengine/test10/route-remote-notify.summary @@ -70,7 +70,6 @@ Executing cluster transition: * Resource action: ip-192.168.24.12 monitor=10000 on controller-2 * Resource action: ip-172.17.1.11 monitor=10000 on controller-1 * Pseudo action: rabbitmq-bundle_stopped_0 - * Pseudo action: all_stopped * Pseudo action: rabbitmq-bundle-clone_confirmed-pre_notify_start_0 * Pseudo action: rabbitmq-bundle-clone_start_0 * Pseudo action: rabbitmq-bundle-clone_running_0 diff --git a/pengine/test10/rsc-discovery-per-node.dot b/pengine/test10/rsc-discovery-per-node.dot index fa35cd8..25b071d 100644 --- a/pengine/test10/rsc-discovery-per-node.dot +++ b/pengine/test10/rsc-discovery-per-node.dot @@ -20,7 +20,6 @@ "FAKE2_start_0 18node3" -> "FAKE2_monitor_60000 18node3" [ style = bold] "FAKE2_start_0 18node3" [ style=bold color="green" fontcolor="black"] "FAKE2_stop_0 18node2" -> "FAKE2_start_0 18node3" [ style = bold] -"FAKE2_stop_0 18node2" -> "all_stopped" [ style = bold] "FAKE2_stop_0 18node2" [ style=bold color="green" fontcolor="black"] "FAKE3_monitor_0 18node3" -> "FAKE3_start_0 18node4" [ style = bold] "FAKE3_monitor_0 18node3" [ style=bold color="green" fontcolor="black"] @@ -30,7 +29,6 @@ "FAKE3_start_0 18node4" -> "FAKE3_monitor_60000 18node4" [ style = bold] "FAKE3_start_0 18node4" [ style=bold color="green" fontcolor="black"] "FAKE3_stop_0 18builder" -> "FAKE3_start_0 18node4" [ style = bold] -"FAKE3_stop_0 18builder" -> "all_stopped" [ style = bold] "FAKE3_stop_0 18builder" [ style=bold color="green" fontcolor="black"] "FAKE4_monitor_0 18node3" -> "FAKE4_start_0 remote1" [ style = bold] "FAKE4_monitor_0 18node3" [ style=bold color="green" fontcolor="black"] @@ -40,7 +38,6 @@ "FAKE4_start_0 remote1" -> "FAKE4_monitor_60000 remote1" [ style = bold] "FAKE4_start_0 remote1" [ style=bold color="green" fontcolor="black"] "FAKE4_stop_0 18node1" -> "FAKE4_start_0 remote1" [ style = bold] -"FAKE4_stop_0 18node1" -> "all_stopped" [ style = bold] "FAKE4_stop_0 18node1" [ style=bold color="green" fontcolor="black"] "FAKE5_monitor_0 18builder" -> "FAKE5_start_0 18builder" [ style = bold] "FAKE5_monitor_0 18builder" [ style=bold color="green" fontcolor="black"] @@ -141,7 +138,6 @@ "FAKECLONE2:5_start_0 18builder" -> "FAKECLONE2-clone_running_0" [ style = bold] "FAKECLONE2:5_start_0 18builder" -> "FAKECLONE2:5_monitor_60000 18builder" [ style = bold] "FAKECLONE2:5_start_0 18builder" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "remote1_monitor_0 18node3" -> "remote1_start_0 18builder" [ style = bold] "remote1_monitor_0 18node3" [ style=bold color="green" fontcolor="black"] "remote1_monitor_0 18node4" -> "remote1_start_0 18builder" [ style = bold] @@ -149,6 +145,7 @@ "remote1_monitor_60000 18builder" [ style=bold color="green" fontcolor="black"] "remote1_start_0 18builder" -> "FAKE4_monitor_60000 remote1" [ style = bold] "remote1_start_0 18builder" -> "FAKE4_start_0 remote1" [ style = bold] +"remote1_start_0 18builder" -> "FAKE4_stop_0 18node1" [ style = bold] "remote1_start_0 18builder" -> "FAKECLONE1:4_monitor_60000 remote1" [ style = bold] "remote1_start_0 18builder" -> "FAKECLONE1:4_start_0 remote1" [ style = bold] "remote1_start_0 18builder" -> "FAKECLONE2:4_monitor_60000 remote1" [ style = bold] diff --git a/pengine/test10/rsc-discovery-per-node.exp b/pengine/test10/rsc-discovery-per-node.exp index 434d9d0..967f0a4 100644 --- a/pengine/test10/rsc-discovery-per-node.exp +++ b/pengine/test10/rsc-discovery-per-node.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,36 +19,36 @@ - + - + - + - + - + - + @@ -57,7 +57,7 @@ - + @@ -66,45 +66,45 @@ - + - + - + - + - + - + - + - + - + @@ -113,7 +113,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -131,7 +131,7 @@ - + @@ -140,7 +140,7 @@ - + @@ -149,39 +149,39 @@ - + - + - + - + - + - + - + @@ -190,7 +190,7 @@ - + @@ -199,7 +199,7 @@ - + @@ -208,39 +208,39 @@ - + - + - + - + - + - + - + @@ -249,7 +249,7 @@ - + @@ -258,7 +258,7 @@ - + @@ -267,54 +267,58 @@ - + - + - + - + - + - + - + - + - + - + + + + + - + @@ -323,7 +327,7 @@ - + @@ -332,45 +336,45 @@ - + - + - + - + - + - + - + - + - + @@ -379,7 +383,7 @@ - + @@ -388,7 +392,7 @@ - + @@ -397,7 +401,7 @@ - + @@ -406,7 +410,7 @@ - + @@ -415,33 +419,33 @@ - + - + - + - + - + @@ -450,33 +454,33 @@ - + - + - + - + - + @@ -485,33 +489,33 @@ - + - + - + - + - + @@ -520,33 +524,33 @@ - + - + - + - + - + @@ -555,65 +559,65 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -622,87 +626,87 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -711,33 +715,33 @@ - + - + - + - + - + @@ -746,33 +750,33 @@ - + - + - + - + - + @@ -781,33 +785,33 @@ - + - + - + - + - + @@ -816,65 +820,65 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -883,73 +887,55 @@ - + - + - + - + - + - + - + - + - + - - - - - - - + - + - - - - - - - - - - - - - + - + - + diff --git a/pengine/test10/rsc-discovery-per-node.summary b/pengine/test10/rsc-discovery-per-node.summary index 88b4623..d388656 100644 --- a/pengine/test10/rsc-discovery-per-node.summary +++ b/pengine/test10/rsc-discovery-per-node.summary @@ -51,7 +51,6 @@ Executing cluster transition: * Resource action: FAKE3 stop on 18builder * Resource action: FAKE3 monitor on 18node4 * Resource action: FAKE3 monitor on 18node3 - * Resource action: FAKE4 stop on 18node1 * Resource action: FAKE4 monitor on 18node4 * Resource action: FAKE4 monitor on 18node3 * Resource action: FAKE5 monitor on 18node4 @@ -71,12 +70,11 @@ Executing cluster transition: * Resource action: FAKECLONE2:3 monitor on 18node4 * Resource action: FAKECLONE2:5 monitor on 18builder * Pseudo action: FAKECLONE2-clone_start_0 - * Pseudo action: all_stopped * Resource action: remote1 start on 18builder * Resource action: FAKE1 start on 18node2 * Resource action: FAKE2 start on 18node3 * Resource action: FAKE3 start on 18node4 - * Resource action: FAKE4 start on remote1 + * Resource action: FAKE4 stop on 18node1 * Resource action: FAKE5 start on 18builder * Resource action: FAKECLONE1:0 start on 18node1 * Resource action: FAKECLONE1:1 start on 18node2 @@ -96,7 +94,7 @@ Executing cluster transition: * Resource action: FAKE1 monitor=60000 on 18node2 * Resource action: FAKE2 monitor=60000 on 18node3 * Resource action: FAKE3 monitor=60000 on 18node4 - * Resource action: FAKE4 monitor=60000 on remote1 + * Resource action: FAKE4 start on remote1 * Resource action: FAKE5 monitor=60000 on 18builder * Resource action: FAKECLONE1:0 monitor=60000 on 18node1 * Resource action: FAKECLONE1:1 monitor=60000 on 18node2 @@ -110,6 +108,7 @@ Executing cluster transition: * Resource action: FAKECLONE2:3 monitor=60000 on 18node4 * Resource action: FAKECLONE2:4 monitor=60000 on remote1 * Resource action: FAKECLONE2:5 monitor=60000 on 18builder + * Resource action: FAKE4 monitor=60000 on remote1 Revised cluster status: Online: [ 18builder 18node1 18node2 18node3 18node4 ] diff --git a/pengine/test10/rsc-sets-clone-1.dot b/pengine/test10/rsc-sets-clone-1.dot index 18a8865..d44614d 100644 --- a/pengine/test10/rsc-sets-clone-1.dot +++ b/pengine/test10/rsc-sets-clone-1.dot @@ -1,5 +1,4 @@ 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] @@ -66,7 +65,6 @@ digraph "g" { "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" -> "all_stopped" [ style = bold] "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" -> "baseclone_start_0" [ style = bold] diff --git a/pengine/test10/rsc-sets-clone-1.exp b/pengine/test10/rsc-sets-clone-1.exp index 3a829b1..bdca03a 100644 --- a/pengine/test10/rsc-sets-clone-1.exp +++ b/pengine/test10/rsc-sets-clone-1.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,17 +55,17 @@ - + - + - + @@ -78,87 +78,87 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -167,23 +167,23 @@ - + - + - + - + @@ -192,23 +192,23 @@ - + - + - + - + @@ -217,36 +217,36 @@ - + - + - + - + - + - + @@ -255,36 +255,36 @@ - + - + - + - + - + - + @@ -293,23 +293,23 @@ - + - + - + - + @@ -318,23 +318,23 @@ - + - + - + - + @@ -343,36 +343,36 @@ - + - + - + - + - + - + @@ -381,55 +381,55 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -438,33 +438,33 @@ - + - + - + - + - + @@ -473,7 +473,7 @@ - + @@ -481,23 +481,10 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/rsc-sets-clone-1.summary b/pengine/test10/rsc-sets-clone-1.summary index 1f78d20..9b8eda5 100644 --- a/pengine/test10/rsc-sets-clone-1.summary +++ b/pengine/test10/rsc-sets-clone-1.summary @@ -49,7 +49,6 @@ Executing cluster transition: * Resource action: stonithsys2 monitor on sys3 * Pseudo action: load_stopped_sys3 * Pseudo action: load_stopped_sys2 - * Pseudo action: all_stopped * Pseudo action: basegrp:1_start_0 * Resource action: controld:1 start on sys3 * Resource action: clvmd:1 start on sys3 diff --git a/pengine/test10/rsc-sets-clone.dot b/pengine/test10/rsc-sets-clone.dot index aa46523..7b6c273 100644 --- a/pengine/test10/rsc-sets-clone.dot +++ b/pengine/test10/rsc-sets-clone.dot @@ -1,20 +1,16 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "clone-rsc_stop_0" -> "clone-rsc_stopped_0" [ style = bold] "clone-rsc_stop_0" -> "rsc:0_stop_0 node1" [ style = bold] "clone-rsc_stop_0" [ style=bold color="green" fontcolor="orange" ] "clone-rsc_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "clone-rsc_stop_0" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold] "rsc1_stop_0 node1" [ 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" -> "clone-rsc_stop_0" [ style = bold] "rsc3_stop_0 node1" -> "rsc3_start_0 node2" [ style = bold] "rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc:0_stop_0 node1" -> "all_stopped" [ style = bold] "rsc:0_stop_0 node1" -> "clone-rsc_stopped_0" [ style = bold] "rsc:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/rsc-sets-clone.exp b/pengine/test10/rsc-sets-clone.exp index 7a36e97..a9fa7cb 100644 --- a/pengine/test10/rsc-sets-clone.exp +++ b/pengine/test10/rsc-sets-clone.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,20 +23,20 @@ - + - + - + @@ -45,62 +45,44 @@ - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/rsc-sets-clone.summary b/pengine/test10/rsc-sets-clone.summary index 43f9e0f..6e67f42 100644 --- a/pengine/test10/rsc-sets-clone.summary +++ b/pengine/test10/rsc-sets-clone.summary @@ -22,7 +22,6 @@ Executing cluster transition: * Resource action: rsc3 start on node2 * Resource action: rsc:0 stop on node1 * Pseudo action: clone-rsc_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Node node1: standby diff --git a/pengine/test10/rsc-sets-master.dot b/pengine/test10/rsc-sets-master.dot index 6a0c636..95d340f 100644 --- a/pengine/test10/rsc-sets-master.dot +++ b/pengine/test10/rsc-sets-master.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "ms-rsc_demote_0" -> "ms-rsc_demoted_0" [ style = bold] "ms-rsc_demote_0" -> "rsc:0_demote_0 node1" [ style = bold] "ms-rsc_demote_0" [ style=bold color="green" fontcolor="orange" ] @@ -18,24 +17,20 @@ digraph "g" { "ms-rsc_stopped_0" -> "ms-rsc_promote_0" [ style = bold] "ms-rsc_stopped_0" [ style=bold color="green" fontcolor="orange" ] "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "ms-rsc_demote_0" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_start_0 node2" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "ms-rsc_demote_0" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node1" [ 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" -> "ms-rsc_demote_0" [ style = bold] "rsc3_stop_0 node1" -> "rsc3_start_0 node2" [ style = bold] "rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc:0_demote_0 node1" -> "ms-rsc_demoted_0" [ style = bold] "rsc:0_demote_0 node1" -> "rsc:0_stop_0 node1" [ style = bold] "rsc:0_demote_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc:0_stop_0 node1" -> "all_stopped" [ style = bold] "rsc:0_stop_0 node1" -> "ms-rsc_stopped_0" [ style = bold] "rsc:0_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc:1_promote_0 node2" -> "ms-rsc_promoted_0" [ style = bold] diff --git a/pengine/test10/rsc-sets-master.exp b/pengine/test10/rsc-sets-master.exp index efedf4b..682f588 100644 --- a/pengine/test10/rsc-sets-master.exp +++ b/pengine/test10/rsc-sets-master.exp @@ -1,152 +1,152 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -155,23 +155,23 @@ - + - + - + - + @@ -180,49 +180,27 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/rsc-sets-master.summary b/pengine/test10/rsc-sets-master.summary index 126edc7..21a1fb4 100644 --- a/pengine/test10/rsc-sets-master.summary +++ b/pengine/test10/rsc-sets-master.summary @@ -27,7 +27,6 @@ Executing cluster transition: * Pseudo action: ms-rsc_stop_0 * Resource action: rsc:0 stop on node1 * Pseudo action: ms-rsc_stopped_0 - * Pseudo action: all_stopped * Pseudo action: ms-rsc_promote_0 * Resource action: rsc:1 promote on node2 * Pseudo action: ms-rsc_promoted_0 diff --git a/pengine/test10/rsc-sets-seq-false.dot b/pengine/test10/rsc-sets-seq-false.dot index 2dbbd74..a5ef523 100644 --- a/pengine/test10/rsc-sets-seq-false.dot +++ b/pengine/test10/rsc-sets-seq-false.dot @@ -1,13 +1,10 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_start_0 node2" -> "rsc2_start_0 node2" [ style = bold] "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" ] "rsc2_start_0 node2" -> "rsc3_start_0 node2" [ style = bold] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "rsc1_stop_0 node1" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] @@ -15,22 +12,18 @@ digraph "g" { "rsc3_start_0 node2" -> "rsc5_start_0 node2" [ style = bold] "rsc3_start_0 node2" -> "rsc6_start_0 node2" [ style = bold] "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc3_stop_0 node1" -> "all_stopped" [ style = bold] "rsc3_stop_0 node1" -> "rsc2_stop_0 node1" [ style = bold] "rsc3_stop_0 node1" -> "rsc3_start_0 node2" [ style = bold] "rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc4_stop_0 node1" -> "all_stopped" [ style = bold] "rsc4_stop_0 node1" -> "rsc3_stop_0 node1" [ style = bold] "rsc4_stop_0 node1" -> "rsc4_start_0 node2" [ style = bold] "rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc5_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc5_stop_0 node1" -> "all_stopped" [ style = bold] "rsc5_stop_0 node1" -> "rsc3_stop_0 node1" [ style = bold] "rsc5_stop_0 node1" -> "rsc5_start_0 node2" [ style = bold] "rsc5_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc6_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc6_stop_0 node1" -> "all_stopped" [ style = bold] "rsc6_stop_0 node1" -> "rsc3_stop_0 node1" [ style = bold] "rsc6_stop_0 node1" -> "rsc6_start_0 node2" [ style = bold] "rsc6_stop_0 node1" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/rsc-sets-seq-false.exp b/pengine/test10/rsc-sets-seq-false.exp index 33a15af..b3f22c0 100644 --- a/pengine/test10/rsc-sets-seq-false.exp +++ b/pengine/test10/rsc-sets-seq-false.exp @@ -1,113 +1,113 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -116,23 +116,23 @@ - + - + - + - + @@ -141,55 +141,27 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/rsc-sets-seq-false.summary b/pengine/test10/rsc-sets-seq-false.summary index 5774f69..8b3ebd4 100644 --- a/pengine/test10/rsc-sets-seq-false.summary +++ b/pengine/test10/rsc-sets-seq-false.summary @@ -25,7 +25,6 @@ Executing cluster transition: * Resource action: rsc3 stop on node1 * Resource action: rsc2 stop on node1 * Resource action: rsc1 stop on node1 - * Pseudo action: all_stopped * Resource action: rsc1 start on node2 * Resource action: rsc2 start on node2 * Resource action: rsc3 start on node2 diff --git a/pengine/test10/rsc-sets-seq-true.dot b/pengine/test10/rsc-sets-seq-true.dot index 1e7d7be..2843b73 100644 --- a/pengine/test10/rsc-sets-seq-true.dot +++ b/pengine/test10/rsc-sets-seq-true.dot @@ -1,36 +1,29 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_start_0 node2" -> "rsc2_start_0 node2" [ style = bold] "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" ] "rsc2_start_0 node2" -> "rsc3_start_0 node2" [ style = bold] "rsc2_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "rsc1_stop_0 node1" [ style = bold] "rsc2_stop_0 node1" -> "rsc2_start_0 node2" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc3_start_0 node2" -> "rsc4_start_0 node2" [ style = bold] "rsc3_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc3_stop_0 node1" -> "all_stopped" [ style = bold] "rsc3_stop_0 node1" -> "rsc2_stop_0 node1" [ style = bold] "rsc3_stop_0 node1" -> "rsc3_start_0 node2" [ style = bold] "rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc4_start_0 node2" -> "rsc5_start_0 node2" [ style = bold] "rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc4_stop_0 node1" -> "all_stopped" [ style = bold] "rsc4_stop_0 node1" -> "rsc3_stop_0 node1" [ style = bold] "rsc4_stop_0 node1" -> "rsc4_start_0 node2" [ style = bold] "rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc5_start_0 node2" -> "rsc6_start_0 node2" [ style = bold] "rsc5_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc5_stop_0 node1" -> "all_stopped" [ style = bold] "rsc5_stop_0 node1" -> "rsc4_stop_0 node1" [ style = bold] "rsc5_stop_0 node1" -> "rsc5_start_0 node2" [ style = bold] "rsc5_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc6_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc6_stop_0 node1" -> "all_stopped" [ style = bold] "rsc6_stop_0 node1" -> "rsc5_stop_0 node1" [ style = bold] "rsc6_stop_0 node1" -> "rsc6_start_0 node2" [ style = bold] "rsc6_stop_0 node1" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/rsc-sets-seq-true.exp b/pengine/test10/rsc-sets-seq-true.exp index a4fbb0c..5d2f371 100644 --- a/pengine/test10/rsc-sets-seq-true.exp +++ b/pengine/test10/rsc-sets-seq-true.exp @@ -1,197 +1,169 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/rsc-sets-seq-true.summary b/pengine/test10/rsc-sets-seq-true.summary index aba86c6..f73b7c0 100644 --- a/pengine/test10/rsc-sets-seq-true.summary +++ b/pengine/test10/rsc-sets-seq-true.summary @@ -25,7 +25,6 @@ Executing cluster transition: * Resource action: rsc3 stop on node1 * Resource action: rsc2 stop on node1 * Resource action: rsc1 stop on node1 - * Pseudo action: all_stopped * Resource action: rsc1 start on node2 * Resource action: rsc2 start on node2 * Resource action: rsc3 start on node2 diff --git a/pengine/test10/rsc_dep1.exp b/pengine/test10/rsc_dep1.exp index bf2e393..50b7506 100644 --- a/pengine/test10/rsc_dep1.exp +++ b/pengine/test10/rsc_dep1.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,23 +35,23 @@ - + - + - + - + @@ -60,7 +60,7 @@ - + diff --git a/pengine/test10/rsc_dep10.exp b/pengine/test10/rsc_dep10.exp index a15eb0b..74e82f4 100644 --- a/pengine/test10/rsc_dep10.exp +++ b/pengine/test10/rsc_dep10.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,23 +19,23 @@ - + - + - + - + @@ -44,7 +44,7 @@ - + diff --git a/pengine/test10/rsc_dep2.exp b/pengine/test10/rsc_dep2.exp index a363d82..44fa880 100644 --- a/pengine/test10/rsc_dep2.exp +++ b/pengine/test10/rsc_dep2.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -53,23 +53,23 @@ - + - + - + - + @@ -78,7 +78,7 @@ - + diff --git a/pengine/test10/rsc_dep3.exp b/pengine/test10/rsc_dep3.exp index e9fdede..3bf33b8 100644 --- a/pengine/test10/rsc_dep3.exp +++ b/pengine/test10/rsc_dep3.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,23 +35,23 @@ - + - + - + - + @@ -60,7 +60,7 @@ - + diff --git a/pengine/test10/rsc_dep4.dot b/pengine/test10/rsc_dep4.dot index 0977367..0671a59 100644 --- a/pengine/test10/rsc_dep4.dot +++ b/pengine/test10/rsc_dep4.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black" ] @@ -14,7 +13,6 @@ "rsc4_monitor_0 node2" -> "rsc4_start_0 node2" [ style = bold] "rsc4_monitor_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc4_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc4_stop_0 node1" -> "all_stopped" [ style = bold] "rsc4_stop_0 node1" -> "rsc4_start_0 node2" [ style = bold] "rsc4_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/rsc_dep4.exp b/pengine/test10/rsc_dep4.exp index f9c75fc..ba5f87b 100644 --- a/pengine/test10/rsc_dep4.exp +++ b/pengine/test10/rsc_dep4.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,23 +35,23 @@ - + - + - + - + @@ -60,7 +60,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -78,23 +78,23 @@ - + - + - + - + @@ -103,24 +103,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/rsc_dep4.summary b/pengine/test10/rsc_dep4.summary index e97105e..245c1bf 100644 --- a/pengine/test10/rsc_dep4.summary +++ b/pengine/test10/rsc_dep4.summary @@ -20,7 +20,6 @@ Executing cluster transition: * Resource action: rsc1 monitor on node2 * Resource action: rsc3 monitor on node2 * Resource action: rsc3 monitor on node1 - * Pseudo action: all_stopped * Resource action: rsc2 start on node1 * Resource action: rsc4 start on node2 * Resource action: rsc3 start on node2 diff --git a/pengine/test10/rsc_dep5.exp b/pengine/test10/rsc_dep5.exp index 51ed0ff..5647d46 100644 --- a/pengine/test10/rsc_dep5.exp +++ b/pengine/test10/rsc_dep5.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,23 +35,23 @@ - + - + - + - + @@ -60,7 +60,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -78,7 +78,7 @@ - + diff --git a/pengine/test10/rsc_dep7.exp b/pengine/test10/rsc_dep7.exp index 056defe..e75ae29 100644 --- a/pengine/test10/rsc_dep7.exp +++ b/pengine/test10/rsc_dep7.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,23 +35,23 @@ - + - + - + - + @@ -60,7 +60,7 @@ - + @@ -69,23 +69,23 @@ - + - + - + - + @@ -94,7 +94,7 @@ - + diff --git a/pengine/test10/rsc_dep8.exp b/pengine/test10/rsc_dep8.exp index a363d82..44fa880 100644 --- a/pengine/test10/rsc_dep8.exp +++ b/pengine/test10/rsc_dep8.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -53,23 +53,23 @@ - + - + - + - + @@ -78,7 +78,7 @@ - + diff --git a/pengine/test10/simple11.exp b/pengine/test10/simple11.exp index 496952f..22f303e 100644 --- a/pengine/test10/simple11.exp +++ b/pengine/test10/simple11.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,23 +35,23 @@ - + - + - + - + @@ -60,7 +60,7 @@ - + diff --git a/pengine/test10/simple12.exp b/pengine/test10/simple12.exp index 1d7c816..e3c9e5b 100644 --- a/pengine/test10/simple12.exp +++ b/pengine/test10/simple12.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,23 +35,23 @@ - + - + - + - + @@ -60,7 +60,7 @@ - + diff --git a/pengine/test10/simple2.exp b/pengine/test10/simple2.exp index d86378f..87ae235 100644 --- a/pengine/test10/simple2.exp +++ b/pengine/test10/simple2.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + diff --git a/pengine/test10/simple3.exp b/pengine/test10/simple3.exp index 6b04dbe..6f7416e 100644 --- a/pengine/test10/simple3.exp +++ b/pengine/test10/simple3.exp @@ -1,7 +1,7 @@ - + diff --git a/pengine/test10/simple4.dot b/pengine/test10/simple4.dot index 508f367..3f483be 100644 --- a/pengine/test10/simple4.dot +++ b/pengine/test10/simple4.dot @@ -1,5 +1,3 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/simple4.exp b/pengine/test10/simple4.exp index 080bd96..3b5047a 100644 --- a/pengine/test10/simple4.exp +++ b/pengine/test10/simple4.exp @@ -8,17 +8,4 @@ - - - - - - - - - - - - - diff --git a/pengine/test10/simple4.summary b/pengine/test10/simple4.summary index 8484938..7bdc064 100644 --- a/pengine/test10/simple4.summary +++ b/pengine/test10/simple4.summary @@ -9,7 +9,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on node1 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 ] diff --git a/pengine/test10/simple6.dot b/pengine/test10/simple6.dot index 9a91fd2..e4a27ae 100644 --- a/pengine/test10/simple6.dot +++ b/pengine/test10/simple6.dot @@ -1,6 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "rsc2_start_0 node1" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_monitor_0 node1" -> "rsc2_start_0 node1" [ style = bold] diff --git a/pengine/test10/simple6.exp b/pengine/test10/simple6.exp index 555a61e..a795980 100644 --- a/pengine/test10/simple6.exp +++ b/pengine/test10/simple6.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,24 +26,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/simple6.summary b/pengine/test10/simple6.summary index 58b3e55..33d0b4d 100644 --- a/pengine/test10/simple6.summary +++ b/pengine/test10/simple6.summary @@ -12,7 +12,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc2 monitor on node1 * Resource action: rsc1 stop on node1 - * Pseudo action: all_stopped * Resource action: rsc2 start on node1 Revised cluster status: diff --git a/pengine/test10/simple7.dot b/pengine/test10/simple7.dot index 9e6ca4f..5a15347 100644 --- a/pengine/test10/simple7.dot +++ b/pengine/test10/simple7.dot @@ -1,7 +1,5 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "do_shutdown node1" [ 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" ] } diff --git a/pengine/test10/simple7.exp b/pengine/test10/simple7.exp index 1e0a6a8..bd731c3 100644 --- a/pengine/test10/simple7.exp +++ b/pengine/test10/simple7.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,19 +19,7 @@ - - - - - - - - - - - - - + diff --git a/pengine/test10/simple7.summary b/pengine/test10/simple7.summary index 3b71657..48ef28a 100644 --- a/pengine/test10/simple7.summary +++ b/pengine/test10/simple7.summary @@ -11,7 +11,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on node1 * Cluster action: do_shutdown on node1 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 ] diff --git a/pengine/test10/simple8.exp b/pengine/test10/simple8.exp index 5479c0f..6d03605 100644 --- a/pengine/test10/simple8.exp +++ b/pengine/test10/simple8.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/pengine/test10/site-specific-params.exp b/pengine/test10/site-specific-params.exp index 445167a..6644ecb 100644 --- a/pengine/test10/site-specific-params.exp +++ b/pengine/test10/site-specific-params.exp @@ -1,39 +1,39 @@ - + - + - + - + - + - + - + @@ -42,7 +42,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/pengine/test10/standby.dot b/pengine/test10/standby.dot index ec4356f..94884de 100644 --- a/pengine/test10/standby.dot +++ b/pengine/test10/standby.dot @@ -5,7 +5,6 @@ "Filesystem_13_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "Filesystem_13_stop_0 sapcl02" -> "Filesystem_13_start_0 sapcl01" [ style = bold] "Filesystem_13_stop_0 sapcl02" -> "LVM_12_stop_0 sapcl02" [ style = bold] -"Filesystem_13_stop_0 sapcl02" -> "all_stopped" [ style = bold] "Filesystem_13_stop_0 sapcl02" -> "app02_stopped_0" [ style = bold] "Filesystem_13_stop_0 sapcl02" [ style=bold color="green" fontcolor="black" ] "Filesystem_23_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ] @@ -15,7 +14,6 @@ "Filesystem_23_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "Filesystem_23_stop_0 sapcl03" -> "Filesystem_23_start_0 sapcl01" [ style = bold] "Filesystem_23_stop_0 sapcl03" -> "LVM_22_stop_0 sapcl03" [ style = bold] -"Filesystem_23_stop_0 sapcl03" -> "all_stopped" [ style = bold] "Filesystem_23_stop_0 sapcl03" -> "oracle_stopped_0" [ style = bold] "Filesystem_23_stop_0 sapcl03" [ style=bold color="green" fontcolor="black" ] "IPaddr_192_168_1_102_monitor_5000 sapcl01" [ style=bold color="green" fontcolor="black" ] @@ -24,7 +22,6 @@ "IPaddr_192_168_1_102_start_0 sapcl01" -> "app02_running_0" [ style = bold] "IPaddr_192_168_1_102_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "IPaddr_192_168_1_102_stop_0 sapcl02" -> "IPaddr_192_168_1_102_start_0 sapcl01" [ style = bold] -"IPaddr_192_168_1_102_stop_0 sapcl02" -> "all_stopped" [ style = bold] "IPaddr_192_168_1_102_stop_0 sapcl02" -> "app02_stopped_0" [ style = bold] "IPaddr_192_168_1_102_stop_0 sapcl02" [ style=bold color="green" fontcolor="black" ] "IPaddr_192_168_1_104_monitor_5000 sapcl01" [ style=bold color="green" fontcolor="black" ] @@ -33,7 +30,6 @@ "IPaddr_192_168_1_104_start_0 sapcl01" -> "oracle_running_0" [ style = bold] "IPaddr_192_168_1_104_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "IPaddr_192_168_1_104_stop_0 sapcl03" -> "IPaddr_192_168_1_104_start_0 sapcl01" [ style = bold] -"IPaddr_192_168_1_104_stop_0 sapcl03" -> "all_stopped" [ style = bold] "IPaddr_192_168_1_104_stop_0 sapcl03" -> "oracle_stopped_0" [ style = bold] "IPaddr_192_168_1_104_stop_0 sapcl03" [ style=bold color="green" fontcolor="black" ] "LVM_12_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ] @@ -43,7 +39,6 @@ "LVM_12_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "LVM_12_stop_0 sapcl02" -> "IPaddr_192_168_1_102_stop_0 sapcl02" [ style = bold] "LVM_12_stop_0 sapcl02" -> "LVM_12_start_0 sapcl01" [ style = bold] -"LVM_12_stop_0 sapcl02" -> "all_stopped" [ style = bold] "LVM_12_stop_0 sapcl02" -> "app02_stopped_0" [ style = bold] "LVM_12_stop_0 sapcl02" [ style=bold color="green" fontcolor="black" ] "LVM_22_monitor_120000 sapcl01" [ style=bold color="green" fontcolor="black" ] @@ -53,10 +48,8 @@ "LVM_22_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "LVM_22_stop_0 sapcl03" -> "IPaddr_192_168_1_104_stop_0 sapcl03" [ style = bold] "LVM_22_stop_0 sapcl03" -> "LVM_22_start_0 sapcl01" [ style = bold] -"LVM_22_stop_0 sapcl03" -> "all_stopped" [ style = bold] "LVM_22_stop_0 sapcl03" -> "oracle_stopped_0" [ style = bold] "LVM_22_stop_0 sapcl03" [ style=bold color="green" fontcolor="black" ] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "app02_running_0" [ style=bold color="green" fontcolor="orange" ] "app02_start_0" -> "Filesystem_13_start_0 sapcl01" [ style = bold] "app02_start_0" -> "IPaddr_192_168_1_102_start_0 sapcl01" [ style = bold] @@ -76,7 +69,6 @@ "oracle_24_start_0 sapcl01" -> "oralsnr_25_start_0 sapcl01" [ style = bold] "oracle_24_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] "oracle_24_stop_0 sapcl03" -> "Filesystem_23_stop_0 sapcl03" [ style = bold] -"oracle_24_stop_0 sapcl03" -> "all_stopped" [ style = bold] "oracle_24_stop_0 sapcl03" -> "oracle_24_start_0 sapcl01" [ style = bold] "oracle_24_stop_0 sapcl03" -> "oracle_stopped_0" [ style = bold] "oracle_24_stop_0 sapcl03" [ style=bold color="green" fontcolor="black" ] @@ -101,7 +93,6 @@ "oralsnr_25_start_0 sapcl01" -> "oracle_running_0" [ style = bold] "oralsnr_25_start_0 sapcl01" -> "oralsnr_25_monitor_120000 sapcl01" [ style = bold] "oralsnr_25_start_0 sapcl01" [ style=bold color="green" fontcolor="black" ] -"oralsnr_25_stop_0 sapcl03" -> "all_stopped" [ style = bold] "oralsnr_25_stop_0 sapcl03" -> "oracle_24_stop_0 sapcl03" [ style = bold] "oralsnr_25_stop_0 sapcl03" -> "oracle_stopped_0" [ style = bold] "oralsnr_25_stop_0 sapcl03" -> "oralsnr_25_start_0 sapcl01" [ style = bold] diff --git a/pengine/test10/standby.exp b/pengine/test10/standby.exp index 820331a..9b47e1d 100644 --- a/pengine/test10/standby.exp +++ b/pengine/test10/standby.exp @@ -1,28 +1,28 @@ - + - + - + - + - + - + @@ -30,205 +30,205 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -236,307 +236,274 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/standby.summary b/pengine/test10/standby.summary index f4d53a1..27a16d9 100644 --- a/pengine/test10/standby.summary +++ b/pengine/test10/standby.summary @@ -49,7 +49,6 @@ Executing cluster transition: * Resource action: LVM_12 monitor=120000 on sapcl01 * Resource action: Filesystem_13 monitor=120000 on sapcl01 * Resource action: IPaddr_192_168_1_104 stop on sapcl03 - * Pseudo action: all_stopped * Pseudo action: oracle_stopped_0 * Pseudo action: oracle_start_0 * Resource action: IPaddr_192_168_1_104 start on sapcl01 diff --git a/pengine/test10/start-then-stop-with-unfence.dot b/pengine/test10/start-then-stop-with-unfence.dot index b324339..a28c5af 100644 --- a/pengine/test10/start-then-stop-with-unfence.dot +++ b/pengine/test10/start-then-stop-with-unfence.dot @@ -1,9 +1,7 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "ip1_monitor_10000 rhel7-node1.example.com" [ style=bold color="green" fontcolor="black"] "ip1_start_0 rhel7-node1.example.com" -> "ip1_monitor_10000 rhel7-node1.example.com" [ style = bold] "ip1_start_0 rhel7-node1.example.com" [ style=bold color="green" fontcolor="black"] -"ip1_stop_0 rhel7-node2.example.com" -> "all_stopped" [ style = bold] "ip1_stop_0 rhel7-node2.example.com" -> "ip1_start_0 rhel7-node1.example.com" [ style = bold] "ip1_stop_0 rhel7-node2.example.com" [ style=bold color="green" fontcolor="black"] "jrummy-clone_running_0" -> "ip1_stop_0 rhel7-node2.example.com" [ style = bold] diff --git a/pengine/test10/start-then-stop-with-unfence.exp b/pengine/test10/start-then-stop-with-unfence.exp index 715ba40..b186858 100644 --- a/pengine/test10/start-then-stop-with-unfence.exp +++ b/pengine/test10/start-then-stop-with-unfence.exp @@ -1,148 +1,148 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -150,22 +150,10 @@ - + - - - - - - - - - - - - diff --git a/pengine/test10/start-then-stop-with-unfence.summary b/pengine/test10/start-then-stop-with-unfence.summary index b2114d7..e2ed7f1 100644 --- a/pengine/test10/start-then-stop-with-unfence.summary +++ b/pengine/test10/start-then-stop-with-unfence.summary @@ -26,7 +26,6 @@ Executing cluster transition: * Resource action: mpath-node1 start on rhel7-node1.example.com * Resource action: ip1 stop on rhel7-node2.example.com * Resource action: jrummy monitor=10000 on rhel7-node1.example.com - * Pseudo action: all_stopped * Resource action: mpath-node1 monitor=60000 on rhel7-node1.example.com * Resource action: ip1 start on rhel7-node1.example.com * Resource action: ip1 monitor=10000 on rhel7-node1.example.com diff --git a/pengine/test10/stonith-0.dot b/pengine/test10/stonith-0.dot index 8ad32fd..892a033 100644 --- a/pengine/test10/stonith-0.dot +++ b/pengine/test10/stonith-0.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:4_monitor_20000 c001n08" [ 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] @@ -21,7 +20,6 @@ digraph "g" { "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] @@ -32,11 +30,9 @@ digraph "g" { "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="orange" ] -"ocf_192.168.100.181_stop_0 c001n05" -> "all_stopped" [ style = bold] "ocf_192.168.100.181_stop_0 c001n05" -> "group-1_stopped_0" [ style = bold] "ocf_192.168.100.181_stop_0 c001n05" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold] "ocf_192.168.100.181_stop_0 c001n05" [ style=bold color="green" fontcolor="orange" ] @@ -44,12 +40,10 @@ digraph "g" { "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="orange" ] -"ocf_192.168.100.183_stop_0 c001n05" -> "all_stopped" [ style = bold] "ocf_192.168.100.183_stop_0 c001n05" -> "group-1_stopped_0" [ style = bold] "ocf_192.168.100.183_stop_0 c001n05" -> "heartbeat_192.168.100.182_stop_0 c001n03" [ style = bold] "ocf_192.168.100.183_stop_0 c001n05" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold] @@ -57,33 +51,33 @@ digraph "g" { "rsc_c001n05_monitor_5000 c001n07" [ style=bold color="green" fontcolor="black" ] "rsc_c001n05_start_0 c001n07" -> "rsc_c001n05_monitor_5000 c001n07" [ style = bold] "rsc_c001n05_start_0 c001n07" [ style=bold color="green" fontcolor="black" ] -"rsc_c001n05_stop_0 c001n05" -> "all_stopped" [ style = bold] "rsc_c001n05_stop_0 c001n05" -> "rsc_c001n05_start_0 c001n07" [ style = bold] "rsc_c001n05_stop_0 c001n05" [ style=bold color="green" fontcolor="orange" ] "rsc_c001n07_monitor_5000 c001n07" [ style=bold color="green" fontcolor="black" ] "rsc_c001n07_start_0 c001n07" -> "rsc_c001n07_monitor_5000 c001n07" [ style = bold] "rsc_c001n07_start_0 c001n07" [ style=bold color="green" fontcolor="black" ] -"rsc_c001n07_stop_0 c001n03" -> "all_stopped" [ style = bold] "rsc_c001n07_stop_0 c001n03" -> "rsc_c001n07_start_0 c001n07" [ style = bold] "rsc_c001n07_stop_0 c001n03" [ style=bold color="green" fontcolor="orange" ] "stonith 'reboot' c001n03" -> "group-1_stop_0" [ style = bold] +"stonith 'reboot' c001n03" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold] "stonith 'reboot' c001n03" -> "heartbeat_192.168.100.182_stop_0 c001n03" [ style = bold] +"stonith 'reboot' c001n03" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold] "stonith 'reboot' c001n03" -> "ocf_192.168.100.181_stop_0 c001n03" [ style = bold] +"stonith 'reboot' c001n03" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold] "stonith 'reboot' c001n03" -> "ocf_192.168.100.183_stop_0 c001n03" [ style = bold] +"stonith 'reboot' c001n03" -> "rsc_c001n05_start_0 c001n07" [ style = bold] +"stonith 'reboot' c001n03" -> "rsc_c001n07_start_0 c001n07" [ style = bold] "stonith 'reboot' c001n03" -> "rsc_c001n07_stop_0 c001n03" [ style = bold] -"stonith 'reboot' c001n03" -> "stonith_complete" [ style = bold] "stonith 'reboot' c001n03" [ style=bold color="green" fontcolor="black"] "stonith 'reboot' c001n05" -> "group-1_stop_0" [ style = bold] +"stonith 'reboot' c001n05" -> "heartbeat_192.168.100.182_start_0 c001n02" [ style = bold] +"stonith 'reboot' c001n05" -> "ocf_192.168.100.181_start_0 c001n02" [ style = bold] "stonith 'reboot' c001n05" -> "ocf_192.168.100.181_stop_0 c001n05" [ style = bold] +"stonith 'reboot' c001n05" -> "ocf_192.168.100.183_start_0 c001n02" [ style = bold] "stonith 'reboot' c001n05" -> "ocf_192.168.100.183_stop_0 c001n05" [ style = bold] +"stonith 'reboot' c001n05" -> "rsc_c001n05_start_0 c001n07" [ style = bold] "stonith 'reboot' c001n05" -> "rsc_c001n05_stop_0 c001n05" [ style = bold] +"stonith 'reboot' c001n05" -> "rsc_c001n07_start_0 c001n07" [ style = bold] "stonith 'reboot' c001n05" -> "stonith 'reboot' c001n03" [ style = bold] "stonith 'reboot' c001n05" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "heartbeat_192.168.100.182_start_0 c001n02" [ 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_c001n05_start_0 c001n07" [ style = bold] -"stonith_complete" -> "rsc_c001n07_start_0 c001n07" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/stonith-0.exp b/pengine/test10/stonith-0.exp index c409992..5102012 100644 --- a/pengine/test10/stonith-0.exp +++ b/pengine/test10/stonith-0.exp @@ -1,34 +1,34 @@ - + - + - + - + - + - + - + - + @@ -43,75 +43,78 @@ - + - + - + - + - + - + - + - + - + - + - + + + + - + - + - + - + @@ -120,16 +123,16 @@ - + - + - + @@ -138,16 +141,16 @@ - + - + - + @@ -156,13 +159,13 @@ - + - + @@ -171,22 +174,25 @@ - + - + - + - + + + + - + @@ -197,57 +203,60 @@ - + - + - + - + - + - + - + - + - + - + - + + + + - + @@ -256,13 +265,13 @@ - + - + @@ -271,42 +280,45 @@ - + - + - + - + - + - + + + + - + @@ -318,36 +330,39 @@ - + - + - + - + + + + - + - + @@ -359,7 +374,7 @@ - + @@ -368,51 +383,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -422,7 +392,7 @@ - + diff --git a/pengine/test10/stonith-0.summary b/pengine/test10/stonith-0.summary index 78f0bbc..8d865a8 100644 --- a/pengine/test10/stonith-0.summary +++ b/pengine/test10/stonith-0.summary @@ -54,7 +54,6 @@ Executing cluster transition: * Pseudo action: ocf_192.168.100.183_stop_0 * Pseudo action: rsc_c001n05_stop_0 * Pseudo action: rsc_c001n07_stop_0 - * Pseudo action: stonith_complete * Pseudo action: heartbeat_192.168.100.182_stop_0 * Resource action: rsc_c001n05 start on c001n07 * Resource action: rsc_c001n07 start on c001n07 @@ -62,7 +61,6 @@ Executing cluster transition: * Pseudo action: ocf_192.168.100.181_stop_0 * Resource action: rsc_c001n05 monitor=5000 on c001n07 * Resource action: rsc_c001n07 monitor=5000 on c001n07 - * Pseudo action: all_stopped * Pseudo action: group-1_stopped_0 * Pseudo action: group-1_start_0 * Resource action: ocf_192.168.100.181 start on c001n02 diff --git a/pengine/test10/stonith-1.dot b/pengine/test10/stonith-1.dot index 3814ac9..c4407a1 100644 --- a/pengine/test10/stonith-1.dot +++ b/pengine/test10/stonith-1.dot @@ -8,13 +8,11 @@ digraph "g" { "DoFencing_stop_0" [ style=bold color="green" fontcolor="orange" ] "DoFencing_stopped_0" -> "DoFencing_start_0" [ style = bold] "DoFencing_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "child_DoFencing:2_monitor_60000 sles-4" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_start_0 sles-4" -> "DoFencing_running_0" [ style = bold] "child_DoFencing:2_start_0 sles-4" -> "child_DoFencing:2_monitor_60000 sles-4" [ style = bold] "child_DoFencing:2_start_0 sles-4" [ style=bold color="green" fontcolor="black" ] "child_DoFencing:2_stop_0 sles-3" -> "DoFencing_stopped_0" [ style = bold] -"child_DoFencing:2_stop_0 sles-3" -> "all_stopped" [ style = bold] "child_DoFencing:2_stop_0 sles-3" -> "child_DoFencing:2_start_0 sles-4" [ style = bold] "child_DoFencing:2_stop_0 sles-3" [ style=bold color="green" fontcolor="orange" ] "group-1_running_0" [ style=bold color="green" fontcolor="orange" ] @@ -40,7 +38,6 @@ digraph "g" { "migrator_monitor_10000 sles-4" [ style=bold color="green" fontcolor="black" ] "migrator_start_0 sles-4" -> "migrator_monitor_10000 sles-4" [ style = bold] "migrator_start_0 sles-4" [ style=bold color="green" fontcolor="black" ] -"migrator_stop_0 sles-3" -> "all_stopped" [ style = bold] "migrator_stop_0 sles-3" -> "migrator_start_0 sles-4" [ style = bold] "migrator_stop_0 sles-3" [ style=bold color="green" fontcolor="orange" ] "ocf_msdummy:0_monitor_5000 sles-4" [ style=bold color="green" fontcolor="black" ] @@ -55,7 +52,6 @@ digraph "g" { "ocf_msdummy:2_start_0 sles-2" -> "master_rsc_1_running_0" [ style = bold] "ocf_msdummy:2_start_0 sles-2" -> "ocf_msdummy:2_monitor_5000 sles-2" [ style = bold] "ocf_msdummy:2_start_0 sles-2" [ style=bold color="green" fontcolor="black" ] -"ocf_msdummy:2_stop_0 sles-3" -> "all_stopped" [ style = bold] "ocf_msdummy:2_stop_0 sles-3" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:2_stop_0 sles-3" -> "ocf_msdummy:2_start_0 sles-2" [ style = bold] "ocf_msdummy:2_stop_0 sles-3" [ style=bold color="green" fontcolor="orange" ] @@ -71,7 +67,6 @@ digraph "g" { "ocf_msdummy:5_start_0 sles-2" -> "master_rsc_1_running_0" [ style = bold] "ocf_msdummy:5_start_0 sles-2" -> "ocf_msdummy:5_monitor_5000 sles-2" [ style = bold] "ocf_msdummy:5_start_0 sles-2" [ style=bold color="green" fontcolor="black" ] -"ocf_msdummy:5_stop_0 sles-3" -> "all_stopped" [ style = bold] "ocf_msdummy:5_stop_0 sles-3" -> "master_rsc_1_stopped_0" [ style = bold] "ocf_msdummy:5_stop_0 sles-3" -> "ocf_msdummy:5_start_0 sles-2" [ style = bold] "ocf_msdummy:5_stop_0 sles-3" [ style=bold color="green" fontcolor="orange" ] @@ -84,26 +79,22 @@ digraph "g" { "rsc_sles-3_monitor_5000 sles-4" [ style=bold color="green" fontcolor="black" ] "rsc_sles-3_start_0 sles-4" -> "rsc_sles-3_monitor_5000 sles-4" [ style = bold] "rsc_sles-3_start_0 sles-4" [ style=bold color="green" fontcolor="black" ] -"rsc_sles-3_stop_0 sles-3" -> "all_stopped" [ style = bold] "rsc_sles-3_stop_0 sles-3" -> "rsc_sles-3_start_0 sles-4" [ style = bold] "rsc_sles-3_stop_0 sles-3" [ style=bold color="green" fontcolor="orange" ] "rsc_sles-4_monitor_5000 sles-4" [ style=bold color="green" fontcolor="black" ] "stonith 'reboot' sles-3" -> "master_rsc_1_stop_0" [ style = bold] +"stonith 'reboot' sles-3" -> "migrator_start_0 sles-4" [ style = bold] "stonith 'reboot' sles-3" -> "migrator_stop_0 sles-3" [ style = bold] +"stonith 'reboot' sles-3" -> "ocf_msdummy:0_start_0 sles-4" [ style = bold] +"stonith 'reboot' sles-3" -> "ocf_msdummy:1_start_0 sles-1" [ style = bold] +"stonith 'reboot' sles-3" -> "ocf_msdummy:2_start_0 sles-2" [ style = bold] "stonith 'reboot' sles-3" -> "ocf_msdummy:2_stop_0 sles-3" [ style = bold] +"stonith 'reboot' sles-3" -> "ocf_msdummy:3_start_0 sles-4" [ style = bold] +"stonith 'reboot' sles-3" -> "ocf_msdummy:4_start_0 sles-1" [ style = bold] +"stonith 'reboot' sles-3" -> "ocf_msdummy:5_start_0 sles-2" [ style = bold] "stonith 'reboot' sles-3" -> "ocf_msdummy:5_stop_0 sles-3" [ style = bold] +"stonith 'reboot' sles-3" -> "r192.168.100.183_start_0 sles-1" [ style = bold] +"stonith 'reboot' sles-3" -> "rsc_sles-3_start_0 sles-4" [ style = bold] "stonith 'reboot' sles-3" -> "rsc_sles-3_stop_0 sles-3" [ style = bold] -"stonith 'reboot' sles-3" -> "stonith_complete" [ style = bold] "stonith 'reboot' sles-3" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "migrator_start_0 sles-4" [ style = bold] -"stonith_complete" -> "ocf_msdummy:0_start_0 sles-4" [ style = bold] -"stonith_complete" -> "ocf_msdummy:1_start_0 sles-1" [ style = bold] -"stonith_complete" -> "ocf_msdummy:2_start_0 sles-2" [ style = bold] -"stonith_complete" -> "ocf_msdummy:3_start_0 sles-4" [ style = bold] -"stonith_complete" -> "ocf_msdummy:4_start_0 sles-1" [ style = bold] -"stonith_complete" -> "ocf_msdummy:5_start_0 sles-2" [ style = bold] -"stonith_complete" -> "r192.168.100.183_start_0 sles-1" [ style = bold] -"stonith_complete" -> "rsc_sles-3_start_0 sles-4" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/stonith-1.exp b/pengine/test10/stonith-1.exp index 2ccd1ef..4c4ba93 100644 --- a/pengine/test10/stonith-1.exp +++ b/pengine/test10/stonith-1.exp @@ -1,22 +1,22 @@ - + - + - + - + @@ -24,7 +24,7 @@ - + @@ -35,36 +35,36 @@ - + - + - + - + - + - + @@ -73,36 +73,36 @@ - + - + - + - + - + - + @@ -114,7 +114,7 @@ - + @@ -123,36 +123,36 @@ - + - + - + - + - + - + @@ -164,7 +164,7 @@ - + @@ -173,63 +173,63 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -237,124 +237,124 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -363,103 +363,103 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -468,31 +468,31 @@ - + - + - + - + - + - + @@ -504,87 +504,48 @@ - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/stonith-1.summary b/pengine/test10/stonith-1.summary index 0e9c2a1..045eb1a 100644 --- a/pengine/test10/stonith-1.summary +++ b/pengine/test10/stonith-1.summary @@ -48,14 +48,15 @@ Executing cluster transition: * Resource action: rsc_sles-4 monitor=5000 on sles-4 * Pseudo action: DoFencing_stop_0 * Fencing sles-3 (reboot) + * Resource action: r192.168.100.183 start on sles-1 * Pseudo action: migrator_stop_0 * Pseudo action: rsc_sles-3_stop_0 * Pseudo action: child_DoFencing:2_stop_0 * Pseudo action: DoFencing_stopped_0 * Pseudo action: DoFencing_start_0 * Pseudo action: master_rsc_1_stop_0 - * Pseudo action: stonith_complete - * Resource action: r192.168.100.183 start on sles-1 + * Pseudo action: group-1_running_0 + * Resource action: r192.168.100.183 monitor=5000 on sles-1 * Resource action: migrator start on sles-4 * Resource action: rsc_sles-3 start on sles-4 * Resource action: child_DoFencing:2 start on sles-4 @@ -64,9 +65,6 @@ Executing cluster transition: * Pseudo action: ocf_msdummy:5_stop_0 * Pseudo action: master_rsc_1_stopped_0 * Pseudo action: master_rsc_1_start_0 - * Pseudo action: all_stopped - * Pseudo action: group-1_running_0 - * Resource action: r192.168.100.183 monitor=5000 on sles-1 * Resource action: migrator monitor=10000 on sles-4 * Resource action: rsc_sles-3 monitor=5000 on sles-4 * Resource action: child_DoFencing:2 monitor=60000 on sles-4 diff --git a/pengine/test10/stonith-2.dot b/pengine/test10/stonith-2.dot index 2e9420b..cc981f3 100644 --- a/pengine/test10/stonith-2.dot +++ b/pengine/test10/stonith-2.dot @@ -1,11 +1,7 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc_sles-5_monitor_5000 sles-6" [ style=bold color="green" fontcolor="black" ] "rsc_sles-5_start_0 sles-6" -> "rsc_sles-5_monitor_5000 sles-6" [ style = bold] "rsc_sles-5_start_0 sles-6" [ style=bold color="green" fontcolor="black" ] -"stonith 'reboot' sles-5" -> "stonith_complete" [ style = bold] +"stonith 'reboot' sles-5" -> "rsc_sles-5_start_0 sles-6" [ style = bold] "stonith 'reboot' sles-5" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "rsc_sles-5_start_0 sles-6" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/stonith-2.exp b/pengine/test10/stonith-2.exp index e433e49..0c15f83 100644 --- a/pengine/test10/stonith-2.exp +++ b/pengine/test10/stonith-2.exp @@ -1,55 +1,31 @@ - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/stonith-2.summary b/pengine/test10/stonith-2.summary index 2a6c218..39802c9 100644 --- a/pengine/test10/stonith-2.summary +++ b/pengine/test10/stonith-2.summary @@ -38,8 +38,6 @@ Transition Summary: Executing cluster transition: * Fencing sles-5 (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped * Resource action: rsc_sles-5 start on sles-6 * Resource action: rsc_sles-5 monitor=5000 on sles-6 diff --git a/pengine/test10/stonith-3.dot b/pengine/test10/stonith-3.dot index c2a0369..3ce879c 100644 --- a/pengine/test10/stonith-3.dot +++ b/pengine/test10/stonith-3.dot @@ -1,6 +1,4 @@ digraph "g" { -"all_stopped" -> "prmStonith:0_start_0 rh5node2" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "clnStonith_running_0" [ style=bold color="green" fontcolor="orange" ] "clnStonith_start_0" -> "clnStonith_running_0" [ style = bold] "clnStonith_start_0" -> "grpStonith:0_start_0" [ style = bold] @@ -19,9 +17,7 @@ digraph "g" { "prmStonith:0_monitor_0 rh5node2" [ style=bold color="green" fontcolor="black" ] "prmStonith:0_start_0 rh5node2" -> "grpStonith:0_running_0" [ style = bold] "prmStonith:0_start_0 rh5node2" [ style=bold color="green" fontcolor="black" ] -"stonith 'reboot' rh5node1" -> "stonith_complete" [ style = bold] +"stonith 'reboot' rh5node1" -> "prmIpPostgreSQLDB_start_0 rh5node2" [ style = bold] +"stonith 'reboot' rh5node1" -> "prmStonith:0_start_0 rh5node2" [ style = bold] "stonith 'reboot' rh5node1" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "prmIpPostgreSQLDB_start_0 rh5node2" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/stonith-3.exp b/pengine/test10/stonith-3.exp index de58694..09e1314 100644 --- a/pengine/test10/stonith-3.exp +++ b/pengine/test10/stonith-3.exp @@ -1,36 +1,36 @@ - + - + - + - + - + - + @@ -39,50 +39,50 @@ - + - + - + - + - + - + - + - + - + @@ -91,34 +91,34 @@ - + - + - + - + - + - + @@ -127,29 +127,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/stonith-3.summary b/pengine/test10/stonith-3.summary index cc10cf5..1e8315d 100644 --- a/pengine/test10/stonith-3.summary +++ b/pengine/test10/stonith-3.summary @@ -17,8 +17,6 @@ Executing cluster transition: * Resource action: prmStonith:0 monitor on rh5node2 * Pseudo action: clnStonith_start_0 * Fencing rh5node1 (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped * Resource action: prmIpPostgreSQLDB start on rh5node2 * Pseudo action: grpStonith:0_start_0 * Resource action: prmStonith:0 start on rh5node2 diff --git a/pengine/test10/stonith-4.dot b/pengine/test10/stonith-4.dot index ee659cb..0e17759 100644 --- a/pengine/test10/stonith-4.dot +++ b/pengine/test10/stonith-4.dot @@ -6,16 +6,15 @@ digraph "g" { "Fencing_monitor_0 pcmk-3" -> "Fencing_start_0 pcmk-1" [ style = dashed] "Fencing_monitor_0 pcmk-3" [ style=dashed color="red" fontcolor="black"] "Fencing_start_0 pcmk-1" [ style=dashed color="red" fontcolor="black"] -"all_stopped" -> "Fencing_start_0 pcmk-1" [ style = dashed] -"all_stopped" [ style=bold color="green" fontcolor="orange"] +"stonith 'reboot' pcmk-10" -> "Fencing_start_0 pcmk-1" [ style = dashed] "stonith 'reboot' pcmk-10" -> "stonith 'reboot' pcmk-5" [ style = bold] "stonith 'reboot' pcmk-10" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' pcmk-5" -> "Fencing_start_0 pcmk-1" [ style = dashed] "stonith 'reboot' pcmk-5" -> "stonith 'reboot' pcmk-7" [ style = bold] "stonith 'reboot' pcmk-5" [ style=bold color="green" fontcolor="black"] +"stonith 'reboot' pcmk-7" -> "Fencing_start_0 pcmk-1" [ style = dashed] "stonith 'reboot' pcmk-7" -> "stonith 'reboot' pcmk-8" [ style = bold] "stonith 'reboot' pcmk-7" [ style=bold color="green" fontcolor="black"] -"stonith 'reboot' pcmk-8" -> "stonith_complete" [ style = bold] +"stonith 'reboot' pcmk-8" -> "Fencing_start_0 pcmk-1" [ style = dashed] "stonith 'reboot' pcmk-8" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/stonith-4.exp b/pengine/test10/stonith-4.exp index d3e9e67..43eb23c 100644 --- a/pengine/test10/stonith-4.exp +++ b/pengine/test10/stonith-4.exp @@ -1,30 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -34,7 +10,7 @@ - + @@ -49,7 +25,7 @@ - + @@ -64,7 +40,7 @@ - + diff --git a/pengine/test10/stonith-4.summary b/pengine/test10/stonith-4.summary index 7502dad..778ca4e 100644 --- a/pengine/test10/stonith-4.summary +++ b/pengine/test10/stonith-4.summary @@ -25,8 +25,6 @@ Executing cluster transition: * Fencing pcmk-5 (reboot) * Fencing pcmk-7 (reboot) * Fencing pcmk-8 (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped Revised cluster status: Node pcmk-11 (111): pending diff --git a/pengine/test10/stop-failure-no-quorum.dot b/pengine/test10/stop-failure-no-quorum.dot index e00258d..e79b1d6 100644 --- a/pengine/test10/stop-failure-no-quorum.dot +++ b/pengine/test10/stop-failure-no-quorum.dot @@ -1,19 +1,14 @@ digraph "g" { "ClusterIP_monitor_60000 pcmk-1" [ style=dashed color="red" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "clvm-clone_stop_0" -> "clvm-clone_stopped_0" [ style = bold] "clvm-clone_stop_0" -> "clvm_stop_0 pcmk-2" [ style = bold] "clvm-clone_stop_0" [ style=bold color="green" fontcolor="orange"] "clvm-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] "clvm:2_monitor_60000 pcmk-1" [ style=dashed color="red" fontcolor="black"] -"clvm_stop_0 pcmk-2" -> "all_stopped" [ style = bold] "clvm_stop_0 pcmk-2" -> "clvm-clone_stopped_0" [ style = bold] "clvm_stop_0 pcmk-2" [ style=bold color="green" fontcolor="orange"] "dlm_monitor_60000 pcmk-1" [ style=dashed color="red" fontcolor="black"] "stonith 'reboot' pcmk-2" -> "clvm-clone_stop_0" [ style = bold] "stonith 'reboot' pcmk-2" -> "clvm_stop_0 pcmk-2" [ style = bold] -"stonith 'reboot' pcmk-2" -> "stonith_complete" [ style = bold] "stonith 'reboot' pcmk-2" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/stop-failure-no-quorum.exp b/pengine/test10/stop-failure-no-quorum.exp index ddd383d..8f6d252 100644 --- a/pengine/test10/stop-failure-no-quorum.exp +++ b/pengine/test10/stop-failure-no-quorum.exp @@ -1,7 +1,7 @@ - + @@ -10,28 +10,28 @@ - + - + - + - + - + @@ -43,33 +43,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/stop-failure-no-quorum.summary b/pengine/test10/stop-failure-no-quorum.summary index 52ec84f..5d3330c 100644 --- a/pengine/test10/stop-failure-no-quorum.summary +++ b/pengine/test10/stop-failure-no-quorum.summary @@ -25,10 +25,8 @@ Transition Summary: Executing cluster transition: * Fencing pcmk-2 (reboot) * Pseudo action: clvm-clone_stop_0 - * Pseudo action: stonith_complete * Pseudo action: clvm_stop_0 * Pseudo action: clvm-clone_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Node pcmk-3 (103): UNCLEAN (offline) diff --git a/pengine/test10/stop-failure-with-fencing.dot b/pengine/test10/stop-failure-with-fencing.dot index 229f7f8..93d9dd7 100644 --- a/pengine/test10/stop-failure-with-fencing.dot +++ b/pengine/test10/stop-failure-with-fencing.dot @@ -1,20 +1,15 @@ digraph "g" { "ClusterIP_monitor_60000 pcmk-1" [ style=dashed color="red" fontcolor="black"] "Fencing_monitor_0 pcmk-1" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "clvm-clone_stop_0" -> "clvm-clone_stopped_0" [ style = bold] "clvm-clone_stop_0" -> "clvm_stop_0 pcmk-2" [ style = bold] "clvm-clone_stop_0" [ style=bold color="green" fontcolor="orange"] "clvm-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] "clvm:1_monitor_60000 pcmk-1" [ style=dashed color="red" fontcolor="black"] -"clvm_stop_0 pcmk-2" -> "all_stopped" [ style = bold] "clvm_stop_0 pcmk-2" -> "clvm-clone_stopped_0" [ style = bold] "clvm_stop_0 pcmk-2" [ style=bold color="green" fontcolor="orange"] "dlm_monitor_60000 pcmk-1" [ style=dashed color="red" fontcolor="black"] "stonith 'reboot' pcmk-2" -> "clvm-clone_stop_0" [ style = bold] "stonith 'reboot' pcmk-2" -> "clvm_stop_0 pcmk-2" [ style = bold] -"stonith 'reboot' pcmk-2" -> "stonith_complete" [ style = bold] "stonith 'reboot' pcmk-2" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/stop-failure-with-fencing.exp b/pengine/test10/stop-failure-with-fencing.exp index e7e7ca6..6d0e6af 100644 --- a/pengine/test10/stop-failure-with-fencing.exp +++ b/pengine/test10/stop-failure-with-fencing.exp @@ -1,7 +1,7 @@ - + @@ -10,28 +10,28 @@ - + - + - + - + - + @@ -43,7 +43,7 @@ - + @@ -52,33 +52,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/stop-failure-with-fencing.summary b/pengine/test10/stop-failure-with-fencing.summary index 50c5f97..34046a4 100644 --- a/pengine/test10/stop-failure-with-fencing.summary +++ b/pengine/test10/stop-failure-with-fencing.summary @@ -25,10 +25,8 @@ Executing cluster transition: * Resource action: Fencing monitor on pcmk-1 * Fencing pcmk-2 (reboot) * Pseudo action: clvm-clone_stop_0 - * Pseudo action: stonith_complete * Pseudo action: clvm_stop_0 * Pseudo action: clvm-clone_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Node pcmk-3 (103): UNCLEAN (offline) diff --git a/pengine/test10/stopped-monitor-00.exp b/pengine/test10/stopped-monitor-00.exp index 007e9f7..31c5d85 100644 --- a/pengine/test10/stopped-monitor-00.exp +++ b/pengine/test10/stopped-monitor-00.exp @@ -1,49 +1,49 @@ - + - + - + - + - + - + - + - + @@ -52,7 +52,7 @@ - + diff --git a/pengine/test10/stopped-monitor-01.dot b/pengine/test10/stopped-monitor-01.dot index 3b17846..4e87b98 100644 --- a/pengine/test10/stopped-monitor-01.dot +++ b/pengine/test10/stopped-monitor-01.dot @@ -1,9 +1,7 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_10000 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node1" -> "rsc1_monitor_10000 node1" [ style = bold] "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"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/stopped-monitor-01.exp b/pengine/test10/stopped-monitor-01.exp index 34e19ae..cb13b5c 100644 --- a/pengine/test10/stopped-monitor-01.exp +++ b/pengine/test10/stopped-monitor-01.exp @@ -1,7 +1,7 @@ - + @@ -30,19 +30,7 @@ - - - - - - - - - - - - - + diff --git a/pengine/test10/stopped-monitor-01.summary b/pengine/test10/stopped-monitor-01.summary index 7baf2b9..4707383 100644 --- a/pengine/test10/stopped-monitor-01.summary +++ b/pengine/test10/stopped-monitor-01.summary @@ -9,7 +9,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on node1 - * Pseudo action: all_stopped * Resource action: rsc1 start on node1 * Resource action: rsc1 monitor=10000 on node1 diff --git a/pengine/test10/stopped-monitor-02.dot b/pengine/test10/stopped-monitor-02.dot index c2f18e8..e7e5d9f 100644 --- a/pengine/test10/stopped-monitor-02.dot +++ b/pengine/test10/stopped-monitor-02.dot @@ -1,13 +1,10 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_10000 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_monitor_20000 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node1" -> "rsc1_monitor_10000 node1" [ style = bold] "rsc1_start_0 node1" [ style=bold color="green" fontcolor="black" ] -"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" ] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" -> "rsc1_monitor_20000 node2" [ style = bold] "rsc1_stop_0 node2" -> "rsc1_start_0 node1" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/stopped-monitor-02.exp b/pengine/test10/stopped-monitor-02.exp index 849b20d..c51b7d1 100644 --- a/pengine/test10/stopped-monitor-02.exp +++ b/pengine/test10/stopped-monitor-02.exp @@ -1,7 +1,7 @@ - + @@ -11,13 +11,13 @@ - + - + @@ -55,22 +55,7 @@ - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/stopped-monitor-02.summary b/pengine/test10/stopped-monitor-02.summary index e1d44b5..b2363f6 100644 --- a/pengine/test10/stopped-monitor-02.summary +++ b/pengine/test10/stopped-monitor-02.summary @@ -11,7 +11,6 @@ Executing cluster transition: * Resource action: rsc1 stop on node1 * Resource action: rsc1 stop on node2 * Resource action: rsc1 monitor=20000 on node2 - * Pseudo action: all_stopped * Resource action: rsc1 start on node1 * Resource action: rsc1 monitor=10000 on node1 diff --git a/pengine/test10/stopped-monitor-03.dot b/pengine/test10/stopped-monitor-03.dot index 97c97a0..f333ef9 100644 --- a/pengine/test10/stopped-monitor-03.dot +++ b/pengine/test10/stopped-monitor-03.dot @@ -1,7 +1,5 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_20000 node1" [ style=bold color="green" fontcolor="black" ] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_monitor_20000 node1" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/stopped-monitor-03.exp b/pengine/test10/stopped-monitor-03.exp index 44a6c68..a192301 100644 --- a/pengine/test10/stopped-monitor-03.exp +++ b/pengine/test10/stopped-monitor-03.exp @@ -1,37 +1,24 @@ - + - + - + - - - - - - - - - - - - - diff --git a/pengine/test10/stopped-monitor-03.summary b/pengine/test10/stopped-monitor-03.summary index c897eec..f263558 100644 --- a/pengine/test10/stopped-monitor-03.summary +++ b/pengine/test10/stopped-monitor-03.summary @@ -10,7 +10,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on node1 - * Pseudo action: all_stopped * Resource action: rsc1 monitor=20000 on node1 Revised cluster status: diff --git a/pengine/test10/stopped-monitor-08.dot b/pengine/test10/stopped-monitor-08.dot index c65822d..e02e596 100644 --- a/pengine/test10/stopped-monitor-08.dot +++ b/pengine/test10/stopped-monitor-08.dot @@ -1,12 +1,10 @@ digraph "g" { "Cancel rsc1_monitor_20000 node2" -> "rsc1_start_0 node2" [ style = bold] "Cancel rsc1_monitor_20000 node2" [ style=bold color="green" fontcolor="black" ] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_10000 node2" [ style=bold color="green" fontcolor="black" ] "rsc1_monitor_20000 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" -> "rsc1_monitor_10000 node2" [ style = bold] "rsc1_start_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_monitor_20000 node1" [ 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/stopped-monitor-08.exp b/pengine/test10/stopped-monitor-08.exp index 4673b82..f885baf 100644 --- a/pengine/test10/stopped-monitor-08.exp +++ b/pengine/test10/stopped-monitor-08.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -37,13 +37,13 @@ - + - + @@ -59,17 +59,4 @@ - - - - - - - - - - - - - diff --git a/pengine/test10/stopped-monitor-08.summary b/pengine/test10/stopped-monitor-08.summary index a15a906..88904ce 100644 --- a/pengine/test10/stopped-monitor-08.summary +++ b/pengine/test10/stopped-monitor-08.summary @@ -11,7 +11,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on node1 * Resource action: rsc1 cancel=20000 on node2 - * Pseudo action: all_stopped * Resource action: rsc1 monitor=20000 on node1 * Resource action: rsc1 start on node2 * Resource action: rsc1 monitor=10000 on node2 diff --git a/pengine/test10/stopped-monitor-20.exp b/pengine/test10/stopped-monitor-20.exp index 2a2bc81..3776be8 100644 --- a/pengine/test10/stopped-monitor-20.exp +++ b/pengine/test10/stopped-monitor-20.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,7 +36,7 @@ - + diff --git a/pengine/test10/stopped-monitor-21.dot b/pengine/test10/stopped-monitor-21.dot index 97c97a0..f333ef9 100644 --- a/pengine/test10/stopped-monitor-21.dot +++ b/pengine/test10/stopped-monitor-21.dot @@ -1,7 +1,5 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_20000 node1" [ style=bold color="green" fontcolor="black" ] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_monitor_20000 node1" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/stopped-monitor-21.exp b/pengine/test10/stopped-monitor-21.exp index 36ce99e..5ba941b 100644 --- a/pengine/test10/stopped-monitor-21.exp +++ b/pengine/test10/stopped-monitor-21.exp @@ -21,17 +21,4 @@ - - - - - - - - - - - - - diff --git a/pengine/test10/stopped-monitor-21.summary b/pengine/test10/stopped-monitor-21.summary index 7c2732d..1deaf2b 100644 --- a/pengine/test10/stopped-monitor-21.summary +++ b/pengine/test10/stopped-monitor-21.summary @@ -11,7 +11,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on node1 * Resource action: rsc1 monitor=20000 on node1 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/stopped-monitor-22.dot b/pengine/test10/stopped-monitor-22.dot index 6ad7f2f..f6d1799 100644 --- a/pengine/test10/stopped-monitor-22.dot +++ b/pengine/test10/stopped-monitor-22.dot @@ -1,11 +1,8 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "rsc1_monitor_20000 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_monitor_20000 node2" [ style=bold color="green" fontcolor="black" ] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "rsc1_monitor_20000 node1" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" -> "rsc1_monitor_20000 node2" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/stopped-monitor-22.exp b/pengine/test10/stopped-monitor-22.exp index d4b3a48..ffb767e 100644 --- a/pengine/test10/stopped-monitor-22.exp +++ b/pengine/test10/stopped-monitor-22.exp @@ -43,20 +43,4 @@ - - - - - - - - - - - - - - - - diff --git a/pengine/test10/stopped-monitor-22.summary b/pengine/test10/stopped-monitor-22.summary index d26827a..3a1e37b 100644 --- a/pengine/test10/stopped-monitor-22.summary +++ b/pengine/test10/stopped-monitor-22.summary @@ -14,7 +14,6 @@ Executing cluster transition: * Resource action: rsc1 monitor=20000 on node2 * Resource action: rsc1 stop on node1 * Resource action: rsc1 monitor=20000 on node1 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/stopped-monitor-23.exp b/pengine/test10/stopped-monitor-23.exp index fb85ef9..96d376e 100644 --- a/pengine/test10/stopped-monitor-23.exp +++ b/pengine/test10/stopped-monitor-23.exp @@ -1,20 +1,20 @@ - + - + - + diff --git a/pengine/test10/stopped-monitor-30.exp b/pengine/test10/stopped-monitor-30.exp index ae89df6..039b60d 100644 --- a/pengine/test10/stopped-monitor-30.exp +++ b/pengine/test10/stopped-monitor-30.exp @@ -1,20 +1,20 @@ - + - + - + diff --git a/pengine/test10/stopped-monitor-31.exp b/pengine/test10/stopped-monitor-31.exp index 036be84..3500eda 100644 --- a/pengine/test10/stopped-monitor-31.exp +++ b/pengine/test10/stopped-monitor-31.exp @@ -1,20 +1,20 @@ - + - + - + diff --git a/pengine/test10/suicide-needed-inquorate.dot b/pengine/test10/suicide-needed-inquorate.dot index afa63f1..eb3572b 100644 --- a/pengine/test10/suicide-needed-inquorate.dot +++ b/pengine/test10/suicide-needed-inquorate.dot @@ -1,11 +1,7 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "stonith 'reboot' node1" -> "stonith 'reboot' node3" [ style = bold] "stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] -"stonith 'reboot' node2" -> "stonith_complete" [ style = bold] "stonith 'reboot' node2" [ style=bold color="green" fontcolor="black"] "stonith 'reboot' node3" -> "stonith 'reboot' node2" [ style = bold] "stonith 'reboot' node3" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/suicide-needed-inquorate.exp b/pengine/test10/suicide-needed-inquorate.exp index 503ea7a..58619aa 100644 --- a/pengine/test10/suicide-needed-inquorate.exp +++ b/pengine/test10/suicide-needed-inquorate.exp @@ -1,30 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -38,7 +14,7 @@ - + @@ -53,7 +29,7 @@ - + diff --git a/pengine/test10/suicide-needed-inquorate.summary b/pengine/test10/suicide-needed-inquorate.summary index 454519a..305ea72 100644 --- a/pengine/test10/suicide-needed-inquorate.summary +++ b/pengine/test10/suicide-needed-inquorate.summary @@ -16,8 +16,6 @@ Executing cluster transition: * Fencing node1 (reboot) * Fencing node3 (reboot) * Fencing node2 (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped Using the original execution date of: 2017-08-21 17:12:54Z Revised cluster status: diff --git a/pengine/test10/suicide-not-needed-initial-quorum.exp b/pengine/test10/suicide-not-needed-initial-quorum.exp index f17198a..4a9dc66 100644 --- a/pengine/test10/suicide-not-needed-initial-quorum.exp +++ b/pengine/test10/suicide-not-needed-initial-quorum.exp @@ -1,39 +1,39 @@ - + - + - + - + - + - + - + @@ -42,7 +42,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/pengine/test10/suicide-not-needed-never-quorate.exp b/pengine/test10/suicide-not-needed-never-quorate.exp index 8819ae2..0af7e3e 100644 --- a/pengine/test10/suicide-not-needed-never-quorate.exp +++ b/pengine/test10/suicide-not-needed-never-quorate.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + diff --git a/pengine/test10/suicide-not-needed-quorate.exp b/pengine/test10/suicide-not-needed-quorate.exp index f17198a..4a9dc66 100644 --- a/pengine/test10/suicide-not-needed-quorate.exp +++ b/pengine/test10/suicide-not-needed-quorate.exp @@ -1,39 +1,39 @@ - + - + - + - + - + - + - + @@ -42,7 +42,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/pengine/test10/systemhealth1.dot b/pengine/test10/systemhealth1.dot index a29f519..acd52e3 100644 --- a/pengine/test10/systemhealth1.dot +++ b/pengine/test10/systemhealth1.dot @@ -1,9 +1,5 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] -"stonith 'reboot' hs21c" -> "stonith_complete" [ style = bold] "stonith 'reboot' hs21c" [ style=bold color="green" fontcolor="black"] "stonith 'reboot' hs21d" -> "stonith 'reboot' hs21c" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/systemhealth1.exp b/pengine/test10/systemhealth1.exp index 4cfe4c2..fb8764c 100644 --- a/pengine/test10/systemhealth1.exp +++ b/pengine/test10/systemhealth1.exp @@ -1,7 +1,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -21,31 +21,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/systemhealth1.summary b/pengine/test10/systemhealth1.summary index 351d508..6bb4eee 100644 --- a/pengine/test10/systemhealth1.summary +++ b/pengine/test10/systemhealth1.summary @@ -14,8 +14,6 @@ Transition Summary: Executing cluster transition: * Fencing hs21d (reboot) * Fencing hs21c (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped Revised cluster status: OFFLINE: [ hs21c hs21d ] diff --git a/pengine/test10/systemhealth2.dot b/pengine/test10/systemhealth2.dot index c7bf10b..93f2ee8 100644 --- a/pengine/test10/systemhealth2.dot +++ b/pengine/test10/systemhealth2.dot @@ -1,6 +1,4 @@ digraph "g" { -"all_stopped" -> "stonith-1_start_0 hs21c" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "apache_1_monitor_0 hs21c" -> "apache_1_start_0 hs21c" [ style = bold] "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "apache_1_monitor_10000 hs21c" [ style=bold color="green" fontcolor="black" ] @@ -11,13 +9,11 @@ digraph "g" { "nfs_1_monitor_20000 hs21c" [ style=bold color="green" fontcolor="black" ] "nfs_1_start_0 hs21c" -> "nfs_1_monitor_20000 hs21c" [ style = bold] "nfs_1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] +"stonith 'reboot' hs21d" -> "apache_1_start_0 hs21c" [ style = bold] +"stonith 'reboot' hs21d" -> "nfs_1_start_0 hs21c" [ style = bold] +"stonith 'reboot' hs21d" -> "stonith-1_start_0 hs21c" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] "stonith-1_monitor_0 hs21c" -> "stonith-1_start_0 hs21c" [ style = bold] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "apache_1_start_0 hs21c" [ style = bold] -"stonith_complete" -> "nfs_1_start_0 hs21c" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/systemhealth2.exp b/pengine/test10/systemhealth2.exp index 774f831..a410921 100644 --- a/pengine/test10/systemhealth2.exp +++ b/pengine/test10/systemhealth2.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,36 +26,36 @@ - + - + - + - + - + - + @@ -64,36 +64,36 @@ - + - + - + - + - + - + @@ -102,7 +102,7 @@ - + @@ -111,29 +111,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/systemhealth2.summary b/pengine/test10/systemhealth2.summary index db68783..1cd230e 100644 --- a/pengine/test10/systemhealth2.summary +++ b/pengine/test10/systemhealth2.summary @@ -18,8 +18,6 @@ Executing cluster transition: * Resource action: apache_1 monitor on hs21c * Resource action: nfs_1 monitor on hs21c * Fencing hs21d (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped * Resource action: stonith-1 start on hs21c * Resource action: apache_1 start on hs21c * Resource action: nfs_1 start on hs21c diff --git a/pengine/test10/systemhealth3.dot b/pengine/test10/systemhealth3.dot index c7bf10b..93f2ee8 100644 --- a/pengine/test10/systemhealth3.dot +++ b/pengine/test10/systemhealth3.dot @@ -1,6 +1,4 @@ digraph "g" { -"all_stopped" -> "stonith-1_start_0 hs21c" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "apache_1_monitor_0 hs21c" -> "apache_1_start_0 hs21c" [ style = bold] "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "apache_1_monitor_10000 hs21c" [ style=bold color="green" fontcolor="black" ] @@ -11,13 +9,11 @@ digraph "g" { "nfs_1_monitor_20000 hs21c" [ style=bold color="green" fontcolor="black" ] "nfs_1_start_0 hs21c" -> "nfs_1_monitor_20000 hs21c" [ style = bold] "nfs_1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] +"stonith 'reboot' hs21d" -> "apache_1_start_0 hs21c" [ style = bold] +"stonith 'reboot' hs21d" -> "nfs_1_start_0 hs21c" [ style = bold] +"stonith 'reboot' hs21d" -> "stonith-1_start_0 hs21c" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] "stonith-1_monitor_0 hs21c" -> "stonith-1_start_0 hs21c" [ style = bold] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "apache_1_start_0 hs21c" [ style = bold] -"stonith_complete" -> "nfs_1_start_0 hs21c" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/systemhealth3.exp b/pengine/test10/systemhealth3.exp index 774f831..a410921 100644 --- a/pengine/test10/systemhealth3.exp +++ b/pengine/test10/systemhealth3.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,36 +26,36 @@ - + - + - + - + - + - + @@ -64,36 +64,36 @@ - + - + - + - + - + - + @@ -102,7 +102,7 @@ - + @@ -111,29 +111,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/systemhealth3.summary b/pengine/test10/systemhealth3.summary index db68783..1cd230e 100644 --- a/pengine/test10/systemhealth3.summary +++ b/pengine/test10/systemhealth3.summary @@ -18,8 +18,6 @@ Executing cluster transition: * Resource action: apache_1 monitor on hs21c * Resource action: nfs_1 monitor on hs21c * Fencing hs21d (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped * Resource action: stonith-1 start on hs21c * Resource action: apache_1 start on hs21c * Resource action: nfs_1 start on hs21c diff --git a/pengine/test10/systemhealthm1.dot b/pengine/test10/systemhealthm1.dot index a29f519..acd52e3 100644 --- a/pengine/test10/systemhealthm1.dot +++ b/pengine/test10/systemhealthm1.dot @@ -1,9 +1,5 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] -"stonith 'reboot' hs21c" -> "stonith_complete" [ style = bold] "stonith 'reboot' hs21c" [ style=bold color="green" fontcolor="black"] "stonith 'reboot' hs21d" -> "stonith 'reboot' hs21c" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/systemhealthm1.exp b/pengine/test10/systemhealthm1.exp index 4cfe4c2..fb8764c 100644 --- a/pengine/test10/systemhealthm1.exp +++ b/pengine/test10/systemhealthm1.exp @@ -1,7 +1,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -21,31 +21,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/systemhealthm1.summary b/pengine/test10/systemhealthm1.summary index 351d508..6bb4eee 100644 --- a/pengine/test10/systemhealthm1.summary +++ b/pengine/test10/systemhealthm1.summary @@ -14,8 +14,6 @@ Transition Summary: Executing cluster transition: * Fencing hs21d (reboot) * Fencing hs21c (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped Revised cluster status: OFFLINE: [ hs21c hs21d ] diff --git a/pengine/test10/systemhealthm2.dot b/pengine/test10/systemhealthm2.dot index c7bf10b..93f2ee8 100644 --- a/pengine/test10/systemhealthm2.dot +++ b/pengine/test10/systemhealthm2.dot @@ -1,6 +1,4 @@ digraph "g" { -"all_stopped" -> "stonith-1_start_0 hs21c" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "apache_1_monitor_0 hs21c" -> "apache_1_start_0 hs21c" [ style = bold] "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "apache_1_monitor_10000 hs21c" [ style=bold color="green" fontcolor="black" ] @@ -11,13 +9,11 @@ digraph "g" { "nfs_1_monitor_20000 hs21c" [ style=bold color="green" fontcolor="black" ] "nfs_1_start_0 hs21c" -> "nfs_1_monitor_20000 hs21c" [ style = bold] "nfs_1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] +"stonith 'reboot' hs21d" -> "apache_1_start_0 hs21c" [ style = bold] +"stonith 'reboot' hs21d" -> "nfs_1_start_0 hs21c" [ style = bold] +"stonith 'reboot' hs21d" -> "stonith-1_start_0 hs21c" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] "stonith-1_monitor_0 hs21c" -> "stonith-1_start_0 hs21c" [ style = bold] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "apache_1_start_0 hs21c" [ style = bold] -"stonith_complete" -> "nfs_1_start_0 hs21c" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/systemhealthm2.exp b/pengine/test10/systemhealthm2.exp index 774f831..a410921 100644 --- a/pengine/test10/systemhealthm2.exp +++ b/pengine/test10/systemhealthm2.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,36 +26,36 @@ - + - + - + - + - + - + @@ -64,36 +64,36 @@ - + - + - + - + - + - + @@ -102,7 +102,7 @@ - + @@ -111,29 +111,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/systemhealthm2.summary b/pengine/test10/systemhealthm2.summary index db68783..1cd230e 100644 --- a/pengine/test10/systemhealthm2.summary +++ b/pengine/test10/systemhealthm2.summary @@ -18,8 +18,6 @@ Executing cluster transition: * Resource action: apache_1 monitor on hs21c * Resource action: nfs_1 monitor on hs21c * Fencing hs21d (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped * Resource action: stonith-1 start on hs21c * Resource action: apache_1 start on hs21c * Resource action: nfs_1 start on hs21c diff --git a/pengine/test10/systemhealthm3.dot b/pengine/test10/systemhealthm3.dot index fd8b19f..f03f57f 100644 --- a/pengine/test10/systemhealthm3.dot +++ b/pengine/test10/systemhealthm3.dot @@ -1,10 +1,6 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "nfs_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/systemhealthm3.exp b/pengine/test10/systemhealthm3.exp index 9eb5366..c17102b 100644 --- a/pengine/test10/systemhealthm3.exp +++ b/pengine/test10/systemhealthm3.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,29 +37,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/systemhealthm3.summary b/pengine/test10/systemhealthm3.summary index 836d8f5..b98d923 100644 --- a/pengine/test10/systemhealthm3.summary +++ b/pengine/test10/systemhealthm3.summary @@ -15,8 +15,6 @@ Executing cluster transition: * Resource action: apache_1 monitor on hs21c * Resource action: nfs_1 monitor on hs21c * Fencing hs21d (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped Revised cluster status: Online: [ hs21c ] diff --git a/pengine/test10/systemhealthn1.dot b/pengine/test10/systemhealthn1.dot index a29f519..acd52e3 100644 --- a/pengine/test10/systemhealthn1.dot +++ b/pengine/test10/systemhealthn1.dot @@ -1,9 +1,5 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] -"stonith 'reboot' hs21c" -> "stonith_complete" [ style = bold] "stonith 'reboot' hs21c" [ style=bold color="green" fontcolor="black"] "stonith 'reboot' hs21d" -> "stonith 'reboot' hs21c" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/systemhealthn1.exp b/pengine/test10/systemhealthn1.exp index 4cfe4c2..fb8764c 100644 --- a/pengine/test10/systemhealthn1.exp +++ b/pengine/test10/systemhealthn1.exp @@ -1,7 +1,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -21,31 +21,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/systemhealthn1.summary b/pengine/test10/systemhealthn1.summary index 351d508..6bb4eee 100644 --- a/pengine/test10/systemhealthn1.summary +++ b/pengine/test10/systemhealthn1.summary @@ -14,8 +14,6 @@ Transition Summary: Executing cluster transition: * Fencing hs21d (reboot) * Fencing hs21c (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped Revised cluster status: OFFLINE: [ hs21c hs21d ] diff --git a/pengine/test10/systemhealthn2.dot b/pengine/test10/systemhealthn2.dot index c7bf10b..93f2ee8 100644 --- a/pengine/test10/systemhealthn2.dot +++ b/pengine/test10/systemhealthn2.dot @@ -1,6 +1,4 @@ digraph "g" { -"all_stopped" -> "stonith-1_start_0 hs21c" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "apache_1_monitor_0 hs21c" -> "apache_1_start_0 hs21c" [ style = bold] "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "apache_1_monitor_10000 hs21c" [ style=bold color="green" fontcolor="black" ] @@ -11,13 +9,11 @@ digraph "g" { "nfs_1_monitor_20000 hs21c" [ style=bold color="green" fontcolor="black" ] "nfs_1_start_0 hs21c" -> "nfs_1_monitor_20000 hs21c" [ style = bold] "nfs_1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] +"stonith 'reboot' hs21d" -> "apache_1_start_0 hs21c" [ style = bold] +"stonith 'reboot' hs21d" -> "nfs_1_start_0 hs21c" [ style = bold] +"stonith 'reboot' hs21d" -> "stonith-1_start_0 hs21c" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] "stonith-1_monitor_0 hs21c" -> "stonith-1_start_0 hs21c" [ style = bold] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "apache_1_start_0 hs21c" [ style = bold] -"stonith_complete" -> "nfs_1_start_0 hs21c" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/systemhealthn2.exp b/pengine/test10/systemhealthn2.exp index 774f831..a410921 100644 --- a/pengine/test10/systemhealthn2.exp +++ b/pengine/test10/systemhealthn2.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,36 +26,36 @@ - + - + - + - + - + - + @@ -64,36 +64,36 @@ - + - + - + - + - + - + @@ -102,7 +102,7 @@ - + @@ -111,29 +111,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/systemhealthn2.summary b/pengine/test10/systemhealthn2.summary index db68783..1cd230e 100644 --- a/pengine/test10/systemhealthn2.summary +++ b/pengine/test10/systemhealthn2.summary @@ -18,8 +18,6 @@ Executing cluster transition: * Resource action: apache_1 monitor on hs21c * Resource action: nfs_1 monitor on hs21c * Fencing hs21d (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped * Resource action: stonith-1 start on hs21c * Resource action: apache_1 start on hs21c * Resource action: nfs_1 start on hs21c diff --git a/pengine/test10/systemhealthn3.dot b/pengine/test10/systemhealthn3.dot index c7bf10b..93f2ee8 100644 --- a/pengine/test10/systemhealthn3.dot +++ b/pengine/test10/systemhealthn3.dot @@ -1,6 +1,4 @@ digraph "g" { -"all_stopped" -> "stonith-1_start_0 hs21c" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "apache_1_monitor_0 hs21c" -> "apache_1_start_0 hs21c" [ style = bold] "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "apache_1_monitor_10000 hs21c" [ style=bold color="green" fontcolor="black" ] @@ -11,13 +9,11 @@ digraph "g" { "nfs_1_monitor_20000 hs21c" [ style=bold color="green" fontcolor="black" ] "nfs_1_start_0 hs21c" -> "nfs_1_monitor_20000 hs21c" [ style = bold] "nfs_1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] +"stonith 'reboot' hs21d" -> "apache_1_start_0 hs21c" [ style = bold] +"stonith 'reboot' hs21d" -> "nfs_1_start_0 hs21c" [ style = bold] +"stonith 'reboot' hs21d" -> "stonith-1_start_0 hs21c" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] "stonith-1_monitor_0 hs21c" -> "stonith-1_start_0 hs21c" [ style = bold] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "stonith-1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "apache_1_start_0 hs21c" [ style = bold] -"stonith_complete" -> "nfs_1_start_0 hs21c" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/systemhealthn3.exp b/pengine/test10/systemhealthn3.exp index 774f831..a410921 100644 --- a/pengine/test10/systemhealthn3.exp +++ b/pengine/test10/systemhealthn3.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,36 +26,36 @@ - + - + - + - + - + - + @@ -64,36 +64,36 @@ - + - + - + - + - + - + @@ -102,7 +102,7 @@ - + @@ -111,29 +111,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/systemhealthn3.summary b/pengine/test10/systemhealthn3.summary index db68783..1cd230e 100644 --- a/pengine/test10/systemhealthn3.summary +++ b/pengine/test10/systemhealthn3.summary @@ -18,8 +18,6 @@ Executing cluster transition: * Resource action: apache_1 monitor on hs21c * Resource action: nfs_1 monitor on hs21c * Fencing hs21d (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped * Resource action: stonith-1 start on hs21c * Resource action: apache_1 start on hs21c * Resource action: nfs_1 start on hs21c diff --git a/pengine/test10/systemhealtho1.dot b/pengine/test10/systemhealtho1.dot index a29f519..acd52e3 100644 --- a/pengine/test10/systemhealtho1.dot +++ b/pengine/test10/systemhealtho1.dot @@ -1,9 +1,5 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] -"stonith 'reboot' hs21c" -> "stonith_complete" [ style = bold] "stonith 'reboot' hs21c" [ style=bold color="green" fontcolor="black"] "stonith 'reboot' hs21d" -> "stonith 'reboot' hs21c" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/systemhealtho1.exp b/pengine/test10/systemhealtho1.exp index 4cfe4c2..fb8764c 100644 --- a/pengine/test10/systemhealtho1.exp +++ b/pengine/test10/systemhealtho1.exp @@ -1,7 +1,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -21,31 +21,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/systemhealtho1.summary b/pengine/test10/systemhealtho1.summary index 351d508..6bb4eee 100644 --- a/pengine/test10/systemhealtho1.summary +++ b/pengine/test10/systemhealtho1.summary @@ -14,8 +14,6 @@ Transition Summary: Executing cluster transition: * Fencing hs21d (reboot) * Fencing hs21c (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped Revised cluster status: OFFLINE: [ hs21c hs21d ] diff --git a/pengine/test10/systemhealtho2.dot b/pengine/test10/systemhealtho2.dot index fd8b19f..f03f57f 100644 --- a/pengine/test10/systemhealtho2.dot +++ b/pengine/test10/systemhealtho2.dot @@ -1,10 +1,6 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "nfs_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/systemhealtho2.exp b/pengine/test10/systemhealtho2.exp index 9eb5366..c17102b 100644 --- a/pengine/test10/systemhealtho2.exp +++ b/pengine/test10/systemhealtho2.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,29 +37,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/systemhealtho2.summary b/pengine/test10/systemhealtho2.summary index 836d8f5..b98d923 100644 --- a/pengine/test10/systemhealtho2.summary +++ b/pengine/test10/systemhealtho2.summary @@ -15,8 +15,6 @@ Executing cluster transition: * Resource action: apache_1 monitor on hs21c * Resource action: nfs_1 monitor on hs21c * Fencing hs21d (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped Revised cluster status: Online: [ hs21c ] diff --git a/pengine/test10/systemhealtho3.dot b/pengine/test10/systemhealtho3.dot index fd8b19f..f03f57f 100644 --- a/pengine/test10/systemhealtho3.dot +++ b/pengine/test10/systemhealtho3.dot @@ -1,10 +1,6 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "nfs_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/systemhealtho3.exp b/pengine/test10/systemhealtho3.exp index 9eb5366..c17102b 100644 --- a/pengine/test10/systemhealtho3.exp +++ b/pengine/test10/systemhealtho3.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,29 +37,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/systemhealtho3.summary b/pengine/test10/systemhealtho3.summary index 836d8f5..b98d923 100644 --- a/pengine/test10/systemhealtho3.summary +++ b/pengine/test10/systemhealtho3.summary @@ -15,8 +15,6 @@ Executing cluster transition: * Resource action: apache_1 monitor on hs21c * Resource action: nfs_1 monitor on hs21c * Fencing hs21d (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped Revised cluster status: Online: [ hs21c ] diff --git a/pengine/test10/systemhealthp1.dot b/pengine/test10/systemhealthp1.dot index a29f519..acd52e3 100644 --- a/pengine/test10/systemhealthp1.dot +++ b/pengine/test10/systemhealthp1.dot @@ -1,9 +1,5 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] -"stonith 'reboot' hs21c" -> "stonith_complete" [ style = bold] "stonith 'reboot' hs21c" [ style=bold color="green" fontcolor="black"] "stonith 'reboot' hs21d" -> "stonith 'reboot' hs21c" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/systemhealthp1.exp b/pengine/test10/systemhealthp1.exp index 4cfe4c2..fb8764c 100644 --- a/pengine/test10/systemhealthp1.exp +++ b/pengine/test10/systemhealthp1.exp @@ -1,7 +1,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -21,31 +21,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/systemhealthp1.summary b/pengine/test10/systemhealthp1.summary index 351d508..6bb4eee 100644 --- a/pengine/test10/systemhealthp1.summary +++ b/pengine/test10/systemhealthp1.summary @@ -14,8 +14,6 @@ Transition Summary: Executing cluster transition: * Fencing hs21d (reboot) * Fencing hs21c (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped Revised cluster status: OFFLINE: [ hs21c hs21d ] diff --git a/pengine/test10/systemhealthp2.dot b/pengine/test10/systemhealthp2.dot index 355d933..30bcdcb 100644 --- a/pengine/test10/systemhealthp2.dot +++ b/pengine/test10/systemhealthp2.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "apache_1_monitor_0 hs21c" -> "apache_1_start_0 hs21c" [ style = bold] "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "apache_1_monitor_10000 hs21c" [ style=bold color="green" fontcolor="black" ] @@ -10,11 +9,8 @@ digraph "g" { "nfs_1_monitor_20000 hs21c" [ style=bold color="green" fontcolor="black" ] "nfs_1_start_0 hs21c" -> "nfs_1_monitor_20000 hs21c" [ style = bold] "nfs_1_start_0 hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] +"stonith 'reboot' hs21d" -> "apache_1_start_0 hs21c" [ style = bold] +"stonith 'reboot' hs21d" -> "nfs_1_start_0 hs21c" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "apache_1_start_0 hs21c" [ style = bold] -"stonith_complete" -> "nfs_1_start_0 hs21c" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/systemhealthp2.exp b/pengine/test10/systemhealthp2.exp index f9d92e8..5f652ab 100644 --- a/pengine/test10/systemhealthp2.exp +++ b/pengine/test10/systemhealthp2.exp @@ -1,7 +1,7 @@ - + @@ -10,36 +10,36 @@ - + - + - + - + - + - + @@ -48,36 +48,36 @@ - + - + - + - + - + - + @@ -86,7 +86,7 @@ - + @@ -95,29 +95,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/systemhealthp2.summary b/pengine/test10/systemhealthp2.summary index 36d9675..95fa6a7 100644 --- a/pengine/test10/systemhealthp2.summary +++ b/pengine/test10/systemhealthp2.summary @@ -17,8 +17,6 @@ Executing cluster transition: * Resource action: apache_1 monitor on hs21c * Resource action: nfs_1 monitor on hs21c * Fencing hs21d (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped * Resource action: apache_1 start on hs21c * Resource action: nfs_1 start on hs21c * Resource action: apache_1 monitor=10000 on hs21c diff --git a/pengine/test10/systemhealthp3.dot b/pengine/test10/systemhealthp3.dot index fd8b19f..f03f57f 100644 --- a/pengine/test10/systemhealthp3.dot +++ b/pengine/test10/systemhealthp3.dot @@ -1,10 +1,6 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "apache_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] "nfs_1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith 'reboot' hs21d" -> "stonith_complete" [ style = bold] "stonith 'reboot' hs21d" [ style=bold color="green" fontcolor="black"] "stonith-1_monitor_0 hs21c" [ style=bold color="green" fontcolor="black" ] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/systemhealthp3.exp b/pengine/test10/systemhealthp3.exp index 9eb5366..c17102b 100644 --- a/pengine/test10/systemhealthp3.exp +++ b/pengine/test10/systemhealthp3.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,29 +37,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/systemhealthp3.summary b/pengine/test10/systemhealthp3.summary index 836d8f5..b98d923 100644 --- a/pengine/test10/systemhealthp3.summary +++ b/pengine/test10/systemhealthp3.summary @@ -15,8 +15,6 @@ Executing cluster transition: * Resource action: apache_1 monitor on hs21c * Resource action: nfs_1 monitor on hs21c * Fencing hs21d (reboot) - * Pseudo action: stonith_complete - * Pseudo action: all_stopped Revised cluster status: Online: [ hs21c ] diff --git a/pengine/test10/tags-coloc-order-1.exp b/pengine/test10/tags-coloc-order-1.exp index 88f7a77..cf4599e 100644 --- a/pengine/test10/tags-coloc-order-1.exp +++ b/pengine/test10/tags-coloc-order-1.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,26 +35,26 @@ - + - + - + - + - + @@ -63,7 +63,7 @@ - + @@ -72,26 +72,26 @@ - + - + - + - + - + @@ -100,7 +100,7 @@ - + @@ -109,26 +109,26 @@ - + - + - + - + - + @@ -137,7 +137,7 @@ - + diff --git a/pengine/test10/tags-coloc-order-2.exp b/pengine/test10/tags-coloc-order-2.exp index 385e758..a2149bb 100644 --- a/pengine/test10/tags-coloc-order-2.exp +++ b/pengine/test10/tags-coloc-order-2.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,26 +35,26 @@ - + - + - + - + - + @@ -63,7 +63,7 @@ - + @@ -72,26 +72,26 @@ - + - + - + - + - + @@ -100,7 +100,7 @@ - + @@ -109,26 +109,26 @@ - + - + - + - + - + @@ -137,7 +137,7 @@ - + @@ -146,26 +146,26 @@ - + - + - + - + - + @@ -174,7 +174,7 @@ - + @@ -183,26 +183,26 @@ - + - + - + - + - + @@ -211,7 +211,7 @@ - + @@ -220,26 +220,26 @@ - + - + - + - + - + @@ -248,7 +248,7 @@ - + @@ -257,26 +257,26 @@ - + - + - + - + - + @@ -285,7 +285,7 @@ - + @@ -294,26 +294,26 @@ - + - + - + - + - + @@ -322,7 +322,7 @@ - + @@ -331,26 +331,26 @@ - + - + - + - + - + @@ -359,7 +359,7 @@ - + @@ -368,26 +368,26 @@ - + - + - + - + - + @@ -396,7 +396,7 @@ - + @@ -405,26 +405,26 @@ - + - + - + - + - + @@ -433,7 +433,7 @@ - + diff --git a/pengine/test10/tags-location.exp b/pengine/test10/tags-location.exp index ad8ea50..4a3b39a 100644 --- a/pengine/test10/tags-location.exp +++ b/pengine/test10/tags-location.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,23 +35,23 @@ - + - + - + - + @@ -60,7 +60,7 @@ - + @@ -69,23 +69,23 @@ - + - + - + - + @@ -94,7 +94,7 @@ - + @@ -103,23 +103,23 @@ - + - + - + - + @@ -128,7 +128,7 @@ - + @@ -137,23 +137,23 @@ - + - + - + - + @@ -162,7 +162,7 @@ - + @@ -171,23 +171,23 @@ - + - + - + - + @@ -196,7 +196,7 @@ - + diff --git a/pengine/test10/tags-ticket.exp b/pengine/test10/tags-ticket.exp index d2b6b6d..8aad924 100644 --- a/pengine/test10/tags-ticket.exp +++ b/pengine/test10/tags-ticket.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -100,7 +100,7 @@ - + diff --git a/pengine/test10/target-0.exp b/pengine/test10/target-0.exp index 9b2e65d..16476a9 100644 --- a/pengine/test10/target-0.exp +++ b/pengine/test10/target-0.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -127,7 +127,7 @@ - + diff --git a/pengine/test10/target-1.dot b/pengine/test10/target-1.dot index db6f64f..aa7b619 100644 --- a/pengine/test10/target-1.dot +++ b/pengine/test10/target-1.dot @@ -2,7 +2,6 @@ "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" ] @@ -12,6 +11,5 @@ "rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "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 f4e79e7..89b78c5 100644 --- a/pengine/test10/target-1.exp +++ b/pengine/test10/target-1.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -109,24 +109,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/target-1.summary b/pengine/test10/target-1.summary index 6044338..d76ab1a 100644 --- a/pengine/test10/target-1.summary +++ b/pengine/test10/target-1.summary @@ -27,7 +27,6 @@ Executing cluster transition: * Resource action: rsc_c001n01 monitor on c001n08 * Resource action: rsc_c001n01 monitor on c001n03 * Resource action: rsc_c001n01 monitor on c001n02 - * Pseudo action: all_stopped Revised cluster status: Online: [ c001n01 c001n02 c001n03 c001n08 ] diff --git a/pengine/test10/target-2.dot b/pengine/test10/target-2.dot index 55b9d85..c281635 100644 --- a/pengine/test10/target-2.dot +++ b/pengine/test10/target-2.dot @@ -2,7 +2,6 @@ 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" ] @@ -15,6 +14,5 @@ digraph "g" { "rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ] "rsc_c001n08_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ] "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 6ced2e2..ef4c3a4 100644 --- a/pengine/test10/target-2.exp +++ b/pengine/test10/target-2.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -136,24 +136,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/target-2.summary b/pengine/test10/target-2.summary index 6e83fdc..2ed15e8 100644 --- a/pengine/test10/target-2.summary +++ b/pengine/test10/target-2.summary @@ -29,7 +29,6 @@ Executing cluster transition: * Resource action: rsc_c001n01 monitor on c001n08 * Resource action: rsc_c001n01 monitor on c001n03 * Resource action: rsc_c001n01 monitor on c001n02 - * Pseudo action: all_stopped Revised cluster status: Online: [ c001n01 c001n02 c001n03 c001n08 ] diff --git a/pengine/test10/template-1.exp b/pengine/test10/template-1.exp index 5d54900..1ad9ccc 100644 --- a/pengine/test10/template-1.exp +++ b/pengine/test10/template-1.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,39 +19,39 @@ - + - + - + - + - + - + - + @@ -60,7 +60,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -77,7 +77,7 @@ - + diff --git a/pengine/test10/template-2.exp b/pengine/test10/template-2.exp index 712b6e3..8708ebc 100644 --- a/pengine/test10/template-2.exp +++ b/pengine/test10/template-2.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,39 +19,39 @@ - + - + - + - + - + - + - + @@ -60,7 +60,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -77,7 +77,7 @@ - + diff --git a/pengine/test10/template-3.exp b/pengine/test10/template-3.exp index 63f880b..4b4b5ec 100644 --- a/pengine/test10/template-3.exp +++ b/pengine/test10/template-3.exp @@ -1,52 +1,52 @@ - + - + - + - + - + - + - + - + - + @@ -55,7 +55,7 @@ - + @@ -64,52 +64,52 @@ - + - + - + - + - + - + - + - + - + @@ -118,7 +118,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -135,7 +135,7 @@ - + diff --git a/pengine/test10/template-clone-group.exp b/pengine/test10/template-clone-group.exp index ee137e4..0cdd617 100644 --- a/pengine/test10/template-clone-group.exp +++ b/pengine/test10/template-clone-group.exp @@ -1,50 +1,50 @@ - + - + - + - + - + - + - + - + - + @@ -53,23 +53,23 @@ - + - + - + - + @@ -78,50 +78,50 @@ - + - + - + - + - + - + - + - + - + @@ -130,23 +130,23 @@ - + - + - + - + @@ -155,40 +155,40 @@ - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/template-clone-primitive.exp b/pengine/test10/template-clone-primitive.exp index 5e1d6aa..722baf8 100644 --- a/pengine/test10/template-clone-primitive.exp +++ b/pengine/test10/template-clone-primitive.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,20 +23,20 @@ - + - + - + @@ -45,34 +45,34 @@ - + - + - + - + - + - + - + diff --git a/pengine/test10/template-coloc-1.exp b/pengine/test10/template-coloc-1.exp index 2a0bda5..e659fb9 100644 --- a/pengine/test10/template-coloc-1.exp +++ b/pengine/test10/template-coloc-1.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,23 +35,23 @@ - + - + - + - + @@ -60,7 +60,7 @@ - + @@ -69,23 +69,23 @@ - + - + - + - + @@ -94,7 +94,7 @@ - + @@ -103,23 +103,23 @@ - + - + - + - + @@ -128,7 +128,7 @@ - + diff --git a/pengine/test10/template-coloc-2.exp b/pengine/test10/template-coloc-2.exp index 2a0bda5..e659fb9 100644 --- a/pengine/test10/template-coloc-2.exp +++ b/pengine/test10/template-coloc-2.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,23 +35,23 @@ - + - + - + - + @@ -60,7 +60,7 @@ - + @@ -69,23 +69,23 @@ - + - + - + - + @@ -94,7 +94,7 @@ - + @@ -103,23 +103,23 @@ - + - + - + - + @@ -128,7 +128,7 @@ - + diff --git a/pengine/test10/template-coloc-3.exp b/pengine/test10/template-coloc-3.exp index d71f9c3..555a1bb 100644 --- a/pengine/test10/template-coloc-3.exp +++ b/pengine/test10/template-coloc-3.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,23 +35,23 @@ - + - + - + - + @@ -60,7 +60,7 @@ - + @@ -69,23 +69,23 @@ - + - + - + - + @@ -94,7 +94,7 @@ - + @@ -103,23 +103,23 @@ - + - + - + - + @@ -128,7 +128,7 @@ - + @@ -137,23 +137,23 @@ - + - + - + - + @@ -162,7 +162,7 @@ - + @@ -171,23 +171,23 @@ - + - + - + - + @@ -196,7 +196,7 @@ - + diff --git a/pengine/test10/template-order-1.exp b/pengine/test10/template-order-1.exp index 1346296..992c8f1 100644 --- a/pengine/test10/template-order-1.exp +++ b/pengine/test10/template-order-1.exp @@ -1,26 +1,26 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -38,26 +38,26 @@ - + - + - + - + - + @@ -66,7 +66,7 @@ - + @@ -75,26 +75,26 @@ - + - + - + - + - + @@ -103,7 +103,7 @@ - + @@ -112,23 +112,23 @@ - + - + - + - + @@ -137,7 +137,7 @@ - + diff --git a/pengine/test10/template-order-2.exp b/pengine/test10/template-order-2.exp index 0fbdce8..ab92972 100644 --- a/pengine/test10/template-order-2.exp +++ b/pengine/test10/template-order-2.exp @@ -1,32 +1,32 @@ - + - + - + - + - + - + - + @@ -35,7 +35,7 @@ - + @@ -44,23 +44,23 @@ - + - + - + - + @@ -69,7 +69,7 @@ - + @@ -78,23 +78,23 @@ - + - + - + - + @@ -103,7 +103,7 @@ - + @@ -112,23 +112,23 @@ - + - + - + - + @@ -137,7 +137,7 @@ - + diff --git a/pengine/test10/template-order-3.exp b/pengine/test10/template-order-3.exp index 482bc17..e3f4621 100644 --- a/pengine/test10/template-order-3.exp +++ b/pengine/test10/template-order-3.exp @@ -1,32 +1,32 @@ - + - + - + - + - + - + - + @@ -35,7 +35,7 @@ - + @@ -44,32 +44,32 @@ - + - + - + - + - + - + - + @@ -78,7 +78,7 @@ - + @@ -87,32 +87,32 @@ - + - + - + - + - + - + - + @@ -121,7 +121,7 @@ - + @@ -130,23 +130,23 @@ - + - + - + - + @@ -155,7 +155,7 @@ - + @@ -164,23 +164,23 @@ - + - + - + - + @@ -189,7 +189,7 @@ - + @@ -198,23 +198,23 @@ - + - + - + - + @@ -223,7 +223,7 @@ - + diff --git a/pengine/test10/template-rsc-sets-1.exp b/pengine/test10/template-rsc-sets-1.exp index 8626e4d..24c086b 100644 --- a/pengine/test10/template-rsc-sets-1.exp +++ b/pengine/test10/template-rsc-sets-1.exp @@ -1,26 +1,26 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -38,26 +38,26 @@ - + - + - + - + - + @@ -66,7 +66,7 @@ - + @@ -75,26 +75,26 @@ - + - + - + - + - + @@ -103,7 +103,7 @@ - + @@ -112,23 +112,23 @@ - + - + - + - + @@ -137,7 +137,7 @@ - + @@ -146,26 +146,26 @@ - + - + - + - + - + @@ -174,7 +174,7 @@ - + diff --git a/pengine/test10/template-rsc-sets-2.exp b/pengine/test10/template-rsc-sets-2.exp index 6e17f4b..d7fdd5c 100644 --- a/pengine/test10/template-rsc-sets-2.exp +++ b/pengine/test10/template-rsc-sets-2.exp @@ -1,26 +1,26 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -38,26 +38,26 @@ - + - + - + - + - + @@ -66,7 +66,7 @@ - + @@ -75,26 +75,26 @@ - + - + - + - + - + @@ -103,7 +103,7 @@ - + @@ -112,23 +112,23 @@ - + - + - + - + @@ -137,7 +137,7 @@ - + @@ -146,32 +146,32 @@ - + - + - + - + - + - + - + @@ -180,7 +180,7 @@ - + diff --git a/pengine/test10/template-rsc-sets-3.exp b/pengine/test10/template-rsc-sets-3.exp index 8626e4d..24c086b 100644 --- a/pengine/test10/template-rsc-sets-3.exp +++ b/pengine/test10/template-rsc-sets-3.exp @@ -1,26 +1,26 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -38,26 +38,26 @@ - + - + - + - + - + @@ -66,7 +66,7 @@ - + @@ -75,26 +75,26 @@ - + - + - + - + - + @@ -103,7 +103,7 @@ - + @@ -112,23 +112,23 @@ - + - + - + - + @@ -137,7 +137,7 @@ - + @@ -146,26 +146,26 @@ - + - + - + - + - + @@ -174,7 +174,7 @@ - + diff --git a/pengine/test10/template-rsc-sets-4.exp b/pengine/test10/template-rsc-sets-4.exp index fc7ef83..3015823 100644 --- a/pengine/test10/template-rsc-sets-4.exp +++ b/pengine/test10/template-rsc-sets-4.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/pengine/test10/template-ticket.exp b/pengine/test10/template-ticket.exp index fc7ef83..3015823 100644 --- a/pengine/test10/template-ticket.exp +++ b/pengine/test10/template-ticket.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/pengine/test10/ticket-clone-1.exp b/pengine/test10/ticket-clone-1.exp index 030cd37..24b9304 100644 --- a/pengine/test10/ticket-clone-1.exp +++ b/pengine/test10/ticket-clone-1.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/pengine/test10/ticket-clone-10.exp b/pengine/test10/ticket-clone-10.exp index 030cd37..24b9304 100644 --- a/pengine/test10/ticket-clone-10.exp +++ b/pengine/test10/ticket-clone-10.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/pengine/test10/ticket-clone-11.exp b/pengine/test10/ticket-clone-11.exp index 1a0ddf0..4f3a5f6 100644 --- a/pengine/test10/ticket-clone-11.exp +++ b/pengine/test10/ticket-clone-11.exp @@ -1,77 +1,77 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/ticket-clone-14.dot b/pengine/test10/ticket-clone-14.dot index 8b3952e..78ddef9 100644 --- a/pengine/test10/ticket-clone-14.dot +++ b/pengine/test10/ticket-clone-14.dot @@ -1,14 +1,11 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "clone1_stop_0" -> "clone1_stopped_0" [ style = bold] "clone1_stop_0" -> "rsc1:0_stop_0 node2" [ style = bold] "clone1_stop_0" -> "rsc1:1_stop_0 node1" [ style = bold] "clone1_stop_0" [ style=bold color="green" fontcolor="orange"] "clone1_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rsc1:0_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1:0_stop_0 node2" -> "clone1_stopped_0" [ style = bold] "rsc1:0_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc1:1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1:1_stop_0 node1" -> "clone1_stopped_0" [ style = bold] "rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/ticket-clone-14.exp b/pengine/test10/ticket-clone-14.exp index c2fcb25..05413c9 100644 --- a/pengine/test10/ticket-clone-14.exp +++ b/pengine/test10/ticket-clone-14.exp @@ -1,70 +1,54 @@ - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-clone-14.summary b/pengine/test10/ticket-clone-14.summary index ceb76bf..a3faa8c 100644 --- a/pengine/test10/ticket-clone-14.summary +++ b/pengine/test10/ticket-clone-14.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Resource action: rsc1:1 stop on node1 * Resource action: rsc1:0 stop on node2 * Pseudo action: clone1_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/ticket-clone-15.dot b/pengine/test10/ticket-clone-15.dot index 8b3952e..78ddef9 100644 --- a/pengine/test10/ticket-clone-15.dot +++ b/pengine/test10/ticket-clone-15.dot @@ -1,14 +1,11 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "clone1_stop_0" -> "clone1_stopped_0" [ style = bold] "clone1_stop_0" -> "rsc1:0_stop_0 node2" [ style = bold] "clone1_stop_0" -> "rsc1:1_stop_0 node1" [ style = bold] "clone1_stop_0" [ style=bold color="green" fontcolor="orange"] "clone1_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rsc1:0_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1:0_stop_0 node2" -> "clone1_stopped_0" [ style = bold] "rsc1:0_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc1:1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1:1_stop_0 node1" -> "clone1_stopped_0" [ style = bold] "rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/ticket-clone-15.exp b/pengine/test10/ticket-clone-15.exp index c2fcb25..05413c9 100644 --- a/pengine/test10/ticket-clone-15.exp +++ b/pengine/test10/ticket-clone-15.exp @@ -1,70 +1,54 @@ - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-clone-15.summary b/pengine/test10/ticket-clone-15.summary index ceb76bf..a3faa8c 100644 --- a/pengine/test10/ticket-clone-15.summary +++ b/pengine/test10/ticket-clone-15.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Resource action: rsc1:1 stop on node1 * Resource action: rsc1:0 stop on node2 * Pseudo action: clone1_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/ticket-clone-17.dot b/pengine/test10/ticket-clone-17.dot index 8b3952e..78ddef9 100644 --- a/pengine/test10/ticket-clone-17.dot +++ b/pengine/test10/ticket-clone-17.dot @@ -1,14 +1,11 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "clone1_stop_0" -> "clone1_stopped_0" [ style = bold] "clone1_stop_0" -> "rsc1:0_stop_0 node2" [ style = bold] "clone1_stop_0" -> "rsc1:1_stop_0 node1" [ style = bold] "clone1_stop_0" [ style=bold color="green" fontcolor="orange"] "clone1_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rsc1:0_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1:0_stop_0 node2" -> "clone1_stopped_0" [ style = bold] "rsc1:0_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc1:1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1:1_stop_0 node1" -> "clone1_stopped_0" [ style = bold] "rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/ticket-clone-17.exp b/pengine/test10/ticket-clone-17.exp index c2fcb25..05413c9 100644 --- a/pengine/test10/ticket-clone-17.exp +++ b/pengine/test10/ticket-clone-17.exp @@ -1,70 +1,54 @@ - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-clone-17.summary b/pengine/test10/ticket-clone-17.summary index ceb76bf..a3faa8c 100644 --- a/pengine/test10/ticket-clone-17.summary +++ b/pengine/test10/ticket-clone-17.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Resource action: rsc1:1 stop on node1 * Resource action: rsc1:0 stop on node2 * Pseudo action: clone1_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/ticket-clone-18.dot b/pengine/test10/ticket-clone-18.dot index 8b3952e..78ddef9 100644 --- a/pengine/test10/ticket-clone-18.dot +++ b/pengine/test10/ticket-clone-18.dot @@ -1,14 +1,11 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "clone1_stop_0" -> "clone1_stopped_0" [ style = bold] "clone1_stop_0" -> "rsc1:0_stop_0 node2" [ style = bold] "clone1_stop_0" -> "rsc1:1_stop_0 node1" [ style = bold] "clone1_stop_0" [ style=bold color="green" fontcolor="orange"] "clone1_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rsc1:0_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1:0_stop_0 node2" -> "clone1_stopped_0" [ style = bold] "rsc1:0_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc1:1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1:1_stop_0 node1" -> "clone1_stopped_0" [ style = bold] "rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/ticket-clone-18.exp b/pengine/test10/ticket-clone-18.exp index c2fcb25..05413c9 100644 --- a/pengine/test10/ticket-clone-18.exp +++ b/pengine/test10/ticket-clone-18.exp @@ -1,70 +1,54 @@ - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-clone-18.summary b/pengine/test10/ticket-clone-18.summary index ceb76bf..a3faa8c 100644 --- a/pengine/test10/ticket-clone-18.summary +++ b/pengine/test10/ticket-clone-18.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Resource action: rsc1:1 stop on node1 * Resource action: rsc1:0 stop on node2 * Pseudo action: clone1_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/ticket-clone-2.exp b/pengine/test10/ticket-clone-2.exp index 1a0ddf0..4f3a5f6 100644 --- a/pengine/test10/ticket-clone-2.exp +++ b/pengine/test10/ticket-clone-2.exp @@ -1,77 +1,77 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/ticket-clone-20.dot b/pengine/test10/ticket-clone-20.dot index 8b3952e..78ddef9 100644 --- a/pengine/test10/ticket-clone-20.dot +++ b/pengine/test10/ticket-clone-20.dot @@ -1,14 +1,11 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "clone1_stop_0" -> "clone1_stopped_0" [ style = bold] "clone1_stop_0" -> "rsc1:0_stop_0 node2" [ style = bold] "clone1_stop_0" -> "rsc1:1_stop_0 node1" [ style = bold] "clone1_stop_0" [ style=bold color="green" fontcolor="orange"] "clone1_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rsc1:0_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1:0_stop_0 node2" -> "clone1_stopped_0" [ style = bold] "rsc1:0_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc1:1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1:1_stop_0 node1" -> "clone1_stopped_0" [ style = bold] "rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/ticket-clone-20.exp b/pengine/test10/ticket-clone-20.exp index c2fcb25..05413c9 100644 --- a/pengine/test10/ticket-clone-20.exp +++ b/pengine/test10/ticket-clone-20.exp @@ -1,70 +1,54 @@ - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-clone-20.summary b/pengine/test10/ticket-clone-20.summary index ceb76bf..a3faa8c 100644 --- a/pengine/test10/ticket-clone-20.summary +++ b/pengine/test10/ticket-clone-20.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Resource action: rsc1:1 stop on node1 * Resource action: rsc1:0 stop on node2 * Pseudo action: clone1_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/ticket-clone-21.dot b/pengine/test10/ticket-clone-21.dot index c26817e..f6f6efb 100644 --- a/pengine/test10/ticket-clone-21.dot +++ b/pengine/test10/ticket-clone-21.dot @@ -1,17 +1,13 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "clone1_stop_0" -> "clone1_stopped_0" [ style = bold] "clone1_stop_0" -> "rsc1:0_stop_0 node2" [ style = bold] "clone1_stop_0" -> "rsc1:1_stop_0 node1" [ style = bold] "clone1_stop_0" [ style=bold color="green" fontcolor="orange"] "clone1_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rsc1:0_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1:0_stop_0 node2" -> "clone1_stopped_0" [ style = bold] "rsc1:0_stop_0 node2" [ style=bold color="green" fontcolor="orange"] -"rsc1:1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1:1_stop_0 node1" -> "clone1_stopped_0" [ style = bold] "rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="orange"] -"rsc_stonith_stop_0 node1" -> "all_stopped" [ style = bold] "rsc_stonith_stop_0 node1" [ style=bold color="green" fontcolor="orange"] "stonith 'reboot' node1" -> "clone1_stop_0" [ style = bold] "stonith 'reboot' node1" -> "rsc1:1_stop_0 node1" [ style = bold] @@ -20,8 +16,5 @@ digraph "g" { "stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] "stonith 'reboot' node2" -> "clone1_stop_0" [ style = bold] "stonith 'reboot' node2" -> "rsc1:0_stop_0 node2" [ style = bold] -"stonith 'reboot' node2" -> "stonith_complete" [ style = bold] "stonith 'reboot' node2" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/ticket-clone-21.exp b/pengine/test10/ticket-clone-21.exp index bc25bf2..4c9e74f 100644 --- a/pengine/test10/ticket-clone-21.exp +++ b/pengine/test10/ticket-clone-21.exp @@ -1,7 +1,7 @@ - + @@ -13,7 +13,7 @@ - + @@ -22,13 +22,13 @@ - + - + @@ -37,31 +37,31 @@ - + - + - + - + - + - + @@ -76,39 +76,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -122,7 +89,7 @@ - + diff --git a/pengine/test10/ticket-clone-21.summary b/pengine/test10/ticket-clone-21.summary index 1dde14b..7b97275 100644 --- a/pengine/test10/ticket-clone-21.summary +++ b/pengine/test10/ticket-clone-21.summary @@ -18,11 +18,9 @@ Executing cluster transition: * Pseudo action: rsc_stonith_stop_0 * Fencing node2 (reboot) * Pseudo action: clone1_stop_0 - * Pseudo action: stonith_complete * Pseudo action: rsc1:1_stop_0 * Pseudo action: rsc1:0_stop_0 * Pseudo action: clone1_stopped_0 - * Pseudo action: all_stopped Revised cluster status: OFFLINE: [ node1 node2 ] diff --git a/pengine/test10/ticket-clone-23.dot b/pengine/test10/ticket-clone-23.dot index 8b3952e..78ddef9 100644 --- a/pengine/test10/ticket-clone-23.dot +++ b/pengine/test10/ticket-clone-23.dot @@ -1,14 +1,11 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "clone1_stop_0" -> "clone1_stopped_0" [ style = bold] "clone1_stop_0" -> "rsc1:0_stop_0 node2" [ style = bold] "clone1_stop_0" -> "rsc1:1_stop_0 node1" [ style = bold] "clone1_stop_0" [ style=bold color="green" fontcolor="orange"] "clone1_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rsc1:0_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1:0_stop_0 node2" -> "clone1_stopped_0" [ style = bold] "rsc1:0_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc1:1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1:1_stop_0 node1" -> "clone1_stopped_0" [ style = bold] "rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/ticket-clone-23.exp b/pengine/test10/ticket-clone-23.exp index c2fcb25..05413c9 100644 --- a/pengine/test10/ticket-clone-23.exp +++ b/pengine/test10/ticket-clone-23.exp @@ -1,70 +1,54 @@ - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-clone-23.summary b/pengine/test10/ticket-clone-23.summary index ceb76bf..a3faa8c 100644 --- a/pengine/test10/ticket-clone-23.summary +++ b/pengine/test10/ticket-clone-23.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Resource action: rsc1:1 stop on node1 * Resource action: rsc1:0 stop on node2 * Pseudo action: clone1_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/ticket-clone-3.dot b/pengine/test10/ticket-clone-3.dot index 6a5d5f1..763a1fc 100644 --- a/pengine/test10/ticket-clone-3.dot +++ b/pengine/test10/ticket-clone-3.dot @@ -1,14 +1,11 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "clone1_stop_0" -> "clone1_stopped_0" [ style = bold] "clone1_stop_0" -> "rsc1:0_stop_0 node2" [ style = bold] "clone1_stop_0" -> "rsc1:1_stop_0 node1" [ style = bold] "clone1_stop_0" [ style=bold color="green" fontcolor="orange" ] "clone1_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"rsc1:0_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1:0_stop_0 node2" -> "clone1_stopped_0" [ style = bold] "rsc1:0_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc1:1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1:1_stop_0 node1" -> "clone1_stopped_0" [ style = bold] "rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/ticket-clone-3.exp b/pengine/test10/ticket-clone-3.exp index c2fcb25..05413c9 100644 --- a/pengine/test10/ticket-clone-3.exp +++ b/pengine/test10/ticket-clone-3.exp @@ -1,70 +1,54 @@ - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-clone-3.summary b/pengine/test10/ticket-clone-3.summary index ceb76bf..a3faa8c 100644 --- a/pengine/test10/ticket-clone-3.summary +++ b/pengine/test10/ticket-clone-3.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Resource action: rsc1:1 stop on node1 * Resource action: rsc1:0 stop on node2 * Pseudo action: clone1_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/ticket-clone-4.exp b/pengine/test10/ticket-clone-4.exp index 030cd37..24b9304 100644 --- a/pengine/test10/ticket-clone-4.exp +++ b/pengine/test10/ticket-clone-4.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/pengine/test10/ticket-clone-5.exp b/pengine/test10/ticket-clone-5.exp index 1a0ddf0..4f3a5f6 100644 --- a/pengine/test10/ticket-clone-5.exp +++ b/pengine/test10/ticket-clone-5.exp @@ -1,77 +1,77 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/ticket-clone-6.dot b/pengine/test10/ticket-clone-6.dot index 6a5d5f1..763a1fc 100644 --- a/pengine/test10/ticket-clone-6.dot +++ b/pengine/test10/ticket-clone-6.dot @@ -1,14 +1,11 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "clone1_stop_0" -> "clone1_stopped_0" [ style = bold] "clone1_stop_0" -> "rsc1:0_stop_0 node2" [ style = bold] "clone1_stop_0" -> "rsc1:1_stop_0 node1" [ style = bold] "clone1_stop_0" [ style=bold color="green" fontcolor="orange" ] "clone1_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"rsc1:0_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1:0_stop_0 node2" -> "clone1_stopped_0" [ style = bold] "rsc1:0_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc1:1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1:1_stop_0 node1" -> "clone1_stopped_0" [ style = bold] "rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/ticket-clone-6.exp b/pengine/test10/ticket-clone-6.exp index c2fcb25..05413c9 100644 --- a/pengine/test10/ticket-clone-6.exp +++ b/pengine/test10/ticket-clone-6.exp @@ -1,70 +1,54 @@ - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-clone-6.summary b/pengine/test10/ticket-clone-6.summary index ceb76bf..a3faa8c 100644 --- a/pengine/test10/ticket-clone-6.summary +++ b/pengine/test10/ticket-clone-6.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Resource action: rsc1:1 stop on node1 * Resource action: rsc1:0 stop on node2 * Pseudo action: clone1_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/ticket-clone-7.exp b/pengine/test10/ticket-clone-7.exp index 030cd37..24b9304 100644 --- a/pengine/test10/ticket-clone-7.exp +++ b/pengine/test10/ticket-clone-7.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/pengine/test10/ticket-clone-8.exp b/pengine/test10/ticket-clone-8.exp index 1a0ddf0..4f3a5f6 100644 --- a/pengine/test10/ticket-clone-8.exp +++ b/pengine/test10/ticket-clone-8.exp @@ -1,77 +1,77 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/ticket-clone-9.dot b/pengine/test10/ticket-clone-9.dot index 8abddd4..7c8a3da 100644 --- a/pengine/test10/ticket-clone-9.dot +++ b/pengine/test10/ticket-clone-9.dot @@ -1,17 +1,13 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "clone1_stop_0" -> "clone1_stopped_0" [ style = bold] "clone1_stop_0" -> "rsc1:0_stop_0 node2" [ style = bold] "clone1_stop_0" -> "rsc1:1_stop_0 node1" [ style = bold] "clone1_stop_0" [ style=bold color="green" fontcolor="orange" ] "clone1_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"rsc1:0_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1:0_stop_0 node2" -> "clone1_stopped_0" [ style = bold] "rsc1:0_stop_0 node2" [ style=bold color="green" fontcolor="orange" ] -"rsc1:1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1:1_stop_0 node1" -> "clone1_stopped_0" [ style = bold] "rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="orange" ] -"rsc_stonith_stop_0 node1" -> "all_stopped" [ style = bold] "rsc_stonith_stop_0 node1" [ style=bold color="green" fontcolor="orange"] "stonith 'reboot' node1" -> "clone1_stop_0" [ style = bold] "stonith 'reboot' node1" -> "rsc1:1_stop_0 node1" [ style = bold] @@ -20,8 +16,5 @@ digraph "g" { "stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] "stonith 'reboot' node2" -> "clone1_stop_0" [ style = bold] "stonith 'reboot' node2" -> "rsc1:0_stop_0 node2" [ style = bold] -"stonith 'reboot' node2" -> "stonith_complete" [ style = bold] "stonith 'reboot' node2" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/ticket-clone-9.exp b/pengine/test10/ticket-clone-9.exp index bc25bf2..4c9e74f 100644 --- a/pengine/test10/ticket-clone-9.exp +++ b/pengine/test10/ticket-clone-9.exp @@ -1,7 +1,7 @@ - + @@ -13,7 +13,7 @@ - + @@ -22,13 +22,13 @@ - + - + @@ -37,31 +37,31 @@ - + - + - + - + - + - + @@ -76,39 +76,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -122,7 +89,7 @@ - + diff --git a/pengine/test10/ticket-clone-9.summary b/pengine/test10/ticket-clone-9.summary index 1dde14b..7b97275 100644 --- a/pengine/test10/ticket-clone-9.summary +++ b/pengine/test10/ticket-clone-9.summary @@ -18,11 +18,9 @@ Executing cluster transition: * Pseudo action: rsc_stonith_stop_0 * Fencing node2 (reboot) * Pseudo action: clone1_stop_0 - * Pseudo action: stonith_complete * Pseudo action: rsc1:1_stop_0 * Pseudo action: rsc1:0_stop_0 * Pseudo action: clone1_stopped_0 - * Pseudo action: all_stopped Revised cluster status: OFFLINE: [ node1 node2 ] diff --git a/pengine/test10/ticket-group-1.exp b/pengine/test10/ticket-group-1.exp index 4283891..de9e84b 100644 --- a/pengine/test10/ticket-group-1.exp +++ b/pengine/test10/ticket-group-1.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/pengine/test10/ticket-group-10.exp b/pengine/test10/ticket-group-10.exp index 4283891..de9e84b 100644 --- a/pengine/test10/ticket-group-10.exp +++ b/pengine/test10/ticket-group-10.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/pengine/test10/ticket-group-11.exp b/pengine/test10/ticket-group-11.exp index e019e1b..5a7f812 100644 --- a/pengine/test10/ticket-group-11.exp +++ b/pengine/test10/ticket-group-11.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -27,56 +27,56 @@ - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/ticket-group-14.dot b/pengine/test10/ticket-group-14.dot index 805bb7c..3cf4598 100644 --- a/pengine/test10/ticket-group-14.dot +++ b/pengine/test10/ticket-group-14.dot @@ -1,14 +1,11 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "group1_stop_0" -> "group1_stopped_0" [ style = bold] "group1_stop_0" -> "rsc1_stop_0 node2" [ style = bold] "group1_stop_0" -> "rsc2_stop_0 node2" [ style = bold] "group1_stop_0" [ style=bold color="green" fontcolor="orange"] "group1_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" -> "group1_stopped_0" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc2_stop_0 node2" -> "all_stopped" [ style = bold] "rsc2_stop_0 node2" -> "group1_stopped_0" [ style = bold] "rsc2_stop_0 node2" -> "rsc1_stop_0 node2" [ style = bold] "rsc2_stop_0 node2" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/ticket-group-14.exp b/pengine/test10/ticket-group-14.exp index 173635c..1a151a6 100644 --- a/pengine/test10/ticket-group-14.exp +++ b/pengine/test10/ticket-group-14.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -27,45 +27,30 @@ - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/ticket-group-14.summary b/pengine/test10/ticket-group-14.summary index 824bb70..533f124 100644 --- a/pengine/test10/ticket-group-14.summary +++ b/pengine/test10/ticket-group-14.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Pseudo action: group1_stop_0 * Resource action: rsc2 stop on node2 * Resource action: rsc1 stop on node2 - * Pseudo action: all_stopped * Pseudo action: group1_stopped_0 Revised cluster status: diff --git a/pengine/test10/ticket-group-15.dot b/pengine/test10/ticket-group-15.dot index 805bb7c..3cf4598 100644 --- a/pengine/test10/ticket-group-15.dot +++ b/pengine/test10/ticket-group-15.dot @@ -1,14 +1,11 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "group1_stop_0" -> "group1_stopped_0" [ style = bold] "group1_stop_0" -> "rsc1_stop_0 node2" [ style = bold] "group1_stop_0" -> "rsc2_stop_0 node2" [ style = bold] "group1_stop_0" [ style=bold color="green" fontcolor="orange"] "group1_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" -> "group1_stopped_0" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc2_stop_0 node2" -> "all_stopped" [ style = bold] "rsc2_stop_0 node2" -> "group1_stopped_0" [ style = bold] "rsc2_stop_0 node2" -> "rsc1_stop_0 node2" [ style = bold] "rsc2_stop_0 node2" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/ticket-group-15.exp b/pengine/test10/ticket-group-15.exp index 173635c..1a151a6 100644 --- a/pengine/test10/ticket-group-15.exp +++ b/pengine/test10/ticket-group-15.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -27,45 +27,30 @@ - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/ticket-group-15.summary b/pengine/test10/ticket-group-15.summary index 824bb70..533f124 100644 --- a/pengine/test10/ticket-group-15.summary +++ b/pengine/test10/ticket-group-15.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Pseudo action: group1_stop_0 * Resource action: rsc2 stop on node2 * Resource action: rsc1 stop on node2 - * Pseudo action: all_stopped * Pseudo action: group1_stopped_0 Revised cluster status: diff --git a/pengine/test10/ticket-group-17.dot b/pengine/test10/ticket-group-17.dot index 805bb7c..3cf4598 100644 --- a/pengine/test10/ticket-group-17.dot +++ b/pengine/test10/ticket-group-17.dot @@ -1,14 +1,11 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "group1_stop_0" -> "group1_stopped_0" [ style = bold] "group1_stop_0" -> "rsc1_stop_0 node2" [ style = bold] "group1_stop_0" -> "rsc2_stop_0 node2" [ style = bold] "group1_stop_0" [ style=bold color="green" fontcolor="orange"] "group1_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" -> "group1_stopped_0" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc2_stop_0 node2" -> "all_stopped" [ style = bold] "rsc2_stop_0 node2" -> "group1_stopped_0" [ style = bold] "rsc2_stop_0 node2" -> "rsc1_stop_0 node2" [ style = bold] "rsc2_stop_0 node2" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/ticket-group-17.exp b/pengine/test10/ticket-group-17.exp index 173635c..1a151a6 100644 --- a/pengine/test10/ticket-group-17.exp +++ b/pengine/test10/ticket-group-17.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -27,45 +27,30 @@ - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/ticket-group-17.summary b/pengine/test10/ticket-group-17.summary index 824bb70..533f124 100644 --- a/pengine/test10/ticket-group-17.summary +++ b/pengine/test10/ticket-group-17.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Pseudo action: group1_stop_0 * Resource action: rsc2 stop on node2 * Resource action: rsc1 stop on node2 - * Pseudo action: all_stopped * Pseudo action: group1_stopped_0 Revised cluster status: diff --git a/pengine/test10/ticket-group-18.dot b/pengine/test10/ticket-group-18.dot index 805bb7c..3cf4598 100644 --- a/pengine/test10/ticket-group-18.dot +++ b/pengine/test10/ticket-group-18.dot @@ -1,14 +1,11 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "group1_stop_0" -> "group1_stopped_0" [ style = bold] "group1_stop_0" -> "rsc1_stop_0 node2" [ style = bold] "group1_stop_0" -> "rsc2_stop_0 node2" [ style = bold] "group1_stop_0" [ style=bold color="green" fontcolor="orange"] "group1_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" -> "group1_stopped_0" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc2_stop_0 node2" -> "all_stopped" [ style = bold] "rsc2_stop_0 node2" -> "group1_stopped_0" [ style = bold] "rsc2_stop_0 node2" -> "rsc1_stop_0 node2" [ style = bold] "rsc2_stop_0 node2" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/ticket-group-18.exp b/pengine/test10/ticket-group-18.exp index 173635c..1a151a6 100644 --- a/pengine/test10/ticket-group-18.exp +++ b/pengine/test10/ticket-group-18.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -27,45 +27,30 @@ - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/ticket-group-18.summary b/pengine/test10/ticket-group-18.summary index 824bb70..533f124 100644 --- a/pengine/test10/ticket-group-18.summary +++ b/pengine/test10/ticket-group-18.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Pseudo action: group1_stop_0 * Resource action: rsc2 stop on node2 * Resource action: rsc1 stop on node2 - * Pseudo action: all_stopped * Pseudo action: group1_stopped_0 Revised cluster status: diff --git a/pengine/test10/ticket-group-2.exp b/pengine/test10/ticket-group-2.exp index e019e1b..5a7f812 100644 --- a/pengine/test10/ticket-group-2.exp +++ b/pengine/test10/ticket-group-2.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -27,56 +27,56 @@ - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/ticket-group-20.dot b/pengine/test10/ticket-group-20.dot index 805bb7c..3cf4598 100644 --- a/pengine/test10/ticket-group-20.dot +++ b/pengine/test10/ticket-group-20.dot @@ -1,14 +1,11 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "group1_stop_0" -> "group1_stopped_0" [ style = bold] "group1_stop_0" -> "rsc1_stop_0 node2" [ style = bold] "group1_stop_0" -> "rsc2_stop_0 node2" [ style = bold] "group1_stop_0" [ style=bold color="green" fontcolor="orange"] "group1_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" -> "group1_stopped_0" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc2_stop_0 node2" -> "all_stopped" [ style = bold] "rsc2_stop_0 node2" -> "group1_stopped_0" [ style = bold] "rsc2_stop_0 node2" -> "rsc1_stop_0 node2" [ style = bold] "rsc2_stop_0 node2" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/ticket-group-20.exp b/pengine/test10/ticket-group-20.exp index 173635c..1a151a6 100644 --- a/pengine/test10/ticket-group-20.exp +++ b/pengine/test10/ticket-group-20.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -27,45 +27,30 @@ - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/ticket-group-20.summary b/pengine/test10/ticket-group-20.summary index 824bb70..533f124 100644 --- a/pengine/test10/ticket-group-20.summary +++ b/pengine/test10/ticket-group-20.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Pseudo action: group1_stop_0 * Resource action: rsc2 stop on node2 * Resource action: rsc1 stop on node2 - * Pseudo action: all_stopped * Pseudo action: group1_stopped_0 Revised cluster status: diff --git a/pengine/test10/ticket-group-21.dot b/pengine/test10/ticket-group-21.dot index dd4520f..f53aca7 100644 --- a/pengine/test10/ticket-group-21.dot +++ b/pengine/test10/ticket-group-21.dot @@ -1,22 +1,16 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "group1_stop_0" -> "group1_stopped_0" [ style = bold] "group1_stop_0" -> "rsc1_stop_0 node2" [ style = bold] "group1_stop_0" -> "rsc2_stop_0 node2" [ style = bold] "group1_stop_0" [ style=bold color="green" fontcolor="orange"] "group1_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" -> "group1_stopped_0" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="orange"] -"rsc2_stop_0 node2" -> "all_stopped" [ style = bold] "rsc2_stop_0 node2" -> "group1_stopped_0" [ style = bold] "rsc2_stop_0 node2" -> "rsc1_stop_0 node2" [ style = bold] "rsc2_stop_0 node2" [ style=bold color="green" fontcolor="orange"] "stonith 'reboot' node2" -> "group1_stop_0" [ style = bold] "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_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/ticket-group-21.exp b/pengine/test10/ticket-group-21.exp index 4a51d5f..9597b5e 100644 --- a/pengine/test10/ticket-group-21.exp +++ b/pengine/test10/ticket-group-21.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -31,7 +31,7 @@ - + @@ -40,16 +40,16 @@ - + - + - + @@ -58,42 +58,12 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-group-21.summary b/pengine/test10/ticket-group-21.summary index e397a42..01dd32e 100644 --- a/pengine/test10/ticket-group-21.summary +++ b/pengine/test10/ticket-group-21.summary @@ -16,9 +16,7 @@ Executing cluster transition: * Fencing node2 (reboot) * Pseudo action: group1_stop_0 * Pseudo action: rsc2_stop_0 - * Pseudo action: stonith_complete * Pseudo action: rsc1_stop_0 - * Pseudo action: all_stopped * Pseudo action: group1_stopped_0 Revised cluster status: diff --git a/pengine/test10/ticket-group-23.dot b/pengine/test10/ticket-group-23.dot index 805bb7c..3cf4598 100644 --- a/pengine/test10/ticket-group-23.dot +++ b/pengine/test10/ticket-group-23.dot @@ -1,14 +1,11 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "group1_stop_0" -> "group1_stopped_0" [ style = bold] "group1_stop_0" -> "rsc1_stop_0 node2" [ style = bold] "group1_stop_0" -> "rsc2_stop_0 node2" [ style = bold] "group1_stop_0" [ style=bold color="green" fontcolor="orange"] "group1_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" -> "group1_stopped_0" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc2_stop_0 node2" -> "all_stopped" [ style = bold] "rsc2_stop_0 node2" -> "group1_stopped_0" [ style = bold] "rsc2_stop_0 node2" -> "rsc1_stop_0 node2" [ style = bold] "rsc2_stop_0 node2" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/ticket-group-23.exp b/pengine/test10/ticket-group-23.exp index 173635c..1a151a6 100644 --- a/pengine/test10/ticket-group-23.exp +++ b/pengine/test10/ticket-group-23.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -27,45 +27,30 @@ - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/ticket-group-23.summary b/pengine/test10/ticket-group-23.summary index 824bb70..533f124 100644 --- a/pengine/test10/ticket-group-23.summary +++ b/pengine/test10/ticket-group-23.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Pseudo action: group1_stop_0 * Resource action: rsc2 stop on node2 * Resource action: rsc1 stop on node2 - * Pseudo action: all_stopped * Pseudo action: group1_stopped_0 Revised cluster status: diff --git a/pengine/test10/ticket-group-3.dot b/pengine/test10/ticket-group-3.dot index cac1548..b1aa7f0 100644 --- a/pengine/test10/ticket-group-3.dot +++ b/pengine/test10/ticket-group-3.dot @@ -1,14 +1,11 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "group1_stop_0" -> "group1_stopped_0" [ style = bold] "group1_stop_0" -> "rsc1_stop_0 node2" [ style = bold] "group1_stop_0" -> "rsc2_stop_0 node2" [ style = bold] "group1_stop_0" [ style=bold color="green" fontcolor="orange" ] "group1_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" -> "group1_stopped_0" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2_stop_0 node2" -> "all_stopped" [ style = bold] "rsc2_stop_0 node2" -> "group1_stopped_0" [ style = bold] "rsc2_stop_0 node2" -> "rsc1_stop_0 node2" [ style = bold] "rsc2_stop_0 node2" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/ticket-group-3.exp b/pengine/test10/ticket-group-3.exp index 173635c..1a151a6 100644 --- a/pengine/test10/ticket-group-3.exp +++ b/pengine/test10/ticket-group-3.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -27,45 +27,30 @@ - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/ticket-group-3.summary b/pengine/test10/ticket-group-3.summary index 824bb70..533f124 100644 --- a/pengine/test10/ticket-group-3.summary +++ b/pengine/test10/ticket-group-3.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Pseudo action: group1_stop_0 * Resource action: rsc2 stop on node2 * Resource action: rsc1 stop on node2 - * Pseudo action: all_stopped * Pseudo action: group1_stopped_0 Revised cluster status: diff --git a/pengine/test10/ticket-group-4.exp b/pengine/test10/ticket-group-4.exp index 4283891..de9e84b 100644 --- a/pengine/test10/ticket-group-4.exp +++ b/pengine/test10/ticket-group-4.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/pengine/test10/ticket-group-5.exp b/pengine/test10/ticket-group-5.exp index e019e1b..5a7f812 100644 --- a/pengine/test10/ticket-group-5.exp +++ b/pengine/test10/ticket-group-5.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -27,56 +27,56 @@ - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/ticket-group-6.dot b/pengine/test10/ticket-group-6.dot index cac1548..b1aa7f0 100644 --- a/pengine/test10/ticket-group-6.dot +++ b/pengine/test10/ticket-group-6.dot @@ -1,14 +1,11 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "group1_stop_0" -> "group1_stopped_0" [ style = bold] "group1_stop_0" -> "rsc1_stop_0 node2" [ style = bold] "group1_stop_0" -> "rsc2_stop_0 node2" [ style = bold] "group1_stop_0" [ style=bold color="green" fontcolor="orange" ] "group1_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" -> "group1_stopped_0" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2_stop_0 node2" -> "all_stopped" [ style = bold] "rsc2_stop_0 node2" -> "group1_stopped_0" [ style = bold] "rsc2_stop_0 node2" -> "rsc1_stop_0 node2" [ style = bold] "rsc2_stop_0 node2" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/ticket-group-6.exp b/pengine/test10/ticket-group-6.exp index 173635c..1a151a6 100644 --- a/pengine/test10/ticket-group-6.exp +++ b/pengine/test10/ticket-group-6.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -27,45 +27,30 @@ - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/ticket-group-6.summary b/pengine/test10/ticket-group-6.summary index 824bb70..533f124 100644 --- a/pengine/test10/ticket-group-6.summary +++ b/pengine/test10/ticket-group-6.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Pseudo action: group1_stop_0 * Resource action: rsc2 stop on node2 * Resource action: rsc1 stop on node2 - * Pseudo action: all_stopped * Pseudo action: group1_stopped_0 Revised cluster status: diff --git a/pengine/test10/ticket-group-7.exp b/pengine/test10/ticket-group-7.exp index 4283891..de9e84b 100644 --- a/pengine/test10/ticket-group-7.exp +++ b/pengine/test10/ticket-group-7.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/pengine/test10/ticket-group-8.exp b/pengine/test10/ticket-group-8.exp index e019e1b..5a7f812 100644 --- a/pengine/test10/ticket-group-8.exp +++ b/pengine/test10/ticket-group-8.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -27,56 +27,56 @@ - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/ticket-group-9.dot b/pengine/test10/ticket-group-9.dot index 8a1c710..e109f11 100644 --- a/pengine/test10/ticket-group-9.dot +++ b/pengine/test10/ticket-group-9.dot @@ -1,22 +1,16 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "group1_stop_0" -> "group1_stopped_0" [ style = bold] "group1_stop_0" -> "rsc1_stop_0 node2" [ style = bold] "group1_stop_0" -> "rsc2_stop_0 node2" [ style = bold] "group1_stop_0" [ style=bold color="green" fontcolor="orange" ] "group1_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" -> "group1_stopped_0" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="orange" ] -"rsc2_stop_0 node2" -> "all_stopped" [ style = bold] "rsc2_stop_0 node2" -> "group1_stopped_0" [ style = bold] "rsc2_stop_0 node2" -> "rsc1_stop_0 node2" [ style = bold] "rsc2_stop_0 node2" [ style=bold color="green" fontcolor="orange" ] "stonith 'reboot' node2" -> "group1_stop_0" [ style = bold] "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_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/ticket-group-9.exp b/pengine/test10/ticket-group-9.exp index 4a51d5f..9597b5e 100644 --- a/pengine/test10/ticket-group-9.exp +++ b/pengine/test10/ticket-group-9.exp @@ -1,25 +1,25 @@ - + - + - + - + - + @@ -31,7 +31,7 @@ - + @@ -40,16 +40,16 @@ - + - + - + @@ -58,42 +58,12 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-group-9.summary b/pengine/test10/ticket-group-9.summary index e397a42..01dd32e 100644 --- a/pengine/test10/ticket-group-9.summary +++ b/pengine/test10/ticket-group-9.summary @@ -16,9 +16,7 @@ Executing cluster transition: * Fencing node2 (reboot) * Pseudo action: group1_stop_0 * Pseudo action: rsc2_stop_0 - * Pseudo action: stonith_complete * Pseudo action: rsc1_stop_0 - * Pseudo action: all_stopped * Pseudo action: group1_stopped_0 Revised cluster status: diff --git a/pengine/test10/ticket-master-1.exp b/pengine/test10/ticket-master-1.exp index 89db25b..114d804 100644 --- a/pengine/test10/ticket-master-1.exp +++ b/pengine/test10/ticket-master-1.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/pengine/test10/ticket-master-10.exp b/pengine/test10/ticket-master-10.exp index 959cf2e..3849df1 100644 --- a/pengine/test10/ticket-master-10.exp +++ b/pengine/test10/ticket-master-10.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,20 +23,20 @@ - + - + - + @@ -45,34 +45,34 @@ - + - + - + - + - + - + - + diff --git a/pengine/test10/ticket-master-11.exp b/pengine/test10/ticket-master-11.exp index e0286fd..f085117 100644 --- a/pengine/test10/ticket-master-11.exp +++ b/pengine/test10/ticket-master-11.exp @@ -1,32 +1,32 @@ - + - + - + - + - + diff --git a/pengine/test10/ticket-master-14.dot b/pengine/test10/ticket-master-14.dot index f4b1fec..0f2a0e6 100644 --- a/pengine/test10/ticket-master-14.dot +++ b/pengine/test10/ticket-master-14.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "ms1_demote_0" -> "ms1_demoted_0" [ style = bold] "ms1_demote_0" -> "rsc1:1_demote_0 node1" [ style = bold] "ms1_demote_0" [ style=bold color="green" fontcolor="orange"] @@ -10,13 +9,11 @@ digraph "g" { "ms1_stop_0" -> "rsc1:1_stop_0 node1" [ style = bold] "ms1_stop_0" [ style=bold color="green" fontcolor="orange"] "ms1_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rsc1:0_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1:0_stop_0 node2" -> "ms1_stopped_0" [ style = bold] "rsc1:0_stop_0 node2" [ style=bold color="green" fontcolor="black"] "rsc1:1_demote_0 node1" -> "ms1_demoted_0" [ style = bold] "rsc1:1_demote_0 node1" -> "rsc1:1_stop_0 node1" [ style = bold] "rsc1:1_demote_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc1:1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1:1_stop_0 node1" -> "ms1_stopped_0" [ style = bold] "rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/ticket-master-14.exp b/pengine/test10/ticket-master-14.exp index 1b83773..3a09340 100644 --- a/pengine/test10/ticket-master-14.exp +++ b/pengine/test10/ticket-master-14.exp @@ -1,64 +1,64 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -66,46 +66,31 @@ - + - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/ticket-master-14.summary b/pengine/test10/ticket-master-14.summary index fa14935..1979b8f 100644 --- a/pengine/test10/ticket-master-14.summary +++ b/pengine/test10/ticket-master-14.summary @@ -19,7 +19,6 @@ Executing cluster transition: * Resource action: rsc1:1 stop on node1 * Resource action: rsc1:0 stop on node2 * Pseudo action: ms1_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/ticket-master-15.dot b/pengine/test10/ticket-master-15.dot index f4b1fec..0f2a0e6 100644 --- a/pengine/test10/ticket-master-15.dot +++ b/pengine/test10/ticket-master-15.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "ms1_demote_0" -> "ms1_demoted_0" [ style = bold] "ms1_demote_0" -> "rsc1:1_demote_0 node1" [ style = bold] "ms1_demote_0" [ style=bold color="green" fontcolor="orange"] @@ -10,13 +9,11 @@ digraph "g" { "ms1_stop_0" -> "rsc1:1_stop_0 node1" [ style = bold] "ms1_stop_0" [ style=bold color="green" fontcolor="orange"] "ms1_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rsc1:0_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1:0_stop_0 node2" -> "ms1_stopped_0" [ style = bold] "rsc1:0_stop_0 node2" [ style=bold color="green" fontcolor="black"] "rsc1:1_demote_0 node1" -> "ms1_demoted_0" [ style = bold] "rsc1:1_demote_0 node1" -> "rsc1:1_stop_0 node1" [ style = bold] "rsc1:1_demote_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc1:1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1:1_stop_0 node1" -> "ms1_stopped_0" [ style = bold] "rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/ticket-master-15.exp b/pengine/test10/ticket-master-15.exp index 1b83773..3a09340 100644 --- a/pengine/test10/ticket-master-15.exp +++ b/pengine/test10/ticket-master-15.exp @@ -1,64 +1,64 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -66,46 +66,31 @@ - + - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/ticket-master-15.summary b/pengine/test10/ticket-master-15.summary index fa14935..1979b8f 100644 --- a/pengine/test10/ticket-master-15.summary +++ b/pengine/test10/ticket-master-15.summary @@ -19,7 +19,6 @@ Executing cluster transition: * Resource action: rsc1:1 stop on node1 * Resource action: rsc1:0 stop on node2 * Pseudo action: ms1_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/ticket-master-17.exp b/pengine/test10/ticket-master-17.exp index 860a37e..77e4e13 100644 --- a/pengine/test10/ticket-master-17.exp +++ b/pengine/test10/ticket-master-17.exp @@ -1,35 +1,35 @@ - + - + - + - + - + - + diff --git a/pengine/test10/ticket-master-18.exp b/pengine/test10/ticket-master-18.exp index 860a37e..77e4e13 100644 --- a/pengine/test10/ticket-master-18.exp +++ b/pengine/test10/ticket-master-18.exp @@ -1,35 +1,35 @@ - + - + - + - + - + - + diff --git a/pengine/test10/ticket-master-2.exp b/pengine/test10/ticket-master-2.exp index 847adfd..de49485 100644 --- a/pengine/test10/ticket-master-2.exp +++ b/pengine/test10/ticket-master-2.exp @@ -1,91 +1,91 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/ticket-master-20.exp b/pengine/test10/ticket-master-20.exp index 860a37e..77e4e13 100644 --- a/pengine/test10/ticket-master-20.exp +++ b/pengine/test10/ticket-master-20.exp @@ -1,35 +1,35 @@ - + - + - + - + - + - + diff --git a/pengine/test10/ticket-master-21.dot b/pengine/test10/ticket-master-21.dot index 78c1551..78d5e15 100644 --- a/pengine/test10/ticket-master-21.dot +++ b/pengine/test10/ticket-master-21.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "ms1_demote_0" -> "ms1_demoted_0" [ style = bold] "ms1_demote_0" -> "rsc1:1_demote_0 node1" [ style = bold] "ms1_demote_0" [ style=bold color="green" fontcolor="orange"] @@ -12,18 +11,13 @@ digraph "g" { "rsc1:1_demote_0 node1" -> "ms1_demoted_0" [ style = bold] "rsc1:1_demote_0 node1" -> "rsc1:1_stop_0 node1" [ style = bold] "rsc1:1_demote_0 node1" [ style=bold color="green" fontcolor="orange"] -"rsc1:1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1:1_stop_0 node1" -> "ms1_stopped_0" [ style = bold] "rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="orange"] "rsc_stonith_start_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc_stonith_stop_0 node1" -> "all_stopped" [ style = bold] "rsc_stonith_stop_0 node1" -> "rsc_stonith_start_0 node2" [ style = bold] "rsc_stonith_stop_0 node1" [ style=bold color="green" fontcolor="orange"] "stonith 'reboot' node1" -> "ms1_stop_0" [ style = bold] "stonith 'reboot' node1" -> "rsc1:1_demote_0 node1" [ style = bold] "stonith 'reboot' node1" -> "rsc1:1_stop_0 node1" [ style = bold] -"stonith 'reboot' node1" -> "stonith_complete" [ style = bold] "stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/ticket-master-21.exp b/pengine/test10/ticket-master-21.exp index 76114c0..794d079 100644 --- a/pengine/test10/ticket-master-21.exp +++ b/pengine/test10/ticket-master-21.exp @@ -1,20 +1,20 @@ - + - + - + @@ -22,7 +22,7 @@ - + @@ -31,16 +31,16 @@ - + - + - + @@ -49,28 +49,28 @@ - + - + - + - + - + @@ -78,22 +78,22 @@ - + - + - + - + @@ -102,42 +102,12 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-master-21.summary b/pengine/test10/ticket-master-21.summary index 88f62fd..d04015f 100644 --- a/pengine/test10/ticket-master-21.summary +++ b/pengine/test10/ticket-master-21.summary @@ -20,10 +20,8 @@ Executing cluster transition: * Pseudo action: rsc1:1_demote_0 * Pseudo action: ms1_demoted_0 * Pseudo action: ms1_stop_0 - * Pseudo action: stonith_complete * Pseudo action: rsc1:1_stop_0 * Pseudo action: ms1_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ node2 ] diff --git a/pengine/test10/ticket-master-23.exp b/pengine/test10/ticket-master-23.exp index 860a37e..77e4e13 100644 --- a/pengine/test10/ticket-master-23.exp +++ b/pengine/test10/ticket-master-23.exp @@ -1,35 +1,35 @@ - + - + - + - + - + - + diff --git a/pengine/test10/ticket-master-3.dot b/pengine/test10/ticket-master-3.dot index 76d4270..7f62f51 100644 --- a/pengine/test10/ticket-master-3.dot +++ b/pengine/test10/ticket-master-3.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "ms1_demote_0" -> "ms1_demoted_0" [ style = bold] "ms1_demote_0" -> "rsc1:1_demote_0 node1" [ style = bold] "ms1_demote_0" [ style=bold color="green" fontcolor="orange" ] @@ -10,13 +9,11 @@ digraph "g" { "ms1_stop_0" -> "rsc1:1_stop_0 node1" [ style = bold] "ms1_stop_0" [ style=bold color="green" fontcolor="orange" ] "ms1_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"rsc1:0_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1:0_stop_0 node2" -> "ms1_stopped_0" [ style = bold] "rsc1:0_stop_0 node2" [ style=bold color="green" fontcolor="black" ] "rsc1:1_demote_0 node1" -> "ms1_demoted_0" [ style = bold] "rsc1:1_demote_0 node1" -> "rsc1:1_stop_0 node1" [ style = bold] "rsc1:1_demote_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc1:1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1:1_stop_0 node1" -> "ms1_stopped_0" [ style = bold] "rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/ticket-master-3.exp b/pengine/test10/ticket-master-3.exp index 1b83773..3a09340 100644 --- a/pengine/test10/ticket-master-3.exp +++ b/pengine/test10/ticket-master-3.exp @@ -1,64 +1,64 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -66,46 +66,31 @@ - + - + - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/ticket-master-3.summary b/pengine/test10/ticket-master-3.summary index fa14935..1979b8f 100644 --- a/pengine/test10/ticket-master-3.summary +++ b/pengine/test10/ticket-master-3.summary @@ -19,7 +19,6 @@ Executing cluster transition: * Resource action: rsc1:1 stop on node1 * Resource action: rsc1:0 stop on node2 * Pseudo action: ms1_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/ticket-master-4.exp b/pengine/test10/ticket-master-4.exp index 959cf2e..3849df1 100644 --- a/pengine/test10/ticket-master-4.exp +++ b/pengine/test10/ticket-master-4.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,20 +23,20 @@ - + - + - + @@ -45,34 +45,34 @@ - + - + - + - + - + - + - + diff --git a/pengine/test10/ticket-master-5.exp b/pengine/test10/ticket-master-5.exp index e0286fd..f085117 100644 --- a/pengine/test10/ticket-master-5.exp +++ b/pengine/test10/ticket-master-5.exp @@ -1,32 +1,32 @@ - + - + - + - + - + diff --git a/pengine/test10/ticket-master-6.exp b/pengine/test10/ticket-master-6.exp index 860a37e..77e4e13 100644 --- a/pengine/test10/ticket-master-6.exp +++ b/pengine/test10/ticket-master-6.exp @@ -1,35 +1,35 @@ - + - + - + - + - + - + diff --git a/pengine/test10/ticket-master-7.exp b/pengine/test10/ticket-master-7.exp index 959cf2e..3849df1 100644 --- a/pengine/test10/ticket-master-7.exp +++ b/pengine/test10/ticket-master-7.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,20 +23,20 @@ - + - + - + @@ -45,34 +45,34 @@ - + - + - + - + - + - + - + diff --git a/pengine/test10/ticket-master-8.exp b/pengine/test10/ticket-master-8.exp index e0286fd..f085117 100644 --- a/pengine/test10/ticket-master-8.exp +++ b/pengine/test10/ticket-master-8.exp @@ -1,32 +1,32 @@ - + - + - + - + - + diff --git a/pengine/test10/ticket-master-9.dot b/pengine/test10/ticket-master-9.dot index f6cf1c0..0d55491 100644 --- a/pengine/test10/ticket-master-9.dot +++ b/pengine/test10/ticket-master-9.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "ms1_demote_0" -> "ms1_demoted_0" [ style = bold] "ms1_demote_0" -> "rsc1:1_demote_0 node1" [ style = bold] "ms1_demote_0" [ style=bold color="green" fontcolor="orange" ] @@ -12,18 +11,13 @@ digraph "g" { "rsc1:1_demote_0 node1" -> "ms1_demoted_0" [ style = bold] "rsc1:1_demote_0 node1" -> "rsc1:1_stop_0 node1" [ style = bold] "rsc1:1_demote_0 node1" [ style=bold color="green" fontcolor="orange"] -"rsc1:1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1:1_stop_0 node1" -> "ms1_stopped_0" [ style = bold] "rsc1:1_stop_0 node1" [ style=bold color="green" fontcolor="orange" ] "rsc_stonith_start_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc_stonith_stop_0 node1" -> "all_stopped" [ style = bold] "rsc_stonith_stop_0 node1" -> "rsc_stonith_start_0 node2" [ style = bold] "rsc_stonith_stop_0 node1" [ style=bold color="green" fontcolor="orange"] "stonith 'reboot' node1" -> "ms1_stop_0" [ style = bold] "stonith 'reboot' node1" -> "rsc1:1_demote_0 node1" [ style = bold] "stonith 'reboot' node1" -> "rsc1:1_stop_0 node1" [ style = bold] -"stonith 'reboot' node1" -> "stonith_complete" [ style = bold] "stonith 'reboot' node1" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/ticket-master-9.exp b/pengine/test10/ticket-master-9.exp index 76114c0..794d079 100644 --- a/pengine/test10/ticket-master-9.exp +++ b/pengine/test10/ticket-master-9.exp @@ -1,20 +1,20 @@ - + - + - + @@ -22,7 +22,7 @@ - + @@ -31,16 +31,16 @@ - + - + - + @@ -49,28 +49,28 @@ - + - + - + - + - + @@ -78,22 +78,22 @@ - + - + - + - + @@ -102,42 +102,12 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-master-9.summary b/pengine/test10/ticket-master-9.summary index 88f62fd..d04015f 100644 --- a/pengine/test10/ticket-master-9.summary +++ b/pengine/test10/ticket-master-9.summary @@ -20,10 +20,8 @@ Executing cluster transition: * Pseudo action: rsc1:1_demote_0 * Pseudo action: ms1_demoted_0 * Pseudo action: ms1_stop_0 - * Pseudo action: stonith_complete * Pseudo action: rsc1:1_stop_0 * Pseudo action: ms1_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Online: [ node2 ] diff --git a/pengine/test10/ticket-primitive-1.exp b/pengine/test10/ticket-primitive-1.exp index 2266d73..3abd193 100644 --- a/pengine/test10/ticket-primitive-1.exp +++ b/pengine/test10/ticket-primitive-1.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/pengine/test10/ticket-primitive-10.exp b/pengine/test10/ticket-primitive-10.exp index 2266d73..3abd193 100644 --- a/pengine/test10/ticket-primitive-10.exp +++ b/pengine/test10/ticket-primitive-10.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/pengine/test10/ticket-primitive-11.exp b/pengine/test10/ticket-primitive-11.exp index 8d65f90..20cff93 100644 --- a/pengine/test10/ticket-primitive-11.exp +++ b/pengine/test10/ticket-primitive-11.exp @@ -1,20 +1,20 @@ - + - + - + diff --git a/pengine/test10/ticket-primitive-14.dot b/pengine/test10/ticket-primitive-14.dot index 76728a8..3f84f6d 100644 --- a/pengine/test10/ticket-primitive-14.dot +++ b/pengine/test10/ticket-primitive-14.dot @@ -1,5 +1,3 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/ticket-primitive-14.exp b/pengine/test10/ticket-primitive-14.exp index 9f9d84f..525f8eb 100644 --- a/pengine/test10/ticket-primitive-14.exp +++ b/pengine/test10/ticket-primitive-14.exp @@ -1,24 +1,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-primitive-14.summary b/pengine/test10/ticket-primitive-14.summary index b31757b..a40b3e0 100644 --- a/pengine/test10/ticket-primitive-14.summary +++ b/pengine/test10/ticket-primitive-14.summary @@ -10,7 +10,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on node2 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/ticket-primitive-15.dot b/pengine/test10/ticket-primitive-15.dot index 76728a8..3f84f6d 100644 --- a/pengine/test10/ticket-primitive-15.dot +++ b/pengine/test10/ticket-primitive-15.dot @@ -1,5 +1,3 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/ticket-primitive-15.exp b/pengine/test10/ticket-primitive-15.exp index 9f9d84f..525f8eb 100644 --- a/pengine/test10/ticket-primitive-15.exp +++ b/pengine/test10/ticket-primitive-15.exp @@ -1,24 +1,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-primitive-15.summary b/pengine/test10/ticket-primitive-15.summary index b31757b..a40b3e0 100644 --- a/pengine/test10/ticket-primitive-15.summary +++ b/pengine/test10/ticket-primitive-15.summary @@ -10,7 +10,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on node2 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/ticket-primitive-17.dot b/pengine/test10/ticket-primitive-17.dot index 76728a8..3f84f6d 100644 --- a/pengine/test10/ticket-primitive-17.dot +++ b/pengine/test10/ticket-primitive-17.dot @@ -1,5 +1,3 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/ticket-primitive-17.exp b/pengine/test10/ticket-primitive-17.exp index 9f9d84f..525f8eb 100644 --- a/pengine/test10/ticket-primitive-17.exp +++ b/pengine/test10/ticket-primitive-17.exp @@ -1,24 +1,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-primitive-17.summary b/pengine/test10/ticket-primitive-17.summary index b31757b..a40b3e0 100644 --- a/pengine/test10/ticket-primitive-17.summary +++ b/pengine/test10/ticket-primitive-17.summary @@ -10,7 +10,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on node2 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/ticket-primitive-18.dot b/pengine/test10/ticket-primitive-18.dot index 76728a8..3f84f6d 100644 --- a/pengine/test10/ticket-primitive-18.dot +++ b/pengine/test10/ticket-primitive-18.dot @@ -1,5 +1,3 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/ticket-primitive-18.exp b/pengine/test10/ticket-primitive-18.exp index 9f9d84f..525f8eb 100644 --- a/pengine/test10/ticket-primitive-18.exp +++ b/pengine/test10/ticket-primitive-18.exp @@ -1,24 +1,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-primitive-18.summary b/pengine/test10/ticket-primitive-18.summary index b31757b..a40b3e0 100644 --- a/pengine/test10/ticket-primitive-18.summary +++ b/pengine/test10/ticket-primitive-18.summary @@ -10,7 +10,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on node2 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/ticket-primitive-2.exp b/pengine/test10/ticket-primitive-2.exp index 8d65f90..20cff93 100644 --- a/pengine/test10/ticket-primitive-2.exp +++ b/pengine/test10/ticket-primitive-2.exp @@ -1,20 +1,20 @@ - + - + - + diff --git a/pengine/test10/ticket-primitive-20.dot b/pengine/test10/ticket-primitive-20.dot index 76728a8..3f84f6d 100644 --- a/pengine/test10/ticket-primitive-20.dot +++ b/pengine/test10/ticket-primitive-20.dot @@ -1,5 +1,3 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/ticket-primitive-20.exp b/pengine/test10/ticket-primitive-20.exp index 9f9d84f..525f8eb 100644 --- a/pengine/test10/ticket-primitive-20.exp +++ b/pengine/test10/ticket-primitive-20.exp @@ -1,24 +1,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-primitive-20.summary b/pengine/test10/ticket-primitive-20.summary index b31757b..a40b3e0 100644 --- a/pengine/test10/ticket-primitive-20.summary +++ b/pengine/test10/ticket-primitive-20.summary @@ -10,7 +10,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on node2 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/ticket-primitive-21.dot b/pengine/test10/ticket-primitive-21.dot index d31b522..5e1c0a9 100644 --- a/pengine/test10/ticket-primitive-21.dot +++ b/pengine/test10/ticket-primitive-21.dot @@ -1,10 +1,5 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="orange"] "stonith 'reboot' node2" -> "rsc1_stop_0 node2" [ style = bold] -"stonith 'reboot' node2" -> "stonith_complete" [ style = bold] "stonith 'reboot' node2" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/ticket-primitive-21.exp b/pengine/test10/ticket-primitive-21.exp index 7895296..14b8632 100644 --- a/pengine/test10/ticket-primitive-21.exp +++ b/pengine/test10/ticket-primitive-21.exp @@ -1,7 +1,7 @@ - + @@ -13,33 +13,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-primitive-21.summary b/pengine/test10/ticket-primitive-21.summary index 6c0f1ba..3d6d636 100644 --- a/pengine/test10/ticket-primitive-21.summary +++ b/pengine/test10/ticket-primitive-21.summary @@ -12,8 +12,6 @@ Transition Summary: Executing cluster transition: * Fencing node2 (reboot) * Pseudo action: rsc1_stop_0 - * Pseudo action: stonith_complete - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 ] diff --git a/pengine/test10/ticket-primitive-23.dot b/pengine/test10/ticket-primitive-23.dot index 76728a8..3f84f6d 100644 --- a/pengine/test10/ticket-primitive-23.dot +++ b/pengine/test10/ticket-primitive-23.dot @@ -1,5 +1,3 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/ticket-primitive-23.exp b/pengine/test10/ticket-primitive-23.exp index 9f9d84f..525f8eb 100644 --- a/pengine/test10/ticket-primitive-23.exp +++ b/pengine/test10/ticket-primitive-23.exp @@ -1,24 +1,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-primitive-23.summary b/pengine/test10/ticket-primitive-23.summary index b31757b..a40b3e0 100644 --- a/pengine/test10/ticket-primitive-23.summary +++ b/pengine/test10/ticket-primitive-23.summary @@ -10,7 +10,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on node2 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/ticket-primitive-3.dot b/pengine/test10/ticket-primitive-3.dot index 527b7fb..bec9bb5 100644 --- a/pengine/test10/ticket-primitive-3.dot +++ b/pengine/test10/ticket-primitive-3.dot @@ -1,5 +1,3 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/ticket-primitive-3.exp b/pengine/test10/ticket-primitive-3.exp index 9f9d84f..525f8eb 100644 --- a/pengine/test10/ticket-primitive-3.exp +++ b/pengine/test10/ticket-primitive-3.exp @@ -1,24 +1,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-primitive-3.summary b/pengine/test10/ticket-primitive-3.summary index b31757b..a40b3e0 100644 --- a/pengine/test10/ticket-primitive-3.summary +++ b/pengine/test10/ticket-primitive-3.summary @@ -10,7 +10,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on node2 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/ticket-primitive-4.exp b/pengine/test10/ticket-primitive-4.exp index 2266d73..3abd193 100644 --- a/pengine/test10/ticket-primitive-4.exp +++ b/pengine/test10/ticket-primitive-4.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/pengine/test10/ticket-primitive-5.exp b/pengine/test10/ticket-primitive-5.exp index 8d65f90..20cff93 100644 --- a/pengine/test10/ticket-primitive-5.exp +++ b/pengine/test10/ticket-primitive-5.exp @@ -1,20 +1,20 @@ - + - + - + diff --git a/pengine/test10/ticket-primitive-6.dot b/pengine/test10/ticket-primitive-6.dot index 527b7fb..bec9bb5 100644 --- a/pengine/test10/ticket-primitive-6.dot +++ b/pengine/test10/ticket-primitive-6.dot @@ -1,5 +1,3 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/ticket-primitive-6.exp b/pengine/test10/ticket-primitive-6.exp index 9f9d84f..525f8eb 100644 --- a/pengine/test10/ticket-primitive-6.exp +++ b/pengine/test10/ticket-primitive-6.exp @@ -1,24 +1,11 @@ - + - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-primitive-6.summary b/pengine/test10/ticket-primitive-6.summary index b31757b..a40b3e0 100644 --- a/pengine/test10/ticket-primitive-6.summary +++ b/pengine/test10/ticket-primitive-6.summary @@ -10,7 +10,6 @@ Transition Summary: Executing cluster transition: * Resource action: rsc1 stop on node2 - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 node2 ] diff --git a/pengine/test10/ticket-primitive-7.exp b/pengine/test10/ticket-primitive-7.exp index 2266d73..3abd193 100644 --- a/pengine/test10/ticket-primitive-7.exp +++ b/pengine/test10/ticket-primitive-7.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/pengine/test10/ticket-primitive-8.exp b/pengine/test10/ticket-primitive-8.exp index 8d65f90..20cff93 100644 --- a/pengine/test10/ticket-primitive-8.exp +++ b/pengine/test10/ticket-primitive-8.exp @@ -1,20 +1,20 @@ - + - + - + diff --git a/pengine/test10/ticket-primitive-9.dot b/pengine/test10/ticket-primitive-9.dot index 88b0625..be0e60d 100644 --- a/pengine/test10/ticket-primitive-9.dot +++ b/pengine/test10/ticket-primitive-9.dot @@ -1,10 +1,5 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="orange" ] "stonith 'reboot' node2" -> "rsc1_stop_0 node2" [ style = bold] -"stonith 'reboot' node2" -> "stonith_complete" [ style = bold] "stonith 'reboot' node2" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange" ] } diff --git a/pengine/test10/ticket-primitive-9.exp b/pengine/test10/ticket-primitive-9.exp index 7895296..14b8632 100644 --- a/pengine/test10/ticket-primitive-9.exp +++ b/pengine/test10/ticket-primitive-9.exp @@ -1,7 +1,7 @@ - + @@ -13,33 +13,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-primitive-9.summary b/pengine/test10/ticket-primitive-9.summary index 6c0f1ba..3d6d636 100644 --- a/pengine/test10/ticket-primitive-9.summary +++ b/pengine/test10/ticket-primitive-9.summary @@ -12,8 +12,6 @@ Transition Summary: Executing cluster transition: * Fencing node2 (reboot) * Pseudo action: rsc1_stop_0 - * Pseudo action: stonith_complete - * Pseudo action: all_stopped Revised cluster status: Online: [ node1 ] diff --git a/pengine/test10/ticket-rsc-sets-1.exp b/pengine/test10/ticket-rsc-sets-1.exp index 08397eb..d07fc8c 100644 --- a/pengine/test10/ticket-rsc-sets-1.exp +++ b/pengine/test10/ticket-rsc-sets-1.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,20 +73,20 @@ - + - + - + @@ -95,20 +95,20 @@ - + - + - + @@ -117,34 +117,34 @@ - + - + - + - + - + - + - + diff --git a/pengine/test10/ticket-rsc-sets-10.dot b/pengine/test10/ticket-rsc-sets-10.dot index 15a3f29..bf671ed 100644 --- a/pengine/test10/ticket-rsc-sets-10.dot +++ b/pengine/test10/ticket-rsc-sets-10.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "clone4_stop_0" -> "clone4_stopped_0" [ style = bold] "clone4_stop_0" -> "rsc4:0_stop_0 node2" [ style = bold] "clone4_stop_0" -> "rsc4:1_stop_0 node1" [ style = bold] @@ -14,19 +13,14 @@ digraph "g" { "ms5_demote_0" -> "rsc5:1_demote_0 node1" [ style = bold] "ms5_demote_0" [ style=bold color="green" fontcolor="orange"] "ms5_demoted_0" [ style=bold color="green" fontcolor="orange"] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "group2_stopped_0" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc3_stop_0 node1" -> "all_stopped" [ style = bold] "rsc3_stop_0 node1" -> "group2_stopped_0" [ style = bold] "rsc3_stop_0 node1" -> "rsc2_stop_0 node1" [ style = bold] "rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc4:0_stop_0 node2" -> "all_stopped" [ style = bold] "rsc4:0_stop_0 node2" -> "clone4_stopped_0" [ style = bold] "rsc4:0_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc4:1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc4:1_stop_0 node1" -> "clone4_stopped_0" [ style = bold] "rsc4:1_stop_0 node1" [ style=bold color="green" fontcolor="black"] "rsc5:1_demote_0 node1" -> "ms5_demoted_0" [ style = bold] diff --git a/pengine/test10/ticket-rsc-sets-10.exp b/pengine/test10/ticket-rsc-sets-10.exp index faf7fa8..e8c7851 100644 --- a/pengine/test10/ticket-rsc-sets-10.exp +++ b/pengine/test10/ticket-rsc-sets-10.exp @@ -1,7 +1,7 @@ - + @@ -10,25 +10,25 @@ - + - + - + - + - + @@ -36,80 +36,80 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -117,63 +117,38 @@ - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-rsc-sets-10.summary b/pengine/test10/ticket-rsc-sets-10.summary index 0a36d45..2df30a5 100644 --- a/pengine/test10/ticket-rsc-sets-10.summary +++ b/pengine/test10/ticket-rsc-sets-10.summary @@ -33,7 +33,6 @@ Executing cluster transition: * Pseudo action: clone4_stopped_0 * Resource action: rsc5:1 demote on node1 * Pseudo action: ms5_demoted_0 - * Pseudo action: all_stopped * Pseudo action: group2_stopped_0 Revised cluster status: diff --git a/pengine/test10/ticket-rsc-sets-12.dot b/pengine/test10/ticket-rsc-sets-12.dot index 9aa1cfa..c07c086 100644 --- a/pengine/test10/ticket-rsc-sets-12.dot +++ b/pengine/test10/ticket-rsc-sets-12.dot @@ -1,16 +1,12 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "group2_stop_0" -> "group2_stopped_0" [ style = bold] "group2_stop_0" -> "rsc2_stop_0 node1" [ style = bold] "group2_stop_0" -> "rsc3_stop_0 node1" [ style = bold] "group2_stop_0" [ style=bold color="green" fontcolor="orange"] "group2_stopped_0" [ style=bold color="green" fontcolor="orange"] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "group2_stopped_0" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc3_stop_0 node1" -> "all_stopped" [ style = bold] "rsc3_stop_0 node1" -> "group2_stopped_0" [ style = bold] "rsc3_stop_0 node1" -> "rsc2_stop_0 node1" [ style = bold] "rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/ticket-rsc-sets-12.exp b/pengine/test10/ticket-rsc-sets-12.exp index da58df0..ba3802c 100644 --- a/pengine/test10/ticket-rsc-sets-12.exp +++ b/pengine/test10/ticket-rsc-sets-12.exp @@ -1,7 +1,7 @@ - + @@ -10,25 +10,25 @@ - + - + - + - + - + @@ -36,48 +36,30 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/ticket-rsc-sets-12.summary b/pengine/test10/ticket-rsc-sets-12.summary index fd22d77..05eb2ea 100644 --- a/pengine/test10/ticket-rsc-sets-12.summary +++ b/pengine/test10/ticket-rsc-sets-12.summary @@ -22,7 +22,6 @@ Executing cluster transition: * Pseudo action: group2_stop_0 * Resource action: rsc3 stop on node1 * Resource action: rsc2 stop on node1 - * Pseudo action: all_stopped * Pseudo action: group2_stopped_0 Revised cluster status: diff --git a/pengine/test10/ticket-rsc-sets-13.dot b/pengine/test10/ticket-rsc-sets-13.dot index 15a3f29..bf671ed 100644 --- a/pengine/test10/ticket-rsc-sets-13.dot +++ b/pengine/test10/ticket-rsc-sets-13.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "clone4_stop_0" -> "clone4_stopped_0" [ style = bold] "clone4_stop_0" -> "rsc4:0_stop_0 node2" [ style = bold] "clone4_stop_0" -> "rsc4:1_stop_0 node1" [ style = bold] @@ -14,19 +13,14 @@ digraph "g" { "ms5_demote_0" -> "rsc5:1_demote_0 node1" [ style = bold] "ms5_demote_0" [ style=bold color="green" fontcolor="orange"] "ms5_demoted_0" [ style=bold color="green" fontcolor="orange"] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "group2_stopped_0" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc3_stop_0 node1" -> "all_stopped" [ style = bold] "rsc3_stop_0 node1" -> "group2_stopped_0" [ style = bold] "rsc3_stop_0 node1" -> "rsc2_stop_0 node1" [ style = bold] "rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc4:0_stop_0 node2" -> "all_stopped" [ style = bold] "rsc4:0_stop_0 node2" -> "clone4_stopped_0" [ style = bold] "rsc4:0_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc4:1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc4:1_stop_0 node1" -> "clone4_stopped_0" [ style = bold] "rsc4:1_stop_0 node1" [ style=bold color="green" fontcolor="black"] "rsc5:1_demote_0 node1" -> "ms5_demoted_0" [ style = bold] diff --git a/pengine/test10/ticket-rsc-sets-13.exp b/pengine/test10/ticket-rsc-sets-13.exp index faf7fa8..e8c7851 100644 --- a/pengine/test10/ticket-rsc-sets-13.exp +++ b/pengine/test10/ticket-rsc-sets-13.exp @@ -1,7 +1,7 @@ - + @@ -10,25 +10,25 @@ - + - + - + - + - + @@ -36,80 +36,80 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -117,63 +117,38 @@ - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-rsc-sets-13.summary b/pengine/test10/ticket-rsc-sets-13.summary index 0a36d45..2df30a5 100644 --- a/pengine/test10/ticket-rsc-sets-13.summary +++ b/pengine/test10/ticket-rsc-sets-13.summary @@ -33,7 +33,6 @@ Executing cluster transition: * Pseudo action: clone4_stopped_0 * Resource action: rsc5:1 demote on node1 * Pseudo action: ms5_demoted_0 - * Pseudo action: all_stopped * Pseudo action: group2_stopped_0 Revised cluster status: diff --git a/pengine/test10/ticket-rsc-sets-14.dot b/pengine/test10/ticket-rsc-sets-14.dot index 15a3f29..bf671ed 100644 --- a/pengine/test10/ticket-rsc-sets-14.dot +++ b/pengine/test10/ticket-rsc-sets-14.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "clone4_stop_0" -> "clone4_stopped_0" [ style = bold] "clone4_stop_0" -> "rsc4:0_stop_0 node2" [ style = bold] "clone4_stop_0" -> "rsc4:1_stop_0 node1" [ style = bold] @@ -14,19 +13,14 @@ digraph "g" { "ms5_demote_0" -> "rsc5:1_demote_0 node1" [ style = bold] "ms5_demote_0" [ style=bold color="green" fontcolor="orange"] "ms5_demoted_0" [ style=bold color="green" fontcolor="orange"] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "group2_stopped_0" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc3_stop_0 node1" -> "all_stopped" [ style = bold] "rsc3_stop_0 node1" -> "group2_stopped_0" [ style = bold] "rsc3_stop_0 node1" -> "rsc2_stop_0 node1" [ style = bold] "rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc4:0_stop_0 node2" -> "all_stopped" [ style = bold] "rsc4:0_stop_0 node2" -> "clone4_stopped_0" [ style = bold] "rsc4:0_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc4:1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc4:1_stop_0 node1" -> "clone4_stopped_0" [ style = bold] "rsc4:1_stop_0 node1" [ style=bold color="green" fontcolor="black"] "rsc5:1_demote_0 node1" -> "ms5_demoted_0" [ style = bold] diff --git a/pengine/test10/ticket-rsc-sets-14.exp b/pengine/test10/ticket-rsc-sets-14.exp index faf7fa8..e8c7851 100644 --- a/pengine/test10/ticket-rsc-sets-14.exp +++ b/pengine/test10/ticket-rsc-sets-14.exp @@ -1,7 +1,7 @@ - + @@ -10,25 +10,25 @@ - + - + - + - + - + @@ -36,80 +36,80 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -117,63 +117,38 @@ - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-rsc-sets-14.summary b/pengine/test10/ticket-rsc-sets-14.summary index 0a36d45..2df30a5 100644 --- a/pengine/test10/ticket-rsc-sets-14.summary +++ b/pengine/test10/ticket-rsc-sets-14.summary @@ -33,7 +33,6 @@ Executing cluster transition: * Pseudo action: clone4_stopped_0 * Resource action: rsc5:1 demote on node1 * Pseudo action: ms5_demoted_0 - * Pseudo action: all_stopped * Pseudo action: group2_stopped_0 Revised cluster status: diff --git a/pengine/test10/ticket-rsc-sets-2.exp b/pengine/test10/ticket-rsc-sets-2.exp index fd16839..888f901 100644 --- a/pengine/test10/ticket-rsc-sets-2.exp +++ b/pengine/test10/ticket-rsc-sets-2.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,25 +23,25 @@ - + - + - + - + - + @@ -49,132 +49,132 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -182,32 +182,32 @@ - + - + - + - + - + diff --git a/pengine/test10/ticket-rsc-sets-3.dot b/pengine/test10/ticket-rsc-sets-3.dot index 20fd229..a5b2418 100644 --- a/pengine/test10/ticket-rsc-sets-3.dot +++ b/pengine/test10/ticket-rsc-sets-3.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "clone4_stop_0" -> "clone4_stopped_0" [ style = bold] "clone4_stop_0" -> "rsc4:0_stop_0 node2" [ style = bold] "clone4_stop_0" -> "rsc4:1_stop_0 node1" [ style = bold] @@ -14,19 +13,14 @@ digraph "g" { "ms5_demote_0" -> "rsc5:1_demote_0 node1" [ style = bold] "ms5_demote_0" [ style=bold color="green" fontcolor="orange" ] "ms5_demoted_0" [ style=bold color="green" fontcolor="orange" ] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "group2_stopped_0" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc3_stop_0 node1" -> "all_stopped" [ style = bold] "rsc3_stop_0 node1" -> "group2_stopped_0" [ style = bold] "rsc3_stop_0 node1" -> "rsc2_stop_0 node1" [ style = bold] "rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc4:0_stop_0 node2" -> "all_stopped" [ style = bold] "rsc4:0_stop_0 node2" -> "clone4_stopped_0" [ style = bold] "rsc4:0_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc4:1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc4:1_stop_0 node1" -> "clone4_stopped_0" [ style = bold] "rsc4:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc5:1_demote_0 node1" -> "ms5_demoted_0" [ style = bold] diff --git a/pengine/test10/ticket-rsc-sets-3.exp b/pengine/test10/ticket-rsc-sets-3.exp index faf7fa8..e8c7851 100644 --- a/pengine/test10/ticket-rsc-sets-3.exp +++ b/pengine/test10/ticket-rsc-sets-3.exp @@ -1,7 +1,7 @@ - + @@ -10,25 +10,25 @@ - + - + - + - + - + @@ -36,80 +36,80 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -117,63 +117,38 @@ - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-rsc-sets-3.summary b/pengine/test10/ticket-rsc-sets-3.summary index 0a36d45..2df30a5 100644 --- a/pengine/test10/ticket-rsc-sets-3.summary +++ b/pengine/test10/ticket-rsc-sets-3.summary @@ -33,7 +33,6 @@ Executing cluster transition: * Pseudo action: clone4_stopped_0 * Resource action: rsc5:1 demote on node1 * Pseudo action: ms5_demoted_0 - * Pseudo action: all_stopped * Pseudo action: group2_stopped_0 Revised cluster status: diff --git a/pengine/test10/ticket-rsc-sets-4.exp b/pengine/test10/ticket-rsc-sets-4.exp index 08397eb..d07fc8c 100644 --- a/pengine/test10/ticket-rsc-sets-4.exp +++ b/pengine/test10/ticket-rsc-sets-4.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,20 +73,20 @@ - + - + - + @@ -95,20 +95,20 @@ - + - + - + @@ -117,34 +117,34 @@ - + - + - + - + - + - + - + diff --git a/pengine/test10/ticket-rsc-sets-5.exp b/pengine/test10/ticket-rsc-sets-5.exp index c5dfec2..6c4140d 100644 --- a/pengine/test10/ticket-rsc-sets-5.exp +++ b/pengine/test10/ticket-rsc-sets-5.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,25 +23,25 @@ - + - + - + - + - + @@ -49,56 +49,56 @@ - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/ticket-rsc-sets-6.exp b/pengine/test10/ticket-rsc-sets-6.exp index d356a7e..1682a23 100644 --- a/pengine/test10/ticket-rsc-sets-6.exp +++ b/pengine/test10/ticket-rsc-sets-6.exp @@ -1,77 +1,77 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -79,32 +79,32 @@ - + - + - + - + - + diff --git a/pengine/test10/ticket-rsc-sets-7.dot b/pengine/test10/ticket-rsc-sets-7.dot index 20fd229..a5b2418 100644 --- a/pengine/test10/ticket-rsc-sets-7.dot +++ b/pengine/test10/ticket-rsc-sets-7.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "clone4_stop_0" -> "clone4_stopped_0" [ style = bold] "clone4_stop_0" -> "rsc4:0_stop_0 node2" [ style = bold] "clone4_stop_0" -> "rsc4:1_stop_0 node1" [ style = bold] @@ -14,19 +13,14 @@ digraph "g" { "ms5_demote_0" -> "rsc5:1_demote_0 node1" [ style = bold] "ms5_demote_0" [ style=bold color="green" fontcolor="orange" ] "ms5_demoted_0" [ style=bold color="green" fontcolor="orange" ] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "group2_stopped_0" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc3_stop_0 node1" -> "all_stopped" [ style = bold] "rsc3_stop_0 node1" -> "group2_stopped_0" [ style = bold] "rsc3_stop_0 node1" -> "rsc2_stop_0 node1" [ style = bold] "rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black" ] -"rsc4:0_stop_0 node2" -> "all_stopped" [ style = bold] "rsc4:0_stop_0 node2" -> "clone4_stopped_0" [ style = bold] "rsc4:0_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc4:1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc4:1_stop_0 node1" -> "clone4_stopped_0" [ style = bold] "rsc4:1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc5:1_demote_0 node1" -> "ms5_demoted_0" [ style = bold] diff --git a/pengine/test10/ticket-rsc-sets-7.exp b/pengine/test10/ticket-rsc-sets-7.exp index faf7fa8..e8c7851 100644 --- a/pengine/test10/ticket-rsc-sets-7.exp +++ b/pengine/test10/ticket-rsc-sets-7.exp @@ -1,7 +1,7 @@ - + @@ -10,25 +10,25 @@ - + - + - + - + - + @@ -36,80 +36,80 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -117,63 +117,38 @@ - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-rsc-sets-7.summary b/pengine/test10/ticket-rsc-sets-7.summary index 0a36d45..2df30a5 100644 --- a/pengine/test10/ticket-rsc-sets-7.summary +++ b/pengine/test10/ticket-rsc-sets-7.summary @@ -33,7 +33,6 @@ Executing cluster transition: * Pseudo action: clone4_stopped_0 * Resource action: rsc5:1 demote on node1 * Pseudo action: ms5_demoted_0 - * Pseudo action: all_stopped * Pseudo action: group2_stopped_0 Revised cluster status: diff --git a/pengine/test10/ticket-rsc-sets-9.dot b/pengine/test10/ticket-rsc-sets-9.dot index 15a3f29..bf671ed 100644 --- a/pengine/test10/ticket-rsc-sets-9.dot +++ b/pengine/test10/ticket-rsc-sets-9.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "clone4_stop_0" -> "clone4_stopped_0" [ style = bold] "clone4_stop_0" -> "rsc4:0_stop_0 node2" [ style = bold] "clone4_stop_0" -> "rsc4:1_stop_0 node1" [ style = bold] @@ -14,19 +13,14 @@ digraph "g" { "ms5_demote_0" -> "rsc5:1_demote_0 node1" [ style = bold] "ms5_demote_0" [ style=bold color="green" fontcolor="orange"] "ms5_demoted_0" [ style=bold color="green" fontcolor="orange"] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc2_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2_stop_0 node1" -> "group2_stopped_0" [ style = bold] "rsc2_stop_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc3_stop_0 node1" -> "all_stopped" [ style = bold] "rsc3_stop_0 node1" -> "group2_stopped_0" [ style = bold] "rsc3_stop_0 node1" -> "rsc2_stop_0 node1" [ style = bold] "rsc3_stop_0 node1" [ style=bold color="green" fontcolor="black"] -"rsc4:0_stop_0 node2" -> "all_stopped" [ style = bold] "rsc4:0_stop_0 node2" -> "clone4_stopped_0" [ style = bold] "rsc4:0_stop_0 node2" [ style=bold color="green" fontcolor="black"] -"rsc4:1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc4:1_stop_0 node1" -> "clone4_stopped_0" [ style = bold] "rsc4:1_stop_0 node1" [ style=bold color="green" fontcolor="black"] "rsc5:1_demote_0 node1" -> "ms5_demoted_0" [ style = bold] diff --git a/pengine/test10/ticket-rsc-sets-9.exp b/pengine/test10/ticket-rsc-sets-9.exp index faf7fa8..e8c7851 100644 --- a/pengine/test10/ticket-rsc-sets-9.exp +++ b/pengine/test10/ticket-rsc-sets-9.exp @@ -1,7 +1,7 @@ - + @@ -10,25 +10,25 @@ - + - + - + - + - + @@ -36,80 +36,80 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -117,63 +117,38 @@ - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/ticket-rsc-sets-9.summary b/pengine/test10/ticket-rsc-sets-9.summary index 0a36d45..2df30a5 100644 --- a/pengine/test10/ticket-rsc-sets-9.summary +++ b/pengine/test10/ticket-rsc-sets-9.summary @@ -33,7 +33,6 @@ Executing cluster transition: * Pseudo action: clone4_stopped_0 * Resource action: rsc5:1 demote on node1 * Pseudo action: ms5_demoted_0 - * Pseudo action: all_stopped * Pseudo action: group2_stopped_0 Revised cluster status: diff --git a/pengine/test10/unfence-definition.dot b/pengine/test10/unfence-definition.dot index c42391a..e2dc564 100644 --- a/pengine/test10/unfence-definition.dot +++ b/pengine/test10/unfence-definition.dot @@ -1,6 +1,4 @@ digraph "g" { -"all_stopped" -> "fencing_start_0 virt-1" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "clvmd-clone_running_0" [ style=bold color="green" fontcolor="orange"] "clvmd-clone_start_0" -> "clvmd-clone_running_0" [ style = bold] "clvmd-clone_start_0" -> "clvmd:1_start_0 virt-2" [ style = bold] @@ -25,7 +23,6 @@ digraph "g" { "clvmd_start_0 virt-1" -> "clvmd-clone_running_0" [ style = bold] "clvmd_start_0 virt-1" -> "clvmd:1_start_0 virt-2" [ style = bold] "clvmd_start_0 virt-1" [ style=bold color="green" fontcolor="black"] -"clvmd_stop_0 virt-1" -> "all_stopped" [ style = bold] "clvmd_stop_0 virt-1" -> "clvmd-clone_stopped_0" [ style = bold] "clvmd_stop_0 virt-1" -> "clvmd_start_0 virt-1" [ style = bold] "clvmd_stop_0 virt-1" -> "dlm_stop_0 virt-1" [ style = bold] @@ -50,7 +47,6 @@ digraph "g" { "dlm_start_0 virt-1" -> "clvmd_start_0 virt-1" [ style = bold] "dlm_start_0 virt-1" -> "dlm-clone_running_0" [ style = bold] "dlm_start_0 virt-1" [ style=bold color="green" fontcolor="black"] -"dlm_stop_0 virt-1" -> "all_stopped" [ style = bold] "dlm_stop_0 virt-1" -> "dlm-clone_stopped_0" [ style = bold] "dlm_stop_0 virt-1" -> "dlm_start_0 virt-1" [ style = bold] "dlm_stop_0 virt-1" -> "stonith 'on' virt-1" [ style = bold] @@ -60,7 +56,6 @@ digraph "g" { "fencing_monitor_0 virt-3" -> "fencing_start_0 virt-1" [ style = bold] "fencing_monitor_0 virt-3" [ style=bold color="green" fontcolor="black"] "fencing_start_0 virt-1" [ style=bold color="green" fontcolor="black"] -"fencing_stop_0 virt-1" -> "all_stopped" [ style = bold] "fencing_stop_0 virt-1" -> "fencing_delete_0 virt-1" [ style = bold] "fencing_stop_0 virt-1" -> "fencing_start_0 virt-1" [ style = bold] "fencing_stop_0 virt-1" [ style=bold color="green" fontcolor="black"] @@ -74,13 +69,11 @@ digraph "g" { "stonith 'on' virt-3" -> "dlm:2_start_0 virt-3" [ style = bold] "stonith 'on' virt-3" -> "fencing_monitor_0 virt-3" [ style = bold] "stonith 'on' virt-3" [ style=bold color="green" fontcolor="black"] -"stonith 'reboot' virt-4" -> "stonith_complete" [ style = bold] +"stonith 'reboot' virt-4" -> "clvmd:1_start_0 virt-2" [ style = bold] +"stonith 'reboot' virt-4" -> "clvmd:2_start_0 virt-3" [ style = bold] +"stonith 'reboot' virt-4" -> "clvmd_start_0 virt-1" [ style = bold] +"stonith 'reboot' virt-4" -> "dlm:2_start_0 virt-3" [ style = bold] +"stonith 'reboot' virt-4" -> "dlm_start_0 virt-1" [ style = bold] +"stonith 'reboot' virt-4" -> "fencing_start_0 virt-1" [ style = bold] "stonith 'reboot' virt-4" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "clvmd:1_start_0 virt-2" [ style = bold] -"stonith_complete" -> "clvmd:2_start_0 virt-3" [ style = bold] -"stonith_complete" -> "clvmd_start_0 virt-1" [ style = bold] -"stonith_complete" -> "dlm:2_start_0 virt-3" [ style = bold] -"stonith_complete" -> "dlm_start_0 virt-1" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/unfence-definition.exp b/pengine/test10/unfence-definition.exp index 25c5674..019c03d 100644 --- a/pengine/test10/unfence-definition.exp +++ b/pengine/test10/unfence-definition.exp @@ -1,58 +1,58 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -61,194 +61,194 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -257,60 +257,60 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -318,49 +318,49 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -371,57 +371,24 @@ - - - - - - - - - - - - - + - + - + - - - - - - - - - - - - - - - - - - - - - - + - + diff --git a/pengine/test10/unfence-definition.summary b/pengine/test10/unfence-definition.summary index 2051c51..ff5b610 100644 --- a/pengine/test10/unfence-definition.summary +++ b/pengine/test10/unfence-definition.summary @@ -27,7 +27,6 @@ Executing cluster transition: * Resource action: clvmd monitor on virt-2 * Pseudo action: clvmd-clone_stop_0 * Fencing virt-4 (reboot) - * Pseudo action: stonith_complete * Fencing virt-3 (on) * Resource action: fencing monitor on virt-3 * Resource action: fencing delete on virt-1 @@ -40,7 +39,6 @@ Executing cluster transition: * Pseudo action: dlm-clone_stopped_0 * Pseudo action: dlm-clone_start_0 * Fencing virt-1 (on) - * Pseudo action: all_stopped * Resource action: fencing start on virt-1 * Resource action: dlm start on virt-1 * Resource action: dlm start on virt-3 diff --git a/pengine/test10/unfence-device.exp b/pengine/test10/unfence-device.exp index 98cb548..a39fc75 100644 --- a/pengine/test10/unfence-device.exp +++ b/pengine/test10/unfence-device.exp @@ -1,81 +1,81 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -83,7 +83,7 @@ - + @@ -91,7 +91,7 @@ - + diff --git a/pengine/test10/unfence-parameters.dot b/pengine/test10/unfence-parameters.dot index 3c27b22..ab3ce37 100644 --- a/pengine/test10/unfence-parameters.dot +++ b/pengine/test10/unfence-parameters.dot @@ -1,6 +1,4 @@ digraph "g" { -"all_stopped" -> "fencing_start_0 virt-1" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "clvmd-clone_running_0" [ style=bold color="green" fontcolor="orange"] "clvmd-clone_start_0" -> "clvmd-clone_running_0" [ style = bold] "clvmd-clone_start_0" -> "clvmd:1_start_0 virt-2" [ style = bold] @@ -25,7 +23,6 @@ digraph "g" { "clvmd_start_0 virt-1" -> "clvmd-clone_running_0" [ style = bold] "clvmd_start_0 virt-1" -> "clvmd:1_start_0 virt-2" [ style = bold] "clvmd_start_0 virt-1" [ style=bold color="green" fontcolor="black"] -"clvmd_stop_0 virt-1" -> "all_stopped" [ style = bold] "clvmd_stop_0 virt-1" -> "clvmd-clone_stopped_0" [ style = bold] "clvmd_stop_0 virt-1" -> "clvmd_start_0 virt-1" [ style = bold] "clvmd_stop_0 virt-1" -> "dlm_stop_0 virt-1" [ style = bold] @@ -50,7 +47,6 @@ digraph "g" { "dlm_start_0 virt-1" -> "clvmd_start_0 virt-1" [ style = bold] "dlm_start_0 virt-1" -> "dlm-clone_running_0" [ style = bold] "dlm_start_0 virt-1" [ style=bold color="green" fontcolor="black"] -"dlm_stop_0 virt-1" -> "all_stopped" [ style = bold] "dlm_stop_0 virt-1" -> "dlm-clone_stopped_0" [ style = bold] "dlm_stop_0 virt-1" -> "dlm_start_0 virt-1" [ style = bold] "dlm_stop_0 virt-1" -> "stonith 'on' virt-1" [ style = bold] @@ -58,7 +54,6 @@ digraph "g" { "fencing_monitor_0 virt-3" -> "fencing_start_0 virt-1" [ style = bold] "fencing_monitor_0 virt-3" [ style=bold color="green" fontcolor="black"] "fencing_start_0 virt-1" [ style=bold color="green" fontcolor="black"] -"fencing_stop_0 virt-1" -> "all_stopped" [ style = bold] "fencing_stop_0 virt-1" -> "fencing_start_0 virt-1" [ style = bold] "fencing_stop_0 virt-1" [ style=bold color="green" fontcolor="black"] "stonith 'on' virt-1" -> "clvmd_start_0 virt-1" [ style = bold] @@ -71,13 +66,11 @@ digraph "g" { "stonith 'on' virt-3" -> "dlm:2_start_0 virt-3" [ style = bold] "stonith 'on' virt-3" -> "fencing_monitor_0 virt-3" [ style = bold] "stonith 'on' virt-3" [ style=bold color="green" fontcolor="black"] -"stonith 'reboot' virt-4" -> "stonith_complete" [ style = bold] +"stonith 'reboot' virt-4" -> "clvmd:1_start_0 virt-2" [ style = bold] +"stonith 'reboot' virt-4" -> "clvmd:2_start_0 virt-3" [ style = bold] +"stonith 'reboot' virt-4" -> "clvmd_start_0 virt-1" [ style = bold] +"stonith 'reboot' virt-4" -> "dlm:2_start_0 virt-3" [ style = bold] +"stonith 'reboot' virt-4" -> "dlm_start_0 virt-1" [ style = bold] +"stonith 'reboot' virt-4" -> "fencing_start_0 virt-1" [ style = bold] "stonith 'reboot' virt-4" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "clvmd:1_start_0 virt-2" [ style = bold] -"stonith_complete" -> "clvmd:2_start_0 virt-3" [ style = bold] -"stonith_complete" -> "clvmd_start_0 virt-1" [ style = bold] -"stonith_complete" -> "dlm:2_start_0 virt-3" [ style = bold] -"stonith_complete" -> "dlm_start_0 virt-1" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/unfence-parameters.exp b/pengine/test10/unfence-parameters.exp index 3b73fc7..fc3317d 100644 --- a/pengine/test10/unfence-parameters.exp +++ b/pengine/test10/unfence-parameters.exp @@ -1,7 +1,7 @@ - + @@ -10,229 +10,229 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -241,60 +241,60 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -302,49 +302,49 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -355,57 +355,24 @@ - - - - - - - - - - - - - + - + - + - - - - - - - - - - - - - - - - - - - - - - + - + diff --git a/pengine/test10/unfence-parameters.summary b/pengine/test10/unfence-parameters.summary index 2cc9e27..ef4ad20 100644 --- a/pengine/test10/unfence-parameters.summary +++ b/pengine/test10/unfence-parameters.summary @@ -27,7 +27,6 @@ Executing cluster transition: * Resource action: clvmd monitor on virt-2 * Pseudo action: clvmd-clone_stop_0 * Fencing virt-4 (reboot) - * Pseudo action: stonith_complete * Fencing virt-3 (on) * Resource action: fencing monitor on virt-3 * Resource action: dlm monitor on virt-3 @@ -39,7 +38,6 @@ Executing cluster transition: * Pseudo action: dlm-clone_stopped_0 * Pseudo action: dlm-clone_start_0 * Fencing virt-1 (on) - * Pseudo action: all_stopped * Resource action: fencing start on virt-1 * Resource action: dlm start on virt-1 * Resource action: dlm start on virt-3 diff --git a/pengine/test10/unfence-startup.dot b/pengine/test10/unfence-startup.dot index 642f795..7a3b9ac 100644 --- a/pengine/test10/unfence-startup.dot +++ b/pengine/test10/unfence-startup.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "clvmd-clone_running_0" [ style=bold color="green" fontcolor="orange"] "clvmd-clone_start_0" -> "clvmd-clone_running_0" [ style = bold] "clvmd-clone_start_0" -> "clvmd:1_start_0 virt-2" [ style = bold] @@ -31,11 +30,8 @@ digraph "g" { "stonith 'on' virt-3" -> "dlm:2_start_0 virt-3" [ style = bold] "stonith 'on' virt-3" -> "fencing_monitor_0 virt-3" [ style = bold] "stonith 'on' virt-3" [ style=bold color="green" fontcolor="black"] -"stonith 'reboot' virt-4" -> "stonith_complete" [ style = bold] +"stonith 'reboot' virt-4" -> "clvmd:1_start_0 virt-2" [ style = bold] +"stonith 'reboot' virt-4" -> "clvmd:2_start_0 virt-3" [ style = bold] +"stonith 'reboot' virt-4" -> "dlm:2_start_0 virt-3" [ style = bold] "stonith 'reboot' virt-4" [ style=bold color="green" fontcolor="black"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" -> "clvmd:1_start_0 virt-2" [ style = bold] -"stonith_complete" -> "clvmd:2_start_0 virt-3" [ style = bold] -"stonith_complete" -> "dlm:2_start_0 virt-3" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/unfence-startup.exp b/pengine/test10/unfence-startup.exp index bfd24c8..6745bff 100644 --- a/pengine/test10/unfence-startup.exp +++ b/pengine/test10/unfence-startup.exp @@ -1,95 +1,95 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -98,81 +98,81 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -183,34 +183,10 @@ - - - - - - - - - - - - - + - - - - - - - - - - - - diff --git a/pengine/test10/unfence-startup.summary b/pengine/test10/unfence-startup.summary index 4601f31..e180f99 100644 --- a/pengine/test10/unfence-startup.summary +++ b/pengine/test10/unfence-startup.summary @@ -21,9 +21,7 @@ Transition Summary: Executing cluster transition: * Resource action: clvmd monitor on virt-2 * Fencing virt-4 (reboot) - * Pseudo action: stonith_complete * Fencing virt-3 (on) - * Pseudo action: all_stopped * Resource action: fencing monitor on virt-3 * Resource action: dlm monitor on virt-3 * Pseudo action: dlm-clone_start_0 diff --git a/pengine/test10/unmanaged-block-restart.dot b/pengine/test10/unmanaged-block-restart.dot index 5cc27f8..4c51fac 100644 --- a/pengine/test10/unmanaged-block-restart.dot +++ b/pengine/test10/unmanaged-block-restart.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=dashed color="red" fontcolor="orange"] "group1_running_0" [ style=dashed color="red" fontcolor="orange"] "group1_start_0" -> "group1_running_0" [ style = dashed] "group1_start_0" -> "rsc1_start_0 yingying.site" [ style = bold] @@ -22,7 +21,6 @@ digraph "g" { "rsc2_start_0 yingying.site" -> "rsc2_monitor_10000 yingying.site" [ style = dashed] "rsc2_start_0 yingying.site" -> "rsc3_start_0 yingying.site" [ style = dashed] "rsc2_start_0 yingying.site" [ style=dashed color="red" fontcolor="black"] -"rsc2_stop_0 yingying.site" -> "all_stopped" [ style = dashed] "rsc2_stop_0 yingying.site" -> "group1_stopped_0" [ style = dashed] "rsc2_stop_0 yingying.site" -> "rsc2_start_0 yingying.site" [ style = dashed] "rsc2_stop_0 yingying.site" [ style=dashed color="red" fontcolor="black"] @@ -30,7 +28,6 @@ digraph "g" { "rsc3_start_0 yingying.site" -> "group1_running_0" [ style = dashed] "rsc3_start_0 yingying.site" -> "rsc3_monitor_10000 yingying.site" [ style = dashed] "rsc3_start_0 yingying.site" [ style=dashed color="red" fontcolor="black"] -"rsc3_stop_0 yingying.site" -> "all_stopped" [ style = dashed] "rsc3_stop_0 yingying.site" -> "group1_stopped_0" [ style = dashed] "rsc3_stop_0 yingying.site" -> "rsc2_stop_0 yingying.site" [ style = dashed] "rsc3_stop_0 yingying.site" -> "rsc3_start_0 yingying.site" [ style = dashed] diff --git a/pengine/test10/unmanaged-block-restart.exp b/pengine/test10/unmanaged-block-restart.exp index 56d357e..c96b4bc 100644 --- a/pengine/test10/unmanaged-block-restart.exp +++ b/pengine/test10/unmanaged-block-restart.exp @@ -1,7 +1,7 @@ - + @@ -9,7 +9,7 @@ - + @@ -17,27 +17,27 @@ - + - + - + - + diff --git a/pengine/test10/unmanaged-master.exp b/pengine/test10/unmanaged-master.exp index 8463211..02c6dff 100644 --- a/pengine/test10/unmanaged-master.exp +++ b/pengine/test10/unmanaged-master.exp @@ -1,7 +1,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/pengine/test10/unmanaged-stop-1.dot b/pengine/test10/unmanaged-stop-1.dot index 6e61f44..594bdd1 100644 --- a/pengine/test10/unmanaged-stop-1.dot +++ b/pengine/test10/unmanaged-stop-1.dot @@ -1,7 +1,5 @@ digraph "g" { -"all_stopped" [ style=dashed color="red" fontcolor="orange"] "rsc1_start_0 " [ style=dashed color="red" fontcolor="black"] -"rsc1_stop_0 yingying.site" -> "all_stopped" [ style = dashed] "rsc1_stop_0 yingying.site" -> "rsc1_start_0 " [ style = dashed] "rsc1_stop_0 yingying.site" [ style=dashed color="red" fontcolor="black"] } diff --git a/pengine/test10/unmanaged-stop-2.dot b/pengine/test10/unmanaged-stop-2.dot index 6e61f44..594bdd1 100644 --- a/pengine/test10/unmanaged-stop-2.dot +++ b/pengine/test10/unmanaged-stop-2.dot @@ -1,7 +1,5 @@ digraph "g" { -"all_stopped" [ style=dashed color="red" fontcolor="orange"] "rsc1_start_0 " [ style=dashed color="red" fontcolor="black"] -"rsc1_stop_0 yingying.site" -> "all_stopped" [ style = dashed] "rsc1_stop_0 yingying.site" -> "rsc1_start_0 " [ style = dashed] "rsc1_stop_0 yingying.site" [ style=dashed color="red" fontcolor="black"] } diff --git a/pengine/test10/unmanaged-stop-3.dot b/pengine/test10/unmanaged-stop-3.dot index dd10535..c9e1c08 100644 --- a/pengine/test10/unmanaged-stop-3.dot +++ b/pengine/test10/unmanaged-stop-3.dot @@ -1,10 +1,8 @@ digraph "g" { -"all_stopped" [ style=dashed color="red" fontcolor="orange"] "group1_stop_0" -> "group1_stopped_0" [ style = dashed] "group1_stop_0" -> "rsc1_stop_0 yingying.site" [ style = dashed] "group1_stop_0" [ style=bold color="green" fontcolor="orange"] "group1_stopped_0" [ style=dashed color="red" fontcolor="orange"] -"rsc1_stop_0 yingying.site" -> "all_stopped" [ style = dashed] "rsc1_stop_0 yingying.site" -> "group1_stopped_0" [ style = dashed] "rsc1_stop_0 yingying.site" [ style=dashed color="red" fontcolor="black"] } diff --git a/pengine/test10/unmanaged-stop-3.exp b/pengine/test10/unmanaged-stop-3.exp index e2eb6a4..9b43d75 100644 --- a/pengine/test10/unmanaged-stop-3.exp +++ b/pengine/test10/unmanaged-stop-3.exp @@ -1,7 +1,7 @@ - + diff --git a/pengine/test10/unmanaged-stop-4.dot b/pengine/test10/unmanaged-stop-4.dot index dd10535..c9e1c08 100644 --- a/pengine/test10/unmanaged-stop-4.dot +++ b/pengine/test10/unmanaged-stop-4.dot @@ -1,10 +1,8 @@ digraph "g" { -"all_stopped" [ style=dashed color="red" fontcolor="orange"] "group1_stop_0" -> "group1_stopped_0" [ style = dashed] "group1_stop_0" -> "rsc1_stop_0 yingying.site" [ style = dashed] "group1_stop_0" [ style=bold color="green" fontcolor="orange"] "group1_stopped_0" [ style=dashed color="red" fontcolor="orange"] -"rsc1_stop_0 yingying.site" -> "all_stopped" [ style = dashed] "rsc1_stop_0 yingying.site" -> "group1_stopped_0" [ style = dashed] "rsc1_stop_0 yingying.site" [ style=dashed color="red" fontcolor="black"] } diff --git a/pengine/test10/unmanaged-stop-4.exp b/pengine/test10/unmanaged-stop-4.exp index e2eb6a4..9b43d75 100644 --- a/pengine/test10/unmanaged-stop-4.exp +++ b/pengine/test10/unmanaged-stop-4.exp @@ -1,7 +1,7 @@ - + diff --git a/pengine/test10/unrunnable-1.dot b/pengine/test10/unrunnable-1.dot index 3e78165..7ead826 100644 --- a/pengine/test10/unrunnable-1.dot +++ b/pengine/test10/unrunnable-1.dot @@ -5,7 +5,6 @@ "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" ] @@ -14,7 +13,6 @@ "child_192.168.100.183_monitor_5000 c001n03" [ style=dashed color="red" fontcolor="black" ] "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" ] diff --git a/pengine/test10/unrunnable-1.exp b/pengine/test10/unrunnable-1.exp index d8f3b69..56fb4c0 100644 --- a/pengine/test10/unrunnable-1.exp +++ b/pengine/test10/unrunnable-1.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -100,19 +100,19 @@ - + - + - + diff --git a/pengine/test10/use-after-free-merge.exp b/pengine/test10/use-after-free-merge.exp index f50713e..2eb2486 100644 --- a/pengine/test10/use-after-free-merge.exp +++ b/pengine/test10/use-after-free-merge.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -71,20 +71,20 @@ - + - + - + @@ -93,20 +93,20 @@ - + - + - + @@ -115,34 +115,34 @@ - + - + - + - + - + - + - + diff --git a/pengine/test10/utilization-check-allowed-nodes.exp b/pengine/test10/utilization-check-allowed-nodes.exp index df6a80b..085508b 100644 --- a/pengine/test10/utilization-check-allowed-nodes.exp +++ b/pengine/test10/utilization-check-allowed-nodes.exp @@ -1,23 +1,23 @@ - + - + - + - + @@ -26,7 +26,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -61,7 +61,7 @@ - + diff --git a/pengine/test10/utilization-order1.dot b/pengine/test10/utilization-order1.dot index 7914bb8..3c30389 100644 --- a/pengine/test10/utilization-order1.dot +++ b/pengine/test10/utilization-order1.dot @@ -1,9 +1,7 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "load_stopped_node1 node1" -> "rsc2_start_0 node1" [ style = bold] "load_stopped_node1 node1" [ style=bold color="green" fontcolor="orange" ] "load_stopped_node2 node2" [ style=bold color="green" fontcolor="orange" ] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "load_stopped_node1 node1" [ style = bold] "rsc1_stop_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc2_start_0 node1" [ style=bold color="green" fontcolor="black" ] diff --git a/pengine/test10/utilization-order1.exp b/pengine/test10/utilization-order1.exp index e1bc784..6dd3f12 100644 --- a/pengine/test10/utilization-order1.exp +++ b/pengine/test10/utilization-order1.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,35 +23,22 @@ - + - + - + - - - - - - - - - - - - - diff --git a/pengine/test10/utilization-order1.summary b/pengine/test10/utilization-order1.summary index 3b93487..3ab2cc0 100644 --- a/pengine/test10/utilization-order1.summary +++ b/pengine/test10/utilization-order1.summary @@ -13,7 +13,6 @@ Executing cluster transition: * Resource action: rsc1 stop on node1 * Pseudo action: load_stopped_node1 * Pseudo action: load_stopped_node2 - * Pseudo action: all_stopped * Resource action: rsc2 start on node1 Revised cluster status: diff --git a/pengine/test10/utilization-order2.dot b/pengine/test10/utilization-order2.dot index 1b90574..e1bf5eb 100644 --- a/pengine/test10/utilization-order2.dot +++ b/pengine/test10/utilization-order2.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "clone-rsc2_stop_0" -> "clone-rsc2_stopped_0" [ style = bold] "clone-rsc2_stop_0" -> "rsc2:1_stop_0 node1" [ style = bold] "clone-rsc2_stop_0" [ style=bold color="green" fontcolor="orange" ] @@ -8,15 +7,12 @@ digraph "g" { "load_stopped_node1 node1" [ style=bold color="green" fontcolor="orange" ] "load_stopped_node2 node2" -> "rsc3_start_0 node2" [ style = bold] "load_stopped_node2 node2" [ style=bold color="green" fontcolor="orange" ] -"rsc1_stop_0 node2" -> "all_stopped" [ style = bold] "rsc1_stop_0 node2" -> "load_stopped_node2 node2" [ style = bold] "rsc1_stop_0 node2" [ style=bold color="green" fontcolor="black" ] -"rsc2:1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc2:1_stop_0 node1" -> "clone-rsc2_stopped_0" [ style = bold] "rsc2:1_stop_0 node1" -> "load_stopped_node1 node1" [ style = bold] "rsc2:1_stop_0 node1" [ 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" -> "load_stopped_node1 node1" [ 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/utilization-order2.exp b/pengine/test10/utilization-order2.exp index 74abbbd..76dd97c 100644 --- a/pengine/test10/utilization-order2.exp +++ b/pengine/test10/utilization-order2.exp @@ -1,36 +1,36 @@ - + - + - + - + - + - + @@ -39,35 +39,35 @@ - + - + - + - + - + - + @@ -75,7 +75,7 @@ - + @@ -84,46 +84,28 @@ - + - + - + - + - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/utilization-order2.summary b/pengine/test10/utilization-order2.summary index 63bbbe4..932674f 100644 --- a/pengine/test10/utilization-order2.summary +++ b/pengine/test10/utilization-order2.summary @@ -23,7 +23,6 @@ Executing cluster transition: * Resource action: rsc2:1 stop on node1 * Pseudo action: clone-rsc2_stopped_0 * Pseudo action: load_stopped_node1 - * Pseudo action: all_stopped * Resource action: rsc4 start on node1 Revised cluster status: diff --git a/pengine/test10/utilization-order3.dot b/pengine/test10/utilization-order3.dot index 0cc88e2..516f422 100644 --- a/pengine/test10/utilization-order3.dot +++ b/pengine/test10/utilization-order3.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "load_stopped_node1 node1" -> "rsc2_start_0 node1" [ style = bold] "load_stopped_node1 node1" [ style=bold color="green" fontcolor="orange" ] "load_stopped_node2 node2" -> "rsc1_migrate_to_0 node1" [ style = bold] @@ -11,7 +10,6 @@ digraph "g" { "rsc1_migrate_to_0 node1" -> "rsc1_migrate_from_0 node2" [ style = bold] "rsc1_migrate_to_0 node1" [ style=bold color="green" fontcolor="black" ] "rsc1_start_0 node2" [ style=bold color="green" fontcolor="orange" ] -"rsc1_stop_0 node1" -> "all_stopped" [ style = bold] "rsc1_stop_0 node1" -> "load_stopped_node1 node1" [ 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/utilization-order3.exp b/pengine/test10/utilization-order3.exp index bef1f82..dfb441e 100644 --- a/pengine/test10/utilization-order3.exp +++ b/pengine/test10/utilization-order3.exp @@ -1,105 +1,92 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - diff --git a/pengine/test10/utilization-order3.summary b/pengine/test10/utilization-order3.summary index 9d59f37..e96eec2 100644 --- a/pengine/test10/utilization-order3.summary +++ b/pengine/test10/utilization-order3.summary @@ -15,7 +15,6 @@ Executing cluster transition: * Resource action: rsc1 migrate_from on node2 * Resource action: rsc1 stop on node1 * Pseudo action: load_stopped_node1 - * Pseudo action: all_stopped * Resource action: rsc2 start on node1 * Pseudo action: rsc1_start_0 diff --git a/pengine/test10/utilization-order4.dot b/pengine/test10/utilization-order4.dot index 9c7e244..0c39c9e 100644 --- a/pengine/test10/utilization-order4.dot +++ b/pengine/test10/utilization-order4.dot @@ -1,5 +1,4 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange" ] "clone-nfs_stop_0" -> "clone-nfs_stopped_0" [ style = bold] "clone-nfs_stop_0" -> "grp-nfs:1_stop_0" [ style = bold] "clone-nfs_stop_0" [ style=bold color="green" fontcolor="orange" ] @@ -9,7 +8,6 @@ digraph "g" { "clone-ping_stop_0" -> "prim-ping:0_stop_0 deglxen002" [ style = bold] "clone-ping_stop_0" [ style=bold color="green" fontcolor="orange" ] "clone-ping_stopped_0" [ style=bold color="green" fontcolor="orange" ] -"degllx61-vm_stop_0 deglxen001" -> "all_stopped" [ style = bold] "degllx61-vm_stop_0 deglxen001" -> "clone-nfs_stop_0" [ style = bold] "degllx61-vm_stop_0 deglxen001" -> "load_stopped_deglxen001 deglxen001" [ style = bold] "degllx61-vm_stop_0 deglxen001" [ style=bold color="green" fontcolor="black" ] @@ -21,7 +19,6 @@ digraph "g" { "degllx62-vm_monitor_30000 deglxen001" [ style=bold color="green" fontcolor="black" ] "degllx62-vm_start_0 deglxen001" -> "degllx62-vm_monitor_30000 deglxen001" [ style = bold] "degllx62-vm_start_0 deglxen001" [ style=bold color="green" fontcolor="orange"] -"degllx62-vm_stop_0 deglxen002" -> "all_stopped" [ style = bold] "degllx62-vm_stop_0 deglxen002" -> "clone-nfs_stop_0" [ style = bold] "degllx62-vm_stop_0 deglxen002" -> "degllx62-vm_start_0 deglxen001" [ style = bold] "degllx62-vm_stop_0 deglxen002" -> "load_stopped_deglxen002 deglxen002" [ style = bold] @@ -38,18 +35,14 @@ digraph "g" { "load_stopped_deglxen001 deglxen001" -> "degllx62-vm_start_0 deglxen001" [ style = bold] "load_stopped_deglxen001 deglxen001" [ style=bold color="green" fontcolor="orange" ] "load_stopped_deglxen002 deglxen002" [ style=bold color="green" fontcolor="orange" ] -"nfs-xen_config:1_stop_0 deglxen002" -> "all_stopped" [ style = bold] "nfs-xen_config:1_stop_0 deglxen002" -> "grp-nfs:1_stopped_0" [ style = bold] "nfs-xen_config:1_stop_0 deglxen002" [ style=bold color="green" fontcolor="black" ] -"nfs-xen_images:1_stop_0 deglxen002" -> "all_stopped" [ style = bold] "nfs-xen_images:1_stop_0 deglxen002" -> "grp-nfs:1_stopped_0" [ style = bold] "nfs-xen_images:1_stop_0 deglxen002" -> "nfs-xen_swapfiles:1_stop_0 deglxen002" [ style = bold] "nfs-xen_images:1_stop_0 deglxen002" [ style=bold color="green" fontcolor="black" ] -"nfs-xen_swapfiles:1_stop_0 deglxen002" -> "all_stopped" [ style = bold] "nfs-xen_swapfiles:1_stop_0 deglxen002" -> "grp-nfs:1_stopped_0" [ style = bold] "nfs-xen_swapfiles:1_stop_0 deglxen002" -> "nfs-xen_config:1_stop_0 deglxen002" [ style = bold] "nfs-xen_swapfiles:1_stop_0 deglxen002" [ style=bold color="green" fontcolor="black" ] -"prim-ping:0_stop_0 deglxen002" -> "all_stopped" [ style = bold] "prim-ping:0_stop_0 deglxen002" -> "clone-ping_stopped_0" [ style = bold] "prim-ping:0_stop_0 deglxen002" [ style=bold color="green" fontcolor="black" ] } diff --git a/pengine/test10/utilization-order4.exp b/pengine/test10/utilization-order4.exp index 22bbf83..9613ac2 100644 --- a/pengine/test10/utilization-order4.exp +++ b/pengine/test10/utilization-order4.exp @@ -1,77 +1,77 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -80,203 +80,176 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/utilization-order4.summary b/pengine/test10/utilization-order4.summary index 144ce40..cca7552 100644 --- a/pengine/test10/utilization-order4.summary +++ b/pengine/test10/utilization-order4.summary @@ -41,7 +41,6 @@ Executing cluster transition: * Pseudo action: clone-ping_stop_0 * Resource action: prim-ping:0 stop on deglxen002 * Pseudo action: clone-ping_stopped_0 - * Pseudo action: all_stopped Revised cluster status: Node deglxen002: standby diff --git a/pengine/test10/utilization-shuffle.exp b/pengine/test10/utilization-shuffle.exp index 75f6477..ec03ddb 100644 --- a/pengine/test10/utilization-shuffle.exp +++ b/pengine/test10/utilization-shuffle.exp @@ -1,37 +1,37 @@ - + - + - + - + - + - + - + - + - + @@ -39,181 +39,181 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -221,7 +221,7 @@ - + @@ -229,7 +229,7 @@ - + @@ -237,7 +237,7 @@ - + @@ -245,7 +245,7 @@ - + diff --git a/pengine/test10/utilization.exp b/pengine/test10/utilization.exp index 6b6232c..7026d6f 100644 --- a/pengine/test10/utilization.exp +++ b/pengine/test10/utilization.exp @@ -1,26 +1,26 @@ - + - + - + - + - + @@ -29,7 +29,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -64,7 +64,7 @@ - + diff --git a/pengine/test10/whitebox-asymmetric.exp b/pengine/test10/whitebox-asymmetric.exp index 3f105a1..6db621d 100644 --- a/pengine/test10/whitebox-asymmetric.exp +++ b/pengine/test10/whitebox-asymmetric.exp @@ -1,104 +1,104 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/pengine/test10/whitebox-fail1.dot b/pengine/test10/whitebox-fail1.dot index 9b755f9..47a89d9 100644 --- a/pengine/test10/whitebox-fail1.dot +++ b/pengine/test10/whitebox-fail1.dot @@ -6,7 +6,6 @@ digraph "g" { "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"] @@ -24,15 +23,11 @@ digraph "g" { "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" -> "lxc1_start_0 18node2" [ style = bold] -"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"] @@ -43,18 +38,15 @@ digraph "g" { "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_start_0 lxc1" [ style = bold] "stonith 'reboot' lxc1" -> "B_stop_0 lxc1" [ style = bold] "stonith 'reboot' lxc1" -> "M-clone_stop_0" [ style = bold] +"stonith 'reboot' lxc1" -> "M_start_0 lxc1" [ style = bold] "stonith 'reboot' lxc1" -> "M_stop_0 lxc1" [ style = bold] -"stonith 'reboot' lxc1" -> "stonith_complete" [ style = bold] +"stonith 'reboot' lxc1" -> "container1_start_0 18node2" [ style = bold] +"stonith 'reboot' lxc1" -> "lxc1_start_0 18node2" [ 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" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/whitebox-fail1.exp b/pengine/test10/whitebox-fail1.exp index 1532c6e..e5db07b 100644 --- a/pengine/test10/whitebox-fail1.exp +++ b/pengine/test10/whitebox-fail1.exp @@ -1,7 +1,7 @@ - + @@ -11,7 +11,7 @@ - + @@ -24,123 +24,123 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -149,60 +149,60 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -211,7 +211,7 @@ - + @@ -220,26 +220,26 @@ - + - + - + - + - + @@ -258,13 +258,13 @@ - + - + @@ -277,41 +277,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/whitebox-fail1.summary b/pengine/test10/whitebox-fail1.summary index a5b85dd..e22068d 100644 --- a/pengine/test10/whitebox-fail1.summary +++ b/pengine/test10/whitebox-fail1.summary @@ -27,21 +27,19 @@ Executing cluster transition: * Resource action: lxc1 stop on 18node2 * Resource action: container1 stop on 18node2 * Pseudo action: stonith-lxc1-reboot on lxc1 - * Pseudo action: stonith_complete * Resource action: container1 start on 18node2 * Pseudo action: M-clone_stop_0 * Pseudo action: B_stop_0 + * Resource action: lxc1 start on 18node2 + * Resource action: lxc1 monitor=30000 on 18node2 * Pseudo action: M_stop_0 * Pseudo action: M-clone_stopped_0 * Pseudo action: M-clone_start_0 - * Pseudo action: all_stopped - * Resource action: lxc1 start on 18node2 - * Resource action: lxc1 monitor=30000 on 18node2 + * Resource action: B start on lxc1 * Resource action: M start on lxc1 * Pseudo action: M-clone_running_0 - * Resource action: B start on lxc1 - * Resource action: M monitor=10000 on lxc1 * Resource action: B monitor=10000 on lxc1 + * Resource action: M monitor=10000 on lxc1 Revised cluster status: Online: [ 18node1 18node2 18node3 ] diff --git a/pengine/test10/whitebox-fail2.dot b/pengine/test10/whitebox-fail2.dot index 9b755f9..47a89d9 100644 --- a/pengine/test10/whitebox-fail2.dot +++ b/pengine/test10/whitebox-fail2.dot @@ -6,7 +6,6 @@ digraph "g" { "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"] @@ -24,15 +23,11 @@ digraph "g" { "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" -> "lxc1_start_0 18node2" [ style = bold] -"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"] @@ -43,18 +38,15 @@ digraph "g" { "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_start_0 lxc1" [ style = bold] "stonith 'reboot' lxc1" -> "B_stop_0 lxc1" [ style = bold] "stonith 'reboot' lxc1" -> "M-clone_stop_0" [ style = bold] +"stonith 'reboot' lxc1" -> "M_start_0 lxc1" [ style = bold] "stonith 'reboot' lxc1" -> "M_stop_0 lxc1" [ style = bold] -"stonith 'reboot' lxc1" -> "stonith_complete" [ style = bold] +"stonith 'reboot' lxc1" -> "container1_start_0 18node2" [ style = bold] +"stonith 'reboot' lxc1" -> "lxc1_start_0 18node2" [ 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" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/whitebox-fail2.exp b/pengine/test10/whitebox-fail2.exp index 1532c6e..e5db07b 100644 --- a/pengine/test10/whitebox-fail2.exp +++ b/pengine/test10/whitebox-fail2.exp @@ -1,7 +1,7 @@ - + @@ -11,7 +11,7 @@ - + @@ -24,123 +24,123 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -149,60 +149,60 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -211,7 +211,7 @@ - + @@ -220,26 +220,26 @@ - + - + - + - + - + @@ -258,13 +258,13 @@ - + - + @@ -277,41 +277,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/whitebox-fail2.summary b/pengine/test10/whitebox-fail2.summary index afee261..48c3272 100644 --- a/pengine/test10/whitebox-fail2.summary +++ b/pengine/test10/whitebox-fail2.summary @@ -27,21 +27,19 @@ Executing cluster transition: * Resource action: lxc1 stop on 18node2 * Resource action: container1 stop on 18node2 * Pseudo action: stonith-lxc1-reboot on lxc1 - * Pseudo action: stonith_complete * Resource action: container1 start on 18node2 * Pseudo action: M-clone_stop_0 * Pseudo action: B_stop_0 + * Resource action: lxc1 start on 18node2 + * Resource action: lxc1 monitor=30000 on 18node2 * Pseudo action: M_stop_0 * Pseudo action: M-clone_stopped_0 * Pseudo action: M-clone_start_0 - * Pseudo action: all_stopped - * Resource action: lxc1 start on 18node2 - * Resource action: lxc1 monitor=30000 on 18node2 + * Resource action: B start on lxc1 * Resource action: M start on lxc1 * Pseudo action: M-clone_running_0 - * Resource action: B start on lxc1 - * Resource action: M monitor=10000 on lxc1 * Resource action: B monitor=10000 on lxc1 + * Resource action: M monitor=10000 on lxc1 Revised cluster status: Online: [ 18node1 18node2 18node3 ] diff --git a/pengine/test10/whitebox-fail3.dot b/pengine/test10/whitebox-fail3.dot index 9814f66..44bd601 100644 --- a/pengine/test10/whitebox-fail3.dot +++ b/pengine/test10/whitebox-fail3.dot @@ -4,6 +4,7 @@ digraph "g" { "18builder_monitor_30000 dvossel-laptop2" [ style=bold color="green" fontcolor="black"] "18builder_start_0 dvossel-laptop2" -> "18builder_monitor_30000 dvossel-laptop2" [ style = bold] "18builder_start_0 dvossel-laptop2" -> "FAKE_start_0 18builder" [ style = bold] +"18builder_start_0 dvossel-laptop2" -> "FAKE_stop_0 dvossel-laptop2" [ style = bold] "18builder_start_0 dvossel-laptop2" -> "W:1_monitor_10000 18builder" [ style = bold] "18builder_start_0 dvossel-laptop2" -> "W:1_start_0 18builder" [ style = bold] "18builder_start_0 dvossel-laptop2" -> "X:1_monitor_10000 18builder" [ style = bold] @@ -11,7 +12,6 @@ digraph "g" { "18builder_start_0 dvossel-laptop2" [ style=bold color="green" fontcolor="black"] "FAKE_start_0 18builder" [ style=bold color="green" fontcolor="black"] "FAKE_stop_0 dvossel-laptop2" -> "FAKE_start_0 18builder" [ style = bold] -"FAKE_stop_0 dvossel-laptop2" -> "all_stopped" [ style = bold] "FAKE_stop_0 dvossel-laptop2" [ style=bold color="green" fontcolor="black"] "W-master_running_0" [ style=bold color="green" fontcolor="orange"] "W-master_start_0" -> "W-master_running_0" [ style = bold] @@ -29,7 +29,6 @@ digraph "g" { "X:1_start_0 18builder" -> "X-master_running_0" [ style = bold] "X:1_start_0 18builder" -> "X:1_monitor_10000 18builder" [ style = bold] "X:1_start_0 18builder" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "vm_start_0 dvossel-laptop2" -> "18builder_start_0 dvossel-laptop2" [ style = bold] "vm_start_0 dvossel-laptop2" -> "FAKE_start_0 18builder" [ style = bold] "vm_start_0 dvossel-laptop2" -> "W:1_start_0 18builder" [ style = bold] diff --git a/pengine/test10/whitebox-fail3.exp b/pengine/test10/whitebox-fail3.exp index ec28f12..3127621 100644 --- a/pengine/test10/whitebox-fail3.exp +++ b/pengine/test10/whitebox-fail3.exp @@ -1,7 +1,7 @@ - + @@ -10,85 +10,89 @@ - + - + - + - + - + - + + + + + - + - + - + - + - + - + - + - + - + - + - + @@ -96,57 +100,57 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -154,53 +158,40 @@ - + - + - + - + - + - + - - - - - - - - - - - - - diff --git a/pengine/test10/whitebox-fail3.summary b/pengine/test10/whitebox-fail3.summary index eded099..bae9e2d 100644 --- a/pengine/test10/whitebox-fail3.summary +++ b/pengine/test10/whitebox-fail3.summary @@ -21,18 +21,17 @@ Transition Summary: Executing cluster transition: * Resource action: vm start on dvossel-laptop2 - * Resource action: FAKE stop on dvossel-laptop2 * Pseudo action: W-master_start_0 * Pseudo action: X-master_start_0 * Resource action: 18builder monitor on dvossel-laptop2 - * Pseudo action: all_stopped * Resource action: 18builder start on dvossel-laptop2 - * Resource action: FAKE start on 18builder + * Resource action: FAKE stop on dvossel-laptop2 * Resource action: W start on 18builder * Pseudo action: W-master_running_0 * Resource action: X start on 18builder * Pseudo action: X-master_running_0 * Resource action: 18builder monitor=30000 on dvossel-laptop2 + * Resource action: FAKE start on 18builder * Resource action: W monitor=10000 on 18builder * Resource action: X monitor=10000 on 18builder diff --git a/pengine/test10/whitebox-imply-stop-on-fence.dot b/pengine/test10/whitebox-imply-stop-on-fence.dot index 1ef3cba..a58e7c7 100644 --- a/pengine/test10/whitebox-imply-stop-on-fence.dot +++ b/pengine/test10/whitebox-imply-stop-on-fence.dot @@ -5,7 +5,6 @@ "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"] @@ -13,14 +12,9 @@ "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" -> "lxc-01_kiff-01_start_0 kiff-02" [ style = bold] -"all_stopped" -> "lxc-02_kiff-01_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"] @@ -28,7 +22,6 @@ "clvmd-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] "clvmd_monitor_0 lxc-01_kiff-02" [ style=bold color="green" fontcolor="black"] "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"] @@ -38,13 +31,11 @@ "dlm-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] "dlm_monitor_0 lxc-01_kiff-02" [ style=bold color="green" fontcolor="black"] "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"] @@ -53,14 +44,12 @@ "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] @@ -70,11 +59,12 @@ "shared0-clone_stopped_0" [ style=bold color="green" fontcolor="orange"] "shared0_monitor_0 lxc-01_kiff-02" [ style=bold color="green" fontcolor="black"] "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_start_0 kiff-02" [ style = bold] "stonith 'reboot' kiff-01" -> "R-lxc-01_kiff-01_stop_0 kiff-01" [ style = bold] +"stonith 'reboot' kiff-01" -> "R-lxc-02_kiff-01_start_0 kiff-02" [ 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] @@ -84,18 +74,23 @@ "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" -> "vm-fs_start_0 lxc-01_kiff-01" [ 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" -> "R-lxc-01_kiff-01_start_0 kiff-02" [ style = bold] +"stonith 'reboot' lxc-01_kiff-01" -> "R-lxc-02_kiff-01_start_0 kiff-02" [ style = bold] +"stonith 'reboot' lxc-01_kiff-01" -> "fence-kiff-02_start_0 kiff-02" [ style = bold] +"stonith 'reboot' lxc-01_kiff-01" -> "lxc-01_kiff-01_start_0 kiff-02" [ style = bold] +"stonith 'reboot' lxc-01_kiff-01" -> "lxc-02_kiff-01_start_0 kiff-02" [ style = bold] +"stonith 'reboot' lxc-01_kiff-01" -> "vm-fs_start_0 lxc-01_kiff-01" [ 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" -> "R-lxc-01_kiff-01_start_0 kiff-02" [ style = bold] +"stonith 'reboot' lxc-02_kiff-01" -> "R-lxc-02_kiff-01_start_0 kiff-02" [ style = bold] +"stonith 'reboot' lxc-02_kiff-01" -> "fence-kiff-02_start_0 kiff-02" [ style = bold] +"stonith 'reboot' lxc-02_kiff-01" -> "lxc-01_kiff-01_start_0 kiff-02" [ style = bold] +"stonith 'reboot' lxc-02_kiff-01" -> "lxc-02_kiff-01_start_0 kiff-02" [ style = bold] +"stonith 'reboot' lxc-02_kiff-01" -> "vm-fs_start_0 lxc-01_kiff-01" [ 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" -> "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" [ style=bold color="green" fontcolor="black"] "vm-fs_monitor_0 lxc-02_kiff-02" -> "vm-fs_start_0 lxc-01_kiff-01" [ style = bold] @@ -103,7 +98,6 @@ "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 c73d1d2..cdba621 100644 --- a/pengine/test10/whitebox-imply-stop-on-fence.exp +++ b/pengine/test10/whitebox-imply-stop-on-fence.exp @@ -1,36 +1,39 @@ - + - + - + - + - + + + + - + @@ -38,7 +41,7 @@ - + @@ -47,16 +50,16 @@ - + - + - + @@ -65,7 +68,7 @@ - + @@ -74,22 +77,22 @@ - + - + - + - + @@ -98,13 +101,13 @@ - + - + @@ -113,16 +116,16 @@ - + - + - + @@ -131,7 +134,7 @@ - + @@ -140,22 +143,22 @@ - + - + - + - + @@ -164,13 +167,13 @@ - + - + @@ -179,13 +182,13 @@ - + - + @@ -194,7 +197,7 @@ - + @@ -203,22 +206,22 @@ - + - + - + - + @@ -227,45 +230,51 @@ - + - + - + - + - + - + + + + + + + - + - + @@ -274,42 +283,48 @@ - + - + - + - + - + - + + + + + + + - + @@ -318,72 +333,78 @@ - + - + - + - + - + - + + + + - + - + - + - + - + - + + + + - + - + - + @@ -392,7 +413,7 @@ - + @@ -401,39 +422,42 @@ - + - + - + - + + + + - + - + - + @@ -441,39 +465,42 @@ - + - + - + - + - + - + + + + - + @@ -481,7 +508,7 @@ - + @@ -496,7 +523,7 @@ - + @@ -511,63 +538,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/whitebox-imply-stop-on-fence.summary b/pengine/test10/whitebox-imply-stop-on-fence.summary index 5ce580e..85cdb43 100644 --- a/pengine/test10/whitebox-imply-stop-on-fence.summary +++ b/pengine/test10/whitebox-imply-stop-on-fence.summary @@ -55,30 +55,28 @@ Executing cluster transition: * Pseudo action: R-lxc-02_kiff-01_stop_0 * Pseudo action: stonith-lxc-02_kiff-01-reboot on lxc-02_kiff-01 * Pseudo action: stonith-lxc-01_kiff-01-reboot on lxc-01_kiff-01 - * Pseudo action: stonith_complete + * Resource action: fence-kiff-02 start on kiff-02 * Pseudo action: shared0-clone_stop_0 * Resource action: R-lxc-01_kiff-01 start on kiff-02 * Resource action: R-lxc-02_kiff-01 start on kiff-02 * Pseudo action: vm-fs_stop_0 + * Resource action: lxc-01_kiff-01 start on kiff-02 + * Resource action: lxc-02_kiff-01 start on kiff-02 + * Resource action: fence-kiff-02 monitor=60000 on kiff-02 * Pseudo action: shared0_stop_0 * Pseudo action: shared0-clone_stopped_0 * Resource action: R-lxc-01_kiff-01 monitor=10000 on kiff-02 * Resource action: R-lxc-02_kiff-01 monitor=10000 on kiff-02 + * Resource action: vm-fs start on lxc-01_kiff-01 + * Resource action: lxc-01_kiff-01 monitor=30000 on kiff-02 + * Resource action: lxc-02_kiff-01 monitor=30000 on kiff-02 * Pseudo action: clvmd-clone_stop_0 + * Resource action: vm-fs monitor=20000 on lxc-01_kiff-01 * Pseudo action: clvmd_stop_0 * Pseudo action: clvmd-clone_stopped_0 * Pseudo action: dlm-clone_stop_0 * Pseudo action: dlm_stop_0 * Pseudo action: dlm-clone_stopped_0 - * Pseudo action: all_stopped - * Resource action: fence-kiff-02 start on kiff-02 - * Resource action: lxc-01_kiff-01 start on kiff-02 - * Resource action: lxc-02_kiff-01 start on kiff-02 - * Resource action: fence-kiff-02 monitor=60000 on kiff-02 - * Resource action: vm-fs start on lxc-01_kiff-01 - * Resource action: lxc-01_kiff-01 monitor=30000 on kiff-02 - * Resource action: lxc-02_kiff-01 monitor=30000 on kiff-02 - * Resource action: vm-fs monitor=20000 on lxc-01_kiff-01 Revised cluster status: Online: [ kiff-02 ] diff --git a/pengine/test10/whitebox-migrate1.dot b/pengine/test10/whitebox-migrate1.dot index 500dc34..ae88207 100644 --- a/pengine/test10/whitebox-migrate1.dot +++ b/pengine/test10/whitebox-migrate1.dot @@ -3,9 +3,7 @@ "FAKE3_start_0 rhel7-node2" -> "FAKE3_monitor_10000 rhel7-node2" [ style = bold] "FAKE3_start_0 rhel7-node2" [ style=bold color="green" fontcolor="black"] "FAKE3_stop_0 rhel7-node3" -> "FAKE3_start_0 rhel7-node2" [ style = bold] -"FAKE3_stop_0 rhel7-node3" -> "all_stopped" [ style = bold] "FAKE3_stop_0 rhel7-node3" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "remote-rsc_migrate_from_0 rhel7-node3" -> "remote-rsc_start_0 rhel7-node3" [ style = bold] "remote-rsc_migrate_from_0 rhel7-node3" -> "remote-rsc_stop_0 rhel7-node2" [ style = bold] "remote-rsc_migrate_from_0 rhel7-node3" -> "rhel7-node1_migrate_to_0 rhel7-node2" [ style = bold] @@ -18,7 +16,6 @@ "remote-rsc_start_0 rhel7-node3" -> "rhel7-node1_start_0 rhel7-node3" [ style = bold] "remote-rsc_start_0 rhel7-node3" [ style=bold color="green" fontcolor="orange"] "remote-rsc_stop_0 rhel7-node2" -> "FAKE3_start_0 rhel7-node2" [ style = dashed] -"remote-rsc_stop_0 rhel7-node2" -> "all_stopped" [ style = bold] "remote-rsc_stop_0 rhel7-node2" -> "remote-rsc_start_0 rhel7-node3" [ style = bold] "remote-rsc_stop_0 rhel7-node2" [ style=bold color="green" fontcolor="black"] "rhel7-node1_migrate_from_0 rhel7-node3" -> "rhel7-node1_start_0 rhel7-node3" [ style = bold] @@ -32,7 +29,6 @@ "rhel7-node1_monitor_30000 rhel7-node3" [ style=bold color="green" fontcolor="black"] "rhel7-node1_start_0 rhel7-node3" -> "rhel7-node1_monitor_30000 rhel7-node3" [ style = bold] "rhel7-node1_start_0 rhel7-node3" [ style=bold color="green" fontcolor="orange"] -"rhel7-node1_stop_0 rhel7-node2" -> "all_stopped" [ style = bold] "rhel7-node1_stop_0 rhel7-node2" -> "remote-rsc_migrate_to_0 rhel7-node2" [ style = dashed] "rhel7-node1_stop_0 rhel7-node2" -> "remote-rsc_stop_0 rhel7-node2" [ style = bold] "rhel7-node1_stop_0 rhel7-node2" -> "rhel7-node1_start_0 rhel7-node3" [ style = bold] @@ -40,7 +36,6 @@ "shooter1_monitor_60000 rhel7-node2" [ style=bold color="green" fontcolor="black"] "shooter1_start_0 rhel7-node2" -> "shooter1_monitor_60000 rhel7-node2" [ style = bold] "shooter1_start_0 rhel7-node2" [ style=bold color="green" fontcolor="black"] -"shooter1_stop_0 rhel7-node3" -> "all_stopped" [ style = bold] "shooter1_stop_0 rhel7-node3" -> "shooter1_start_0 rhel7-node2" [ style = bold] "shooter1_stop_0 rhel7-node3" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/whitebox-migrate1.exp b/pengine/test10/whitebox-migrate1.exp index 03e8b83..81c35ec 100644 --- a/pengine/test10/whitebox-migrate1.exp +++ b/pengine/test10/whitebox-migrate1.exp @@ -1,33 +1,33 @@ - + - + - + - + - + @@ -36,33 +36,33 @@ - + - + - + - + - + @@ -71,20 +71,20 @@ - + - + - + @@ -93,152 +93,131 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/whitebox-migrate1.summary b/pengine/test10/whitebox-migrate1.summary index 0fc0f9a..58ef985 100644 --- a/pengine/test10/whitebox-migrate1.summary +++ b/pengine/test10/whitebox-migrate1.summary @@ -33,7 +33,6 @@ Executing cluster transition: * Resource action: rhel7-node1 migrate_from on rhel7-node3 * Resource action: rhel7-node1 stop on rhel7-node2 * Resource action: remote-rsc stop on rhel7-node2 - * Pseudo action: all_stopped * Pseudo action: remote-rsc_start_0 * Pseudo action: rhel7-node1_start_0 * Resource action: remote-rsc monitor=10000 on rhel7-node3 diff --git a/pengine/test10/whitebox-move.dot b/pengine/test10/whitebox-move.dot index 56f2fdd..418e63b 100644 --- a/pengine/test10/whitebox-move.dot +++ b/pengine/test10/whitebox-move.dot @@ -5,7 +5,6 @@ digraph "g" { "A_start_0 lxc1" -> "A_monitor_10000 lxc1" [ style = bold] "A_start_0 lxc1" [ style=bold color="green" fontcolor="black"] "A_stop_0 lxc1" -> "A_start_0 lxc1" [ style = bold] -"A_stop_0 lxc1" -> "all_stopped" [ style = bold] "A_stop_0 lxc1" -> "lxc1_stop_0 18node1" [ style = bold] "A_stop_0 lxc1" [ style=bold color="green" fontcolor="black"] "M-clone_running_0" [ style=bold color="green" fontcolor="orange"] @@ -23,15 +22,12 @@ digraph "g" { "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" -> "lxc1_stop_0 18node1" [ style = bold] "M_stop_0 lxc1" [ style=bold color="green" fontcolor="black"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "container1_start_0 18node2" -> "A_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 18node1" -> "all_stopped" [ style = bold] "container1_stop_0 18node1" -> "container1_start_0 18node2" [ style = bold] "container1_stop_0 18node1" [ style=bold color="green" fontcolor="black"] "lxc1_monitor_30000 18node2" [ style=bold color="green" fontcolor="black"] @@ -41,7 +37,6 @@ digraph "g" { "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 18node1" -> "all_stopped" [ style = bold] "lxc1_stop_0 18node1" -> "container1_stop_0 18node1" [ style = bold] "lxc1_stop_0 18node1" -> "lxc1_start_0 18node2" [ style = bold] "lxc1_stop_0 18node1" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/whitebox-move.exp b/pengine/test10/whitebox-move.exp index cb596bd..5d17dc6 100644 --- a/pengine/test10/whitebox-move.exp +++ b/pengine/test10/whitebox-move.exp @@ -1,62 +1,62 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -69,31 +69,31 @@ - + - + - + - + - + - + @@ -101,56 +101,56 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -159,7 +159,7 @@ - + @@ -175,45 +175,45 @@ - + - + - + - + - + - + - + - + @@ -223,31 +223,10 @@ - + - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/whitebox-move.summary b/pengine/test10/whitebox-move.summary index 95e9680..c4b8b3f 100644 --- a/pengine/test10/whitebox-move.summary +++ b/pengine/test10/whitebox-move.summary @@ -25,7 +25,6 @@ Executing cluster transition: * Pseudo action: M-clone_start_0 * Resource action: lxc1 stop on 18node1 * Resource action: container1 stop on 18node1 - * Pseudo action: all_stopped * Resource action: container1 start on 18node2 * Resource action: lxc1 start on 18node2 * Resource action: M start on lxc1 diff --git a/pengine/test10/whitebox-ms-ordering-move.dot b/pengine/test10/whitebox-ms-ordering-move.dot index 641dbca..7fe7548 100644 --- a/pengine/test10/whitebox-ms-ordering-move.dot +++ b/pengine/test10/whitebox-ms-ordering-move.dot @@ -1,10 +1,8 @@ digraph "g" { -"all_stopped" [ style=bold color="green" fontcolor="orange"] "container1_start_0 rhel7-2" -> "lxc-ms_promote_0 lxc1" [ style = bold] "container1_start_0 rhel7-2" -> "lxc-ms_start_0 lxc1" [ style = bold] "container1_start_0 rhel7-2" -> "lxc1_start_0 rhel7-2" [ style = bold] "container1_start_0 rhel7-2" [ style=bold color="green" fontcolor="black"] -"container1_stop_0 rhel7-1" -> "all_stopped" [ style = bold] "container1_stop_0 rhel7-1" -> "container1_start_0 rhel7-2" [ style = bold] "container1_stop_0 rhel7-1" [ style=bold color="green" fontcolor="black"] "lsb-dummy_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"] @@ -39,7 +37,6 @@ digraph "g" { "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_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" -> "lxc1_stop_0 rhel7-1" [ style = bold] @@ -57,7 +54,6 @@ digraph "g" { "lxc1_start_0 rhel7-2" -> "lxc-ms_start_0 lxc1" [ style = bold] "lxc1_start_0 rhel7-2" -> "lxc1_monitor_30000 rhel7-2" [ style = bold] "lxc1_start_0 rhel7-2" [ style=bold color="green" fontcolor="black"] -"lxc1_stop_0 rhel7-1" -> "all_stopped" [ style = bold] "lxc1_stop_0 rhel7-1" -> "container1_stop_0 rhel7-1" [ style = bold] "lxc1_stop_0 rhel7-1" -> "lxc1_start_0 rhel7-2" [ style = bold] "lxc1_stop_0 rhel7-1" [ style=bold color="green" fontcolor="black"] diff --git a/pengine/test10/whitebox-ms-ordering-move.exp b/pengine/test10/whitebox-ms-ordering-move.exp index aabcaa7..48b7e1e 100644 --- a/pengine/test10/whitebox-ms-ordering-move.exp +++ b/pengine/test10/whitebox-ms-ordering-move.exp @@ -1,7 +1,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -109,124 +109,124 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -234,135 +234,135 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -372,16 +372,16 @@ - + - + - + @@ -390,7 +390,7 @@ - + @@ -399,7 +399,7 @@ - + @@ -408,7 +408,7 @@ - + @@ -417,7 +417,7 @@ - + @@ -426,7 +426,7 @@ - + @@ -435,7 +435,7 @@ - + @@ -444,29 +444,11 @@ - + - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/whitebox-ms-ordering-move.summary b/pengine/test10/whitebox-ms-ordering-move.summary index af86d74..ef99134 100644 --- a/pengine/test10/whitebox-ms-ordering-move.summary +++ b/pengine/test10/whitebox-ms-ordering-move.summary @@ -64,7 +64,6 @@ Executing cluster transition: * Pseudo action: lxc-ms-master_start_0 * Resource action: lxc1 stop on rhel7-1 * Resource action: container1 stop on rhel7-1 - * Pseudo action: all_stopped * Resource action: container1 start on rhel7-2 * Resource action: lxc1 start on rhel7-2 * Resource action: lxc-ms start on lxc1 diff --git a/pengine/test10/whitebox-ms-ordering.dot b/pengine/test10/whitebox-ms-ordering.dot index d5112b9..ba0dd30 100644 --- a/pengine/test10/whitebox-ms-ordering.dot +++ b/pengine/test10/whitebox-ms-ordering.dot @@ -1,7 +1,4 @@ digraph "g" { -"all_stopped" -> "lxc1_start_0 18node1" [ style = bold] -"all_stopped" -> "lxc2_start_0 18node1" [ style = bold] -"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] @@ -63,11 +60,9 @@ "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"] @@ -93,20 +88,25 @@ "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" -> "container1_start_0 18node1" [ style = bold] +"stonith 'reboot' lxc1" -> "container2_start_0 18node1" [ style = bold] "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_promote_0 lxc1" [ style = bold] +"stonith 'reboot' lxc1" -> "lxc-ms_start_0 lxc1" [ style = bold] +"stonith 'reboot' lxc1" -> "lxc-ms_start_0 lxc2" [ style = bold] "stonith 'reboot' lxc1" -> "lxc-ms_stop_0 lxc1" [ style = bold] -"stonith 'reboot' lxc1" -> "stonith_complete" [ style = bold] +"stonith 'reboot' lxc1" -> "lxc1_start_0 18node1" [ style = bold] +"stonith 'reboot' lxc1" -> "lxc2_start_0 18node1" [ style = bold] "stonith 'reboot' lxc1" [ style=bold color="green" fontcolor="orange"] +"stonith 'reboot' lxc2" -> "container1_start_0 18node1" [ style = bold] +"stonith 'reboot' lxc2" -> "container2_start_0 18node1" [ style = bold] "stonith 'reboot' lxc2" -> "lxc-ms-master_stop_0" [ style = bold] +"stonith 'reboot' lxc2" -> "lxc-ms_promote_0 lxc1" [ style = bold] +"stonith 'reboot' lxc2" -> "lxc-ms_start_0 lxc1" [ style = bold] +"stonith 'reboot' lxc2" -> "lxc-ms_start_0 lxc2" [ style = bold] "stonith 'reboot' lxc2" -> "lxc-ms_stop_0 lxc2" [ style = bold] -"stonith 'reboot' lxc2" -> "stonith_complete" [ style = bold] +"stonith 'reboot' lxc2" -> "lxc1_start_0 18node1" [ style = bold] +"stonith 'reboot' lxc2" -> "lxc2_start_0 18node1" [ 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" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/whitebox-ms-ordering.exp b/pengine/test10/whitebox-ms-ordering.exp index d5608e4..80d8e5e 100644 --- a/pengine/test10/whitebox-ms-ordering.exp +++ b/pengine/test10/whitebox-ms-ordering.exp @@ -1,29 +1,32 @@ - + - + - + - + - + + + + - + @@ -32,7 +35,7 @@ - + @@ -41,7 +44,7 @@ - + @@ -50,29 +53,32 @@ - + - + - + - + - + + + + - + @@ -81,7 +87,7 @@ - + @@ -90,7 +96,7 @@ - + @@ -99,93 +105,99 @@ - + - + - + - + - + - + - + + + + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + - + @@ -194,7 +206,7 @@ - + @@ -203,7 +215,7 @@ - + @@ -212,78 +224,81 @@ - + - + - + - + - + + + + - + - + - + - + - + - + - + - + - + - + - + @@ -291,153 +306,156 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + + + - + - + - + - + - + @@ -446,7 +464,7 @@ - + @@ -455,7 +473,7 @@ - + @@ -464,45 +482,48 @@ - + - + - + - + + + + - + - + - + - + - + @@ -511,7 +532,7 @@ - + @@ -520,7 +541,7 @@ - + @@ -529,7 +550,7 @@ - + @@ -540,7 +561,7 @@ - + @@ -549,37 +570,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/whitebox-ms-ordering.summary b/pengine/test10/whitebox-ms-ordering.summary index 46fe9d1..097182c 100644 --- a/pengine/test10/whitebox-ms-ordering.summary +++ b/pengine/test10/whitebox-ms-ordering.summary @@ -37,24 +37,22 @@ Executing cluster transition: * Resource action: lxc2 monitor on 18node1 * Pseudo action: stonith-lxc2-reboot on lxc2 * Pseudo action: stonith-lxc1-reboot on lxc1 - * Pseudo action: stonith_complete * Resource action: container1 start on 18node1 * Resource action: container2 start on 18node1 * Pseudo action: lxc-ms_demote_0 * Pseudo action: lxc-ms-master_demoted_0 * Pseudo action: lxc-ms-master_stop_0 + * Resource action: lxc1 start on 18node1 + * Resource action: lxc2 start on 18node1 * Pseudo action: lxc-ms_stop_0 * Pseudo action: lxc-ms_stop_0 * Pseudo action: lxc-ms-master_stopped_0 * Pseudo action: lxc-ms-master_start_0 - * Pseudo action: all_stopped - * Resource action: lxc1 start on 18node1 - * Resource action: lxc2 start on 18node1 + * Resource action: lxc1 monitor=30000 on 18node1 + * Resource action: lxc2 monitor=30000 on 18node1 * Resource action: lxc-ms start on lxc1 * Resource action: lxc-ms start on lxc2 * Pseudo action: lxc-ms-master_running_0 - * Resource action: lxc1 monitor=30000 on 18node1 - * Resource action: lxc2 monitor=30000 on 18node1 * Resource action: lxc-ms monitor=10000 on lxc2 * Pseudo action: lxc-ms-master_promote_0 * Resource action: lxc-ms promote on lxc1 diff --git a/pengine/test10/whitebox-nested-group.exp b/pengine/test10/whitebox-nested-group.exp index 388c4d4..eb38f6b 100644 --- a/pengine/test10/whitebox-nested-group.exp +++ b/pengine/test10/whitebox-nested-group.exp @@ -1,39 +1,39 @@ - + - + - + - + - + - + - + @@ -42,7 +42,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -60,48 +60,48 @@ - + - + - + - + - + - + - + - + - + - + @@ -110,7 +110,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -128,39 +128,39 @@ - + - + - + - + - + - + - + @@ -169,7 +169,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -187,39 +187,39 @@ - + - + - + - + - + - + - + @@ -228,7 +228,7 @@ - + @@ -237,7 +237,7 @@ - + @@ -246,48 +246,48 @@ - + - + - + - + - + - + - + - + - + - + @@ -296,7 +296,7 @@ - + @@ -305,7 +305,7 @@ - + @@ -314,33 +314,33 @@ - + - + - + - + - + @@ -349,33 +349,33 @@ - + - + - + - + - + @@ -384,68 +384,68 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -454,67 +454,67 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -522,42 +522,42 @@ - + - + - + - + - + - + - + - + @@ -566,7 +566,7 @@ - + @@ -575,7 +575,7 @@ - + @@ -584,71 +584,71 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -657,7 +657,7 @@ - + @@ -666,7 +666,7 @@ - + diff --git a/pengine/test10/whitebox-orphan-ms.dot b/pengine/test10/whitebox-orphan-ms.dot index 46b6cda..a6dfc94 100644 --- a/pengine/test10/whitebox-orphan-ms.dot +++ b/pengine/test10/whitebox-orphan-ms.dot @@ -1,9 +1,7 @@ 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] @@ -11,7 +9,6 @@ "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] @@ -20,7 +17,6 @@ "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] @@ -39,13 +35,11 @@ "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] @@ -54,7 +48,6 @@ "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] @@ -63,7 +56,6 @@ "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] diff --git a/pengine/test10/whitebox-orphan-ms.exp b/pengine/test10/whitebox-orphan-ms.exp index ef81317..8690d7b 100644 --- a/pengine/test10/whitebox-orphan-ms.exp +++ b/pengine/test10/whitebox-orphan-ms.exp @@ -1,20 +1,20 @@ - + - + - + @@ -23,59 +23,59 @@ - + - + - + - + - + - + - + - + - + @@ -85,87 +85,87 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -174,7 +174,7 @@ - + @@ -183,55 +183,55 @@ - + - + - + - + - + - + - + - + - + - + @@ -241,131 +241,101 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/whitebox-orphan-ms.summary b/pengine/test10/whitebox-orphan-ms.summary index 71f87c5..7fae380 100644 --- a/pengine/test10/whitebox-orphan-ms.summary +++ b/pengine/test10/whitebox-orphan-ms.summary @@ -61,7 +61,6 @@ Executing cluster transition: * Resource action: container1 delete on 18node3 * Resource action: container1 delete on 18node2 * Resource action: container1 delete on 18node1 - * Pseudo action: all_stopped Revised cluster status: Online: [ 18node1 18node2 18node3 ] diff --git a/pengine/test10/whitebox-orphaned.dot b/pengine/test10/whitebox-orphaned.dot index 3e34f16..1511877 100644 --- a/pengine/test10/whitebox-orphaned.dot +++ b/pengine/test10/whitebox-orphaned.dot @@ -6,7 +6,6 @@ "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"] "D_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"] @@ -15,16 +14,13 @@ "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] @@ -34,7 +30,6 @@ "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] diff --git a/pengine/test10/whitebox-orphaned.exp b/pengine/test10/whitebox-orphaned.exp index 2255fec..251aa49 100644 --- a/pengine/test10/whitebox-orphaned.exp +++ b/pengine/test10/whitebox-orphaned.exp @@ -1,35 +1,35 @@ - + - + - + - + - + - + @@ -37,7 +37,7 @@ - + @@ -46,36 +46,36 @@ - + - + - + - + - + - + @@ -84,7 +84,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -102,23 +102,23 @@ - + - + - + - + @@ -127,46 +127,46 @@ - + - + - + - + - + - + - + @@ -176,19 +176,19 @@ - + - + - + - + @@ -197,61 +197,40 @@ - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/whitebox-orphaned.summary b/pengine/test10/whitebox-orphaned.summary index f1cc8cb..918142d 100644 --- a/pengine/test10/whitebox-orphaned.summary +++ b/pengine/test10/whitebox-orphaned.summary @@ -41,7 +41,6 @@ Executing cluster transition: * Resource action: container1 delete on 18node3 * Resource action: container1 delete on 18node2 * Resource action: container1 delete on 18node1 - * Pseudo action: all_stopped Revised cluster status: Online: [ 18node1 18node2 18node3 ] diff --git a/pengine/test10/whitebox-start.dot b/pengine/test10/whitebox-start.dot index d6b6753..863b10c 100644 --- a/pengine/test10/whitebox-start.dot +++ b/pengine/test10/whitebox-start.dot @@ -5,13 +5,11 @@ digraph "g" { "A_start_0 lxc1" -> "A_monitor_10000 lxc1" [ style = bold] "A_start_0 lxc1" [ style=bold color="green" fontcolor="black"] "A_stop_0 18node1" -> "A_start_0 lxc1" [ style = bold] -"A_stop_0 18node1" -> "all_stopped" [ style = bold] "A_stop_0 18node1" [ style=bold color="green" fontcolor="black"] "B_monitor_10000 18node3" [ style=bold color="green" fontcolor="black"] "B_start_0 18node3" -> "B_monitor_10000 18node3" [ style = bold] "B_start_0 18node3" [ style=bold color="green" fontcolor="black"] "B_stop_0 lxc2" -> "B_start_0 18node3" [ style = bold] -"B_stop_0 lxc2" -> "all_stopped" [ style = bold] "B_stop_0 lxc2" [ style=bold color="green" fontcolor="black"] "D_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"] "M-clone_running_0" [ style=bold color="green" fontcolor="orange"] @@ -22,7 +20,6 @@ digraph "g" { "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"] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "container1_start_0 18node1" -> "A_start_0 lxc1" [ style = bold] "container1_start_0 18node1" -> "M_start_0 lxc1" [ style = bold] "container1_start_0 18node1" -> "lxc1_start_0 18node1" [ style = bold] @@ -30,6 +27,7 @@ digraph "g" { "lxc1_monitor_30000 18node1" [ style=bold color="green" fontcolor="black"] "lxc1_start_0 18node1" -> "A_monitor_10000 lxc1" [ style = bold] "lxc1_start_0 18node1" -> "A_start_0 lxc1" [ style = bold] +"lxc1_start_0 18node1" -> "A_stop_0 18node1" [ style = bold] "lxc1_start_0 18node1" -> "M_monitor_10000 lxc1" [ style = bold] "lxc1_start_0 18node1" -> "M_start_0 lxc1" [ style = bold] "lxc1_start_0 18node1" -> "lxc1_monitor_30000 18node1" [ style = bold] diff --git a/pengine/test10/whitebox-start.exp b/pengine/test10/whitebox-start.exp index f3c6879..95250d6 100644 --- a/pengine/test10/whitebox-start.exp +++ b/pengine/test10/whitebox-start.exp @@ -1,7 +1,7 @@ - + @@ -10,57 +10,57 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -68,54 +68,58 @@ - + - + - + - + - + - + - + - + - + - + + + + + - + @@ -124,33 +128,33 @@ - + - + - + - + - + @@ -159,7 +163,7 @@ - + @@ -168,42 +172,27 @@ - + - + - + - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/whitebox-start.summary b/pengine/test10/whitebox-start.summary index b706193..6474642 100644 --- a/pengine/test10/whitebox-start.summary +++ b/pengine/test10/whitebox-start.summary @@ -24,20 +24,19 @@ Transition Summary: Executing cluster transition: * Resource action: container1 start on 18node1 * Pseudo action: M-clone_start_0 - * Resource action: A stop on 18node1 * Resource action: A monitor on lxc2 * Resource action: B stop on lxc2 * Resource action: D monitor on lxc2 * Resource action: lxc1 start on 18node1 - * Pseudo action: all_stopped * Resource action: M start on lxc1 * Pseudo action: M-clone_running_0 - * Resource action: A start on lxc1 + * Resource action: A stop on 18node1 * Resource action: B start on 18node3 * Resource action: lxc1 monitor=30000 on 18node1 * Resource action: M monitor=10000 on lxc1 - * Resource action: A monitor=10000 on lxc1 + * Resource action: A start on lxc1 * Resource action: B monitor=10000 on 18node3 + * Resource action: A monitor=10000 on lxc1 Revised cluster status: Online: [ 18node1 18node2 18node3 ] diff --git a/pengine/test10/whitebox-stop.dot b/pengine/test10/whitebox-stop.dot index 0eec273..304f134 100644 --- a/pengine/test10/whitebox-stop.dot +++ b/pengine/test10/whitebox-stop.dot @@ -6,7 +6,6 @@ digraph "g" { "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"] "D_monitor_0 lxc2" [ style=bold color="green" fontcolor="black"] @@ -15,13 +14,9 @@ digraph "g" { "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_stop_0 18node2" -> "all_stopped" [ style = bold] "container1_stop_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" [ style=bold color="green" fontcolor="black"] } diff --git a/pengine/test10/whitebox-stop.exp b/pengine/test10/whitebox-stop.exp index 598ada5..3640b03 100644 --- a/pengine/test10/whitebox-stop.exp +++ b/pengine/test10/whitebox-stop.exp @@ -1,48 +1,48 @@ - + - + - + - + - + - + - + - + @@ -50,7 +50,7 @@ - + @@ -59,36 +59,36 @@ - + - + - + - + - + - + @@ -97,7 +97,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -125,31 +125,10 @@ - + - - - - - - - - - - - - - - - - - - - - - - + diff --git a/pengine/test10/whitebox-stop.summary b/pengine/test10/whitebox-stop.summary index 55a83c7..f7b0106 100644 --- a/pengine/test10/whitebox-stop.summary +++ b/pengine/test10/whitebox-stop.summary @@ -32,7 +32,6 @@ Executing cluster transition: * Resource action: lxc1 stop on 18node2 * Resource action: container1 stop on 18node2 * Resource action: B monitor=10000 on lxc2 - * Pseudo action: all_stopped Revised cluster status: Online: [ 18node1 18node2 18node3 ] diff --git a/pengine/test10/whitebox-unexpectedly-running.dot b/pengine/test10/whitebox-unexpectedly-running.dot index f16e705..7554d53 100644 --- a/pengine/test10/whitebox-unexpectedly-running.dot +++ b/pengine/test10/whitebox-unexpectedly-running.dot @@ -4,13 +4,9 @@ "FAKE-crashed_start_0 18builder" -> "remote2_start_0 18builder" [ style = bold] "FAKE-crashed_start_0 18builder" [ style=bold color="green" fontcolor="black"] "FAKE-crashed_stop_0 18builder" -> "FAKE-crashed_start_0 18builder" [ style = bold] -"FAKE-crashed_stop_0 18builder" -> "all_stopped" [ style = bold] "FAKE-crashed_stop_0 18builder" -> "stonith 'reboot' remote2" [ style = bold] "FAKE-crashed_stop_0 18builder" [ style=bold color="green" fontcolor="black"] "FAKE_monitor_60000 18builder" [ style=bold color="green" fontcolor="black"] -"all_stopped" -> "remote1_start_0 18builder" [ style = bold] -"all_stopped" -> "remote2_start_0 18builder" [ style = bold] -"all_stopped" [ style=bold color="green" fontcolor="orange"] "remote1_monitor_0 18builder" -> "remote1_start_0 18builder" [ style = bold] "remote1_monitor_0 18builder" [ style=bold color="green" fontcolor="black"] "remote1_monitor_30000 18builder" [ style=bold color="green" fontcolor="black"] @@ -21,8 +17,7 @@ "remote2_monitor_30000 18builder" [ style=bold color="green" fontcolor="black"] "remote2_start_0 18builder" -> "remote2_monitor_30000 18builder" [ style = bold] "remote2_start_0 18builder" [ style=bold color="green" fontcolor="black"] -"stonith 'reboot' remote2" -> "stonith_complete" [ style = bold] +"stonith 'reboot' remote2" -> "remote1_start_0 18builder" [ style = bold] +"stonith 'reboot' remote2" -> "remote2_start_0 18builder" [ style = bold] "stonith 'reboot' remote2" [ style=bold color="green" fontcolor="orange"] -"stonith_complete" -> "all_stopped" [ style = bold] -"stonith_complete" [ style=bold color="green" fontcolor="orange"] } diff --git a/pengine/test10/whitebox-unexpectedly-running.exp b/pengine/test10/whitebox-unexpectedly-running.exp index 46376a5..f6a961c 100644 --- a/pengine/test10/whitebox-unexpectedly-running.exp +++ b/pengine/test10/whitebox-unexpectedly-running.exp @@ -1,7 +1,7 @@ - + @@ -10,20 +10,20 @@ - + - + - + @@ -45,36 +45,36 @@ - + - + - + - + - + - + @@ -83,39 +83,39 @@ - + - + - + - + - + - + - + @@ -124,7 +124,7 @@ - + @@ -137,31 +137,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pengine/test10/whitebox-unexpectedly-running.summary b/pengine/test10/whitebox-unexpectedly-running.summary index 3e0c898..3f7f8ae 100644 --- a/pengine/test10/whitebox-unexpectedly-running.summary +++ b/pengine/test10/whitebox-unexpectedly-running.summary @@ -17,8 +17,6 @@ Executing cluster transition: * Resource action: remote1 monitor on 18builder * Resource action: remote2 monitor on 18builder * Pseudo action: stonith-remote2-reboot on remote2 - * Pseudo action: stonith_complete - * Pseudo action: all_stopped * Resource action: FAKE-crashed start on 18builder * Resource action: remote1 start on 18builder * Resource action: remote2 start on 18builder -- 1.8.3.1