test: update pre-existing policy tests for fixed balancing spread

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/src/test/test-shutdown-policy-migrate-fail1/log.expect b/src/test/test-shutdown-policy-migrate-fail1/log.expect
index 1bb2291b220ccf3d94c051afc9e8edcd64e77ae4..73b89548f9effc64ba0198f03a7a61f05d71cb7f 100644 (file)
--- a/src/test/test-shutdown-policy-migrate-fail1/log.expect
+++ b/src/test/test-shutdown-policy-migrate-fail1/log.expect
@@ -29,70 +29,70 @@ info    120    node3/lrm: reboot LRM, doing maintenance, removing this node from
 info    120    node1/crm: node 'node3': state changed from 'online' => 'maintenance'
 info    120    node1/crm: relocate service 'fa:109' to node 'node1'
 info    120    node1/crm: service 'fa:109': state changed from 'started' to 'relocate'  (node = node3, target = node1)
-info    120    node1/crm: migrate service 'vm:103' to node 'node1' (running)
-info    120    node1/crm: service 'vm:103': state changed from 'started' to 'migrate'  (node = node3, target = node1)
+info    120    node1/crm: migrate service 'vm:103' to node 'node2' (running)
+info    120    node1/crm: service 'vm:103': state changed from 'started' to 'migrate'  (node = node3, target = node2)
 info    125    node3/lrm: status change active => maintenance
 err     125    node3/lrm: service fa:109 not moved (migration error)
-info    125    node3/lrm: service vm:103 - start migrate to node 'node1'
-info    125    node3/lrm: service vm:103 - end migrate to node 'node1'
+info    125    node3/lrm: service vm:103 - start migrate to node 'node2'
+info    125    node3/lrm: service vm:103 - end migrate to node 'node2'
 err     140    node1/crm: service 'fa:109' - migration failed (exit code 1)
 info    140    node1/crm: service 'fa:109': state changed from 'relocate' to 'started'  (node = node3)
-info    140    node1/crm: service 'vm:103': state changed from 'migrate' to 'started'  (node = node1)
-info    140    node1/crm: relocate service 'fa:109' to node 'node2'
-info    140    node1/crm: service 'fa:109': state changed from 'started' to 'relocate'  (node = node3, target = node2)
-info    141    node1/lrm: got lock 'ha_agent_node1_lock'
-info    141    node1/lrm: status change wait_for_agent_lock => active
-info    141    node1/lrm: starting service vm:103
-info    141    node1/lrm: service status vm:103 started
+info    140    node1/crm: service 'vm:103': state changed from 'migrate' to 'started'  (node = node2)
+info    140    node1/crm: relocate service 'fa:109' to node 'node1'
+info    140    node1/crm: service 'fa:109': state changed from 'started' to 'relocate'  (node = node3, target = node1)
+info    143    node2/lrm: got lock 'ha_agent_node2_lock'
+info    143    node2/lrm: status change wait_for_agent_lock => active
+info    143    node2/lrm: starting service vm:103
+info    143    node2/lrm: service status vm:103 started
 err     145    node3/lrm: service fa:109 not moved (migration error)
 err     160    node1/crm: service 'fa:109' - migration failed (exit code 1)
 info    160    node1/crm: service 'fa:109': state changed from 'relocate' to 'started'  (node = node3)
-info    160    node1/crm: relocate service 'fa:109' to node 'node2'
-info    160    node1/crm: service 'fa:109': state changed from 'started' to 'relocate'  (node = node3, target = node2)
+info    160    node1/crm: relocate service 'fa:109' to node 'node1'
+info    160    node1/crm: service 'fa:109': state changed from 'started' to 'relocate'  (node = node3, target = node1)
 err     165    node3/lrm: service fa:109 not moved (migration error)
 err     180    node1/crm: service 'fa:109' - migration failed (exit code 1)
 info    180    node1/crm: service 'fa:109': state changed from 'relocate' to 'started'  (node = node3)
-info    180    node1/crm: relocate service 'fa:109' to node 'node2'
-info    180    node1/crm: service 'fa:109': state changed from 'started' to 'relocate'  (node = node3, target = node2)
+info    180    node1/crm: relocate service 'fa:109' to node 'node1'
+info    180    node1/crm: service 'fa:109': state changed from 'started' to 'relocate'  (node = node3, target = node1)
 err     185    node3/lrm: service fa:109 not moved (migration error)
 err     200    node1/crm: service 'fa:109' - migration failed (exit code 1)
 info    200    node1/crm: service 'fa:109': state changed from 'relocate' to 'started'  (node = node3)
-info    200    node1/crm: relocate service 'fa:109' to node 'node2'
-info    200    node1/crm: service 'fa:109': state changed from 'started' to 'relocate'  (node = node3, target = node2)
+info    200    node1/crm: relocate service 'fa:109' to node 'node1'
+info    200    node1/crm: service 'fa:109': state changed from 'started' to 'relocate'  (node = node3, target = node1)
 err     205    node3/lrm: service fa:109 not moved (migration error)
 err     220    node1/crm: service 'fa:109' - migration failed (exit code 1)
 info    220    node1/crm: service 'fa:109': state changed from 'relocate' to 'started'  (node = node3)
-info    220    node1/crm: relocate service 'fa:109' to node 'node2'
-info    220    node1/crm: service 'fa:109': state changed from 'started' to 'relocate'  (node = node3, target = node2)
+info    220    node1/crm: relocate service 'fa:109' to node 'node1'
+info    220    node1/crm: service 'fa:109': state changed from 'started' to 'relocate'  (node = node3, target = node1)
 err     225    node3/lrm: service fa:109 not moved (migration error)
 err     240    node1/crm: service 'fa:109' - migration failed (exit code 1)
 info    240    node1/crm: service 'fa:109': state changed from 'relocate' to 'started'  (node = node3)
-info    240    node1/crm: relocate service 'fa:109' to node 'node2'
-info    240    node1/crm: service 'fa:109': state changed from 'started' to 'relocate'  (node = node3, target = node2)
+info    240    node1/crm: relocate service 'fa:109' to node 'node1'
+info    240    node1/crm: service 'fa:109': state changed from 'started' to 'relocate'  (node = node3, target = node1)
 err     245    node3/lrm: service fa:109 not moved (migration error)
 err     260    node1/crm: service 'fa:109' - migration failed (exit code 1)
 info    260    node1/crm: service 'fa:109': state changed from 'relocate' to 'started'  (node = node3)
-info    260    node1/crm: relocate service 'fa:109' to node 'node2'
-info    260    node1/crm: service 'fa:109': state changed from 'started' to 'relocate'  (node = node3, target = node2)
+info    260    node1/crm: relocate service 'fa:109' to node 'node1'
+info    260    node1/crm: service 'fa:109': state changed from 'started' to 'relocate'  (node = node3, target = node1)
 err     265    node3/lrm: service fa:109 not moved (migration error)
 err     280    node1/crm: service 'fa:109' - migration failed (exit code 1)
 info    280    node1/crm: service 'fa:109': state changed from 'relocate' to 'started'  (node = node3)
-info    280    node1/crm: relocate service 'fa:109' to node 'node2'
-info    280    node1/crm: service 'fa:109': state changed from 'started' to 'relocate'  (node = node3, target = node2)
+info    280    node1/crm: relocate service 'fa:109' to node 'node1'
+info    280    node1/crm: service 'fa:109': state changed from 'started' to 'relocate'  (node = node3, target = node1)
 err     285    node3/lrm: service fa:109 not moved (migration error)
 err     300    node1/crm: service 'fa:109' - migration failed (exit code 1)
 info    300    node1/crm: service 'fa:109': state changed from 'relocate' to 'started'  (node = node3)
-info    300    node1/crm: relocate service 'fa:109' to node 'node2'
-info    300    node1/crm: service 'fa:109': state changed from 'started' to 'relocate'  (node = node3, target = node2)
-info    305    node3/lrm: service fa:109 - start relocate to node 'node2'
+info    300    node1/crm: relocate service 'fa:109' to node 'node1'
+info    300    node1/crm: service 'fa:109': state changed from 'started' to 'relocate'  (node = node3, target = node1)
+info    305    node3/lrm: service fa:109 - start relocate to node 'node1'
 info    305    node3/lrm: stopping service fa:109 (relocate)
 info    305    node3/lrm: service status fa:109 stopped
-info    305    node3/lrm: service fa:109 - end relocate to node 'node2'
-info    320    node1/crm: service 'fa:109': state changed from 'relocate' to 'started'  (node = node2)
-info    323    node2/lrm: got lock 'ha_agent_node2_lock'
-info    323    node2/lrm: status change wait_for_agent_lock => active
-info    323    node2/lrm: starting service fa:109
-info    323    node2/lrm: service status fa:109 started
+info    305    node3/lrm: service fa:109 - end relocate to node 'node1'
+info    320    node1/crm: service 'fa:109': state changed from 'relocate' to 'started'  (node = node1)
+info    321    node1/lrm: got lock 'ha_agent_node1_lock'
+info    321    node1/lrm: status change wait_for_agent_lock => active
+info    321    node1/lrm: starting service fa:109
+info    321    node1/lrm: service status fa:109 started
 info    326    node3/lrm: exit (loop end)
 info    326       reboot: execute crm node3 stop
 info    325    node3/crm: server received shutdown request
@@ -104,16 +104,16 @@ info    340    node3/lrm: status change startup => wait_for_agent_lock
 info    360    node1/crm: node 'node3': state changed from 'maintenance' => 'online'
 info    360    node1/crm: moving service 'fa:109' back to 'node3', node came back from maintenance.
 info    360    node1/crm: relocate service 'fa:109' to node 'node3'
-info    360    node1/crm: service 'fa:109': state changed from 'started' to 'relocate'  (node = node2, target = node3)
+info    360    node1/crm: service 'fa:109': state changed from 'started' to 'relocate'  (node = node1, target = node3)
 info    360    node1/crm: moving service 'vm:103' back to 'node3', node came back from maintenance.
 info    360    node1/crm: migrate service 'vm:103' to node 'node3' (running)
-info    360    node1/crm: service 'vm:103': state changed from 'started' to 'migrate'  (node = node1, target = node3)
-info    361    node1/lrm: service vm:103 - start migrate to node 'node3'
-info    361    node1/lrm: service vm:103 - end migrate to node 'node3'
-err     363    node2/lrm: service fa:109 not moved (migration error)
+info    360    node1/crm: service 'vm:103': state changed from 'started' to 'migrate'  (node = node2, target = node3)
+err     361    node1/lrm: service fa:109 not moved (migration error)
+info    363    node2/lrm: service vm:103 - start migrate to node 'node3'
+info    363    node2/lrm: service vm:103 - end migrate to node 'node3'
 info    364    node3/crm: status change wait_for_quorum => slave
 err     380    node1/crm: service 'fa:109' - migration failed (exit code 1)
-info    380    node1/crm: service 'fa:109': state changed from 'relocate' to 'started'  (node = node2)
+info    380    node1/crm: service 'fa:109': state changed from 'relocate' to 'started'  (node = node1)
 info    380    node1/crm: service 'vm:103': state changed from 'migrate' to 'started'  (node = node3)
 info    385    node3/lrm: got lock 'ha_agent_node3_lock'
 info    385    node3/lrm: status change wait_for_agent_lock => active

diff --git a/src/test/test-shutdown-policy3/log.expect b/src/test/test-shutdown-policy3/log.expect
index 921c9f3a7856ae1c0e700c420256484ca94e8950..ca68ee1e80019dc2362db5d9b5ccd50c497e55aa 100644 (file)
--- a/src/test/test-shutdown-policy3/log.expect
+++ b/src/test/test-shutdown-policy3/log.expect
@@ -29,23 +29,25 @@ info    120    node3/lrm: reboot LRM, doing maintenance, removing this node from
 info    120    node1/crm: node 'node3': state changed from 'online' => 'maintenance'
 info    120    node1/crm: relocate service 'ct:102' to node 'node1'
 info    120    node1/crm: service 'ct:102': state changed from 'started' to 'relocate'  (node = node3, target = node1)
-info    120    node1/crm: migrate service 'vm:103' to node 'node1' (running)
-info    120    node1/crm: service 'vm:103': state changed from 'started' to 'migrate'  (node = node3, target = node1)
+info    120    node1/crm: migrate service 'vm:103' to node 'node2' (running)
+info    120    node1/crm: service 'vm:103': state changed from 'started' to 'migrate'  (node = node3, target = node2)
 info    125    node3/lrm: status change active => maintenance
 info    125    node3/lrm: service ct:102 - start relocate to node 'node1'
 info    125    node3/lrm: stopping service ct:102 (relocate)
 info    125    node3/lrm: service status ct:102 stopped
 info    125    node3/lrm: service ct:102 - end relocate to node 'node1'
-info    125    node3/lrm: service vm:103 - start migrate to node 'node1'
-info    125    node3/lrm: service vm:103 - end migrate to node 'node1'
+info    125    node3/lrm: service vm:103 - start migrate to node 'node2'
+info    125    node3/lrm: service vm:103 - end migrate to node 'node2'
 info    140    node1/crm: service 'ct:102': state changed from 'relocate' to 'started'  (node = node1)
-info    140    node1/crm: service 'vm:103': state changed from 'migrate' to 'started'  (node = node1)
+info    140    node1/crm: service 'vm:103': state changed from 'migrate' to 'started'  (node = node2)
 info    141    node1/lrm: got lock 'ha_agent_node1_lock'
 info    141    node1/lrm: status change wait_for_agent_lock => active
 info    141    node1/lrm: starting service ct:102
 info    141    node1/lrm: service status ct:102 started
-info    141    node1/lrm: starting service vm:103
-info    141    node1/lrm: service status vm:103 started
+info    143    node2/lrm: got lock 'ha_agent_node2_lock'
+info    143    node2/lrm: status change wait_for_agent_lock => active
+info    143    node2/lrm: starting service vm:103
+info    143    node2/lrm: service status vm:103 started
 info    146    node3/lrm: exit (loop end)
 info    146       reboot: execute crm node3 stop
 info    145    node3/crm: server received shutdown request
@@ -60,13 +62,13 @@ info    180    node1/crm: relocate service 'ct:102' to node 'node3'
 info    180    node1/crm: service 'ct:102': state changed from 'started' to 'relocate'  (node = node1, target = node3)
 info    180    node1/crm: moving service 'vm:103' back to 'node3', node came back from maintenance.
 info    180    node1/crm: migrate service 'vm:103' to node 'node3' (running)
-info    180    node1/crm: service 'vm:103': state changed from 'started' to 'migrate'  (node = node1, target = node3)
+info    180    node1/crm: service 'vm:103': state changed from 'started' to 'migrate'  (node = node2, target = node3)
 info    181    node1/lrm: service ct:102 - start relocate to node 'node3'
 info    181    node1/lrm: stopping service ct:102 (relocate)
 info    181    node1/lrm: service status ct:102 stopped
 info    181    node1/lrm: service ct:102 - end relocate to node 'node3'
-info    181    node1/lrm: service vm:103 - start migrate to node 'node3'
-info    181    node1/lrm: service vm:103 - end migrate to node 'node3'
+info    183    node2/lrm: service vm:103 - start migrate to node 'node3'
+info    183    node2/lrm: service vm:103 - end migrate to node 'node3'
 info    184    node3/crm: status change wait_for_quorum => slave
 info    200    node1/crm: service 'ct:102': state changed from 'relocate' to 'started'  (node = node3)
 info    200    node1/crm: service 'vm:103': state changed from 'migrate' to 'started'  (node = node3)

diff --git a/src/test/test-shutdown-policy4/log.expect b/src/test/test-shutdown-policy4/log.expect
index 71c234c686ed1b8487c1129c695d98d317eae958..a6a9055c39192bff84e909b0bea11d2f9394a1a6 100644 (file)
--- a/src/test/test-shutdown-policy4/log.expect
+++ b/src/test/test-shutdown-policy4/log.expect
@@ -31,23 +31,25 @@ info    120    node3/lrm: shutdown LRM, doing maintenance, removing this node fr
 info    120    node1/crm: node 'node3': state changed from 'online' => 'maintenance'
 info    120    node1/crm: relocate service 'ct:102' to node 'node1'
 info    120    node1/crm: service 'ct:102': state changed from 'started' to 'relocate'  (node = node3, target = node1)
-info    120    node1/crm: migrate service 'vm:103' to node 'node1' (running)
-info    120    node1/crm: service 'vm:103': state changed from 'started' to 'migrate'  (node = node3, target = node1)
+info    120    node1/crm: migrate service 'vm:103' to node 'node2' (running)
+info    120    node1/crm: service 'vm:103': state changed from 'started' to 'migrate'  (node = node3, target = node2)
 info    125    node3/lrm: status change active => maintenance
 info    125    node3/lrm: service ct:102 - start relocate to node 'node1'
 info    125    node3/lrm: stopping service ct:102 (relocate)
 info    125    node3/lrm: service status ct:102 stopped
 info    125    node3/lrm: service ct:102 - end relocate to node 'node1'
-info    125    node3/lrm: service vm:103 - start migrate to node 'node1'
-info    125    node3/lrm: service vm:103 - end migrate to node 'node1'
+info    125    node3/lrm: service vm:103 - start migrate to node 'node2'
+info    125    node3/lrm: service vm:103 - end migrate to node 'node2'
 info    140    node1/crm: service 'ct:102': state changed from 'relocate' to 'started'  (node = node1)
-info    140    node1/crm: service 'vm:103': state changed from 'migrate' to 'started'  (node = node1)
+info    140    node1/crm: service 'vm:103': state changed from 'migrate' to 'started'  (node = node2)
 info    141    node1/lrm: got lock 'ha_agent_node1_lock'
 info    141    node1/lrm: status change wait_for_agent_lock => active
 info    141    node1/lrm: starting service ct:102
 info    141    node1/lrm: service status ct:102 started
-info    141    node1/lrm: starting service vm:103
-info    141    node1/lrm: service status vm:103 started
+info    143    node2/lrm: got lock 'ha_agent_node2_lock'
+info    143    node2/lrm: status change wait_for_agent_lock => active
+info    143    node2/lrm: starting service vm:103
+info    143    node2/lrm: service status vm:103 started
 info    146    node3/lrm: exit (loop end)
 info    146     shutdown: execute crm node3 stop
 info    145    node3/crm: server received shutdown request
@@ -56,8 +58,8 @@ info    165     shutdown: execute power node3 off
 info    220      cmdlist: execute service ct:105 started
 info    220    node1/crm: service 'ct:105': state changed from 'stopped' to 'started'  (node = node3)
 info    220    node1/crm: service 'ct:105': state changed from 'started' to 'fence'
-info    220    node1/crm: relocate service 'ct:105' to node 'node2'
-info    220    node1/crm: service 'ct:105': state changed from 'fence' to 'relocate'  (node = node3, target = node2)
+info    220    node1/crm: relocate service 'ct:105' to node 'node1'
+info    220    node1/crm: service 'ct:105': state changed from 'fence' to 'relocate'  (node = node3, target = node1)
 info    220    node1/crm: service 'ct:105': state changed from 'relocate' to 'fence'
 info    220    node1/crm: node 'node3': state changed from 'maintenance' => 'fence'
 emai    220    node1/crm: FENCE: Try to fence node 'node3'
@@ -66,10 +68,8 @@ info    220    node1/crm: fencing: acknowledged - got agent lock for node 'node3
 info    220    node1/crm: node 'node3': state changed from 'fence' => 'unknown'
 emai    220    node1/crm: SUCCEED: fencing: acknowledged - got agent lock for node 'node3'
 info    220    node1/crm: service 'ct:105': state changed from 'fence' to 'recovery'
-info    220    node1/crm: recover service 'ct:105' from fenced node 'node3' to node 'node2'
-info    220    node1/crm: service 'ct:105': state changed from 'recovery' to 'started'  (node = node2)
-info    223    node2/lrm: got lock 'ha_agent_node2_lock'
-info    223    node2/lrm: status change wait_for_agent_lock => active
-info    223    node2/lrm: starting service ct:105
-info    223    node2/lrm: service status ct:105 started
+info    220    node1/crm: recover service 'ct:105' from fenced node 'node3' to node 'node1'
+info    220    node1/crm: service 'ct:105': state changed from 'recovery' to 'started'  (node = node1)
+info    221    node1/lrm: starting service ct:105
+info    221    node1/lrm: service status ct:105 started
 info    820     hardware: exit simulation - done

diff --git a/src/test/test-shutdown-policy5/log.expect b/src/test/test-shutdown-policy5/log.expect
index 021598ffd3b8dc03e52e69838059f5a7935435ff..7f6640cc3427a0b034adc48ca55eccbb39a602b9 100644 (file)
--- a/src/test/test-shutdown-policy5/log.expect
+++ b/src/test/test-shutdown-policy5/log.expect
@@ -29,17 +29,17 @@ info    120    node1/lrm: shutdown LRM, doing maintenance, removing this node fr
 info    120    node1/crm: node 'node1': state changed from 'online' => 'maintenance'
 info    120    node1/crm: relocate service 'ct:102' to node 'node2'
 info    120    node1/crm: service 'ct:102': state changed from 'started' to 'relocate'  (node = node1, target = node2)
-info    120    node1/crm: migrate service 'vm:103' to node 'node2' (running)
-info    120    node1/crm: service 'vm:103': state changed from 'started' to 'migrate'  (node = node1, target = node2)
+info    120    node1/crm: migrate service 'vm:103' to node 'node3' (running)
+info    120    node1/crm: service 'vm:103': state changed from 'started' to 'migrate'  (node = node1, target = node3)
 info    121    node1/lrm: status change active => maintenance
 info    121    node1/lrm: service ct:102 - start relocate to node 'node2'
 info    121    node1/lrm: stopping service ct:102 (relocate)
 info    121    node1/lrm: service status ct:102 stopped
 info    121    node1/lrm: service ct:102 - end relocate to node 'node2'
-info    121    node1/lrm: service vm:103 - start migrate to node 'node2'
-info    121    node1/lrm: service vm:103 - end migrate to node 'node2'
+info    121    node1/lrm: service vm:103 - start migrate to node 'node3'
+info    121    node1/lrm: service vm:103 - end migrate to node 'node3'
 info    140    node1/crm: service 'ct:102': state changed from 'relocate' to 'started'  (node = node2)
-info    140    node1/crm: service 'vm:103': state changed from 'migrate' to 'started'  (node = node2)
+info    140    node1/crm: service 'vm:103': state changed from 'migrate' to 'started'  (node = node3)
 info    142    node1/lrm: exit (loop end)
 info    142     shutdown: execute crm node1 stop
 info    141    node1/crm: server received shutdown request
@@ -47,8 +47,10 @@ info    143    node2/lrm: got lock 'ha_agent_node2_lock'
 info    143    node2/lrm: status change wait_for_agent_lock => active
 info    143    node2/lrm: starting service ct:102
 info    143    node2/lrm: service status ct:102 started
-info    143    node2/lrm: starting service vm:103
-info    143    node2/lrm: service status vm:103 started
+info    145    node3/lrm: got lock 'ha_agent_node3_lock'
+info    145    node3/lrm: status change wait_for_agent_lock => active
+info    145    node3/lrm: starting service vm:103
+info    145    node3/lrm: service status vm:103 started
 info    160    node1/crm: voluntary release CRM lock
 info    161    node1/crm: exit (loop end)
 info    161     shutdown: execute power node1 off