lrm: do not migrate if service already running upon rebalance on start

[pve-ha-manager.git] / src / test / test-crs-static-rebalance2 / log.expect

diff --git a/src/test/test-crs-static-rebalance2/log.expect b/src/test/test-crs-static-rebalance2/log.expect
index 58e53b007163f61da6b65faab0a7a7457bd76403..286514d81ed327a873e9e2ea9f28e204acce6851 100644 (file)
--- a/src/test/test-crs-static-rebalance2/log.expect
+++ b/src/test/test-crs-static-rebalance2/log.expect
@@ -21,44 +21,39 @@ info    120    node1/crm: service 'vm:100': state changed from 'request_start' t
 info    122    node2/crm: status change wait_for_quorum => slave
 info    123    node2/lrm: got lock 'ha_agent_node2_lock'
 info    123    node2/lrm: status change wait_for_agent_lock => active
-info    123    node2/lrm: service vm:100 - start relocate to node 'node1'
-info    123    node2/lrm: stopping service vm:100 (relocate)
-info    123    node2/lrm: service status vm:100 stopped
-info    123    node2/lrm: service vm:100 - end relocate to node 'node1'
+info    123    node2/lrm: ignoring rebalance-on-start for service vm:100 - already running
 info    124    node3/crm: status change wait_for_quorum => slave
-info    140    node1/crm: service 'vm:100': state changed from 'request_start_balance' to 'started'  (node = node1)
-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:100
-info    141    node1/lrm: service status vm:100 started
+info    140    node1/crm: service 'vm:100' - rebalance-on-start request ignored - service already running
+info    140    node1/crm: service 'vm:100': state changed from 'request_start_balance' to 'started'  (node = node2)
 info    220      cmdlist: execute service vm:101 add node2 started 0
 info    220    node1/crm: adding new service 'vm:101' on node 'node2'
-info    220    node1/crm: service vm:101: re-balance selected current node node2 for startup
-info    220    node1/crm: service 'vm:101': state changed from 'request_start' to 'started'  (node = node2)
-info    223    node2/lrm: starting service vm:101
-info    223    node2/lrm: service status vm:101 started
+info    220    node1/crm: service vm:101: re-balance selected new node node1 for startup
+info    220    node1/crm: service 'vm:101': state changed from 'request_start' to 'request_start_balance'  (node = node2, target = node1)
+info    223    node2/lrm: service vm:101 - start relocate to node 'node1'
+info    223    node2/lrm: service vm:101 - end relocate to node 'node1'
+info    240    node1/crm: service 'vm:101': state changed from 'request_start_balance' to 'started'  (node = node1)
+info    241    node1/lrm: got lock 'ha_agent_node1_lock'
+info    241    node1/lrm: status change wait_for_agent_lock => active
+info    241    node1/lrm: starting service vm:101
+info    241    node1/lrm: service status vm:101 started
 info    320      cmdlist: execute service vm:102 add node2 started 1
 info    320    node1/crm: adding new service 'vm:102' on node 'node2'
 info    320    node1/crm: service vm:102: re-balance selected new node node3 for startup
 info    320    node1/crm: service 'vm:102': state changed from 'request_start' to 'request_start_balance'  (node = node2, target = node3)
-info    323    node2/lrm: service vm:102 - start relocate to node 'node3'
-info    323    node2/lrm: stopping service vm:102 (relocate)
-info    323    node2/lrm: service status vm:102 stopped
-info    323    node2/lrm: service vm:102 - end relocate to node 'node3'
-info    340    node1/crm: service 'vm:102': state changed from 'request_start_balance' to 'started'  (node = node3)
-info    345    node3/lrm: got lock 'ha_agent_node3_lock'
-info    345    node3/lrm: status change wait_for_agent_lock => active
-info    345    node3/lrm: starting service vm:102
-info    345    node3/lrm: service status vm:102 started
+info    323    node2/lrm: ignoring rebalance-on-start for service vm:102 - already running
+info    340    node1/crm: service 'vm:102' - rebalance-on-start request ignored - service already running
+info    340    node1/crm: service 'vm:102': state changed from 'request_start_balance' to 'started'  (node = node2)
 info    420      cmdlist: execute service vm:103 add node2 started 0
 info    420    node1/crm: adding new service 'vm:103' on node 'node2'
-info    420    node1/crm: service vm:103: re-balance selected new node node1 for startup
-info    420    node1/crm: service 'vm:103': state changed from 'request_start' to 'request_start_balance'  (node = node2, target = node1)
-info    423    node2/lrm: service vm:103 - start relocate to node 'node1'
-info    423    node2/lrm: service vm:103 - end relocate to node 'node1'
-info    440    node1/crm: service 'vm:103': state changed from 'request_start_balance' to 'started'  (node = node1)
-info    441    node1/lrm: starting service vm:103
-info    441    node1/lrm: service status vm:103 started
+info    420    node1/crm: service vm:103: re-balance selected new node node3 for startup
+info    420    node1/crm: service 'vm:103': state changed from 'request_start' to 'request_start_balance'  (node = node2, target = node3)
+info    423    node2/lrm: service vm:103 - start relocate to node 'node3'
+info    423    node2/lrm: service vm:103 - end relocate to node 'node3'
+info    440    node1/crm: service 'vm:103': state changed from 'request_start_balance' to 'started'  (node = node3)
+info    445    node3/lrm: got lock 'ha_agent_node3_lock'
+info    445    node3/lrm: status change wait_for_agent_lock => active
+info    445    node3/lrm: starting service vm:103
+info    445    node3/lrm: service status vm:103 started
 info    520      cmdlist: execute service vm:104 add node2 stopped 0
 info    520    node1/crm: adding new service 'vm:104' on node 'node2'
 info    540    node1/crm: service 'vm:104': state changed from 'request_stop' to 'stopped'