manager: set new request_start state for services freshly added to HA

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

diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm
index fde71b447facde491a2d6fa3f23a00df51c103e5..494134edd3f26d4856887479ddb76a8028475dc2 100644 (file)
--- a/src/PVE/HA/Manager.pm
+++ b/src/PVE/HA/Manager.pm
@@ -451,7 +451,7 @@ sub manage {
 
        $haenv->log('info', "adding new service '$sid' on node '$cd->{node}'");
        # assume we are running to avoid relocate running service at add
-       my $state = ($cd->{state} eq 'started') ? 'started' : 'request_stop';
+       my $state = ($cd->{state} eq 'started') ? 'request_start' : 'request_stop';
        $ss->{$sid} = {
            state => $state, node => $cd->{node}, uid => compute_new_uuid('started'),
        };

diff --git a/src/test/test-basic1/log.expect b/src/test/test-basic1/log.expect
index c61850dc1aceeda57dd910029a78dd43cbefd7cb..6d33d1866d712d54ef9ea30009555211c0f66a41 100644 (file)
--- a/src/test/test-basic1/log.expect
+++ b/src/test/test-basic1/log.expect
@@ -16,6 +16,8 @@ info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:101' on node 'node1'
 info     20    node1/crm: adding new service 'vm:102' on node 'node2'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'vm:101': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     21    node1/lrm: got lock 'ha_agent_node1_lock'
 info     21    node1/lrm: status change wait_for_agent_lock => active
 info     21    node1/lrm: starting service vm:101

diff --git a/src/test/test-basic3/log.expect b/src/test/test-basic3/log.expect
index 64062b098dab4b4f35a41524c4614c79a78c4326..6a8b7f0546c773eac82fd9bd4ed4662f29f897fc 100644 (file)
--- a/src/test/test-basic3/log.expect
+++ b/src/test/test-basic3/log.expect
@@ -16,6 +16,9 @@ info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:101' on node 'node1'
 info     20    node1/crm: adding new service 'vm:102' on node 'node2'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'vm:101': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'vm:102': state changed from 'request_start' to 'started'  (node = node2)
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     21    node1/lrm: got lock 'ha_agent_node1_lock'
 info     21    node1/lrm: status change wait_for_agent_lock => active
 info     21    node1/lrm: starting service vm:101

diff --git a/src/test/test-basic4/log.expect b/src/test/test-basic4/log.expect
index 13a2e15535cc8a1e05923430e07623ab6846beec..500956f01a6ad419c97828d4f87e34bdc3b49ded 100644 (file)
--- a/src/test/test-basic4/log.expect
+++ b/src/test/test-basic4/log.expect
@@ -22,6 +22,9 @@ info    120    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info    120    node1/crm: adding new service 'vm:101' on node 'node1'
 info    120    node1/crm: adding new service 'vm:102' on node 'node2'
 info    120    node1/crm: adding new service 'vm:103' on node 'node3'
+info    120    node1/crm: service 'vm:101': state changed from 'request_start' to 'started'  (node = node1)
+info    120    node1/crm: service 'vm:102': state changed from 'request_start' to 'started'  (node = node2)
+info    120    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info    121    node1/lrm: got lock 'ha_agent_node1_lock'
 info    121    node1/lrm: status change wait_for_agent_lock => active
 info    121    node1/lrm: starting service vm:101

diff --git a/src/test/test-basic5/log.expect b/src/test/test-basic5/log.expect
index d7c1b75445056d4d28ad430ccc8ba14e1abef1b6..52cfb86d53f6dfc8ffa206e41f16ea64c41d6e37 100644 (file)
--- a/src/test/test-basic5/log.expect
+++ b/src/test/test-basic5/log.expect
@@ -16,6 +16,9 @@ info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:101' on node 'node1'
 info     20    node1/crm: adding new service 'vm:102' on node 'node2'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'vm:101': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'vm:102': state changed from 'request_start' to 'started'  (node = node2)
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     21    node1/lrm: got lock 'ha_agent_node1_lock'
 info     21    node1/lrm: status change wait_for_agent_lock => active
 info     21    node1/lrm: starting service vm:101

diff --git a/src/test/test-cfs-unavailable1/log.expect b/src/test/test-cfs-unavailable1/log.expect
index d45afb389675a3d36e48ee83d1dee7a212d05101..44e09e1d3e640a2dc9c98138e766839164717dca 100644 (file)
--- a/src/test/test-cfs-unavailable1/log.expect
+++ b/src/test/test-cfs-unavailable1/log.expect
@@ -16,6 +16,8 @@ info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:101' on node 'node1'
 info     20    node1/crm: adding new service 'vm:102' on node 'node2'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'vm:101': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     21    node1/lrm: got lock 'ha_agent_node1_lock'
 info     21    node1/lrm: status change wait_for_agent_lock => active
 info     21    node1/lrm: starting service vm:101

diff --git a/src/test/test-cfs-unavailable2/log.expect b/src/test/test-cfs-unavailable2/log.expect
index f1bbdb0acadb1bf7683fa7f79f847c70f661537d..aeac3e20db441455f0f42531565591cebd6affc4 100644 (file)
--- a/src/test/test-cfs-unavailable2/log.expect
+++ b/src/test/test-cfs-unavailable2/log.expect
@@ -16,6 +16,8 @@ info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:101' on node 'node1'
 info     20    node1/crm: adding new service 'vm:102' on node 'node2'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'vm:101': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     21    node1/lrm: got lock 'ha_agent_node1_lock'
 info     21    node1/lrm: status change wait_for_agent_lock => active
 info     21    node1/lrm: starting service vm:101

diff --git a/src/test/test-crs-static1/log.expect b/src/test/test-crs-static1/log.expect
index 2b06b3c3325421361f89952ca1b158aa4b24fae4..0fc687f12ffe34c92413381a33be17f68cc8e992 100644 (file)
--- a/src/test/test-crs-static1/log.expect
+++ b/src/test/test-crs-static1/log.expect
@@ -15,6 +15,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:102' on node 'node1'
+info     20    node1/crm: service 'vm:102': state changed from 'request_start' to 'started'  (node = node1)
 info     21    node1/lrm: got lock 'ha_agent_node1_lock'
 info     21    node1/lrm: status change wait_for_agent_lock => active
 info     21    node1/lrm: starting service vm:102

diff --git a/src/test/test-crs-static2/log.expect b/src/test/test-crs-static2/log.expect
index ee4416cd5231836aabc4022d2aaa88ac2a033885..ec4395861a7e0cfb1da7dd7f3885faa515252c01 100644 (file)
--- a/src/test/test-crs-static2/log.expect
+++ b/src/test/test-crs-static2/log.expect
@@ -19,6 +19,7 @@ info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node5': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:102' on node 'node1'
+info     20    node1/crm: service 'vm:102': state changed from 'request_start' to 'started'  (node = node1)
 info     21    node1/lrm: got lock 'ha_agent_node1_lock'
 info     21    node1/lrm: status change wait_for_agent_lock => active
 info     21    node1/lrm: starting service vm:102

diff --git a/src/test/test-crs-static3/log.expect b/src/test/test-crs-static3/log.expect
index 00cfefb43bb8e2d8e735945ef07a86c12d8a966d..53be86aa67caff7f176548b9cb9f7df2592e07d7 100644 (file)
--- a/src/test/test-crs-static3/log.expect
+++ b/src/test/test-crs-static3/log.expect
@@ -24,6 +24,15 @@ info     20    node1/crm: adding new service 'vm:106' on node 'node1'
 info     20    node1/crm: adding new service 'vm:107' on node 'node1'
 info     20    node1/crm: adding new service 'vm:108' on node 'node1'
 info     20    node1/crm: adding new service 'vm:109' on node 'node1'
+info     20    node1/crm: service 'vm:101': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'vm:102': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'vm:104': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'vm:105': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'vm:106': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'vm:107': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'vm:108': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'vm:109': state changed from 'request_start' to 'started'  (node = node1)
 info     21    node1/lrm: got lock 'ha_agent_node1_lock'
 info     21    node1/lrm: status change wait_for_agent_lock => active
 info     21    node1/lrm: starting service vm:101

diff --git a/src/test/test-crs-static4/log.expect b/src/test/test-crs-static4/log.expect
index 3eedc23f2ac9b589be9e00ca886925dbcbfe5926..8505da3f3afbff4dfe6d5263d4b76afe927f85a9 100644 (file)
--- a/src/test/test-crs-static4/log.expect
+++ b/src/test/test-crs-static4/log.expect
@@ -24,6 +24,15 @@ info     20    node1/crm: adding new service 'ct:106' on node 'node1'
 info     20    node1/crm: adding new service 'ct:107' on node 'node1'
 info     20    node1/crm: adding new service 'ct:108' on node 'node1'
 info     20    node1/crm: adding new service 'ct:109' on node 'node1'
+info     20    node1/crm: service 'ct:101': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'ct:102': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'ct:103': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'ct:104': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'ct:105': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'ct:106': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'ct:107': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'ct:108': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'ct:109': state changed from 'request_start' to 'started'  (node = node1)
 info     21    node1/lrm: got lock 'ha_agent_node1_lock'
 info     21    node1/lrm: status change wait_for_agent_lock => active
 info     21    node1/lrm: starting service ct:101

diff --git a/src/test/test-crs-static5/log.expect b/src/test/test-crs-static5/log.expect
index cb6b0d560f2139a1451b116b26c18699dd83f663..f8488ecb0ee61a3792aa47fee1bba3187b00fd47 100644 (file)
--- a/src/test/test-crs-static5/log.expect
+++ b/src/test/test-crs-static5/log.expect
@@ -22,6 +22,14 @@ info     20    node1/crm: adding new service 'ct:106' on node 'node1'
 info     20    node1/crm: adding new service 'ct:107' on node 'node1'
 info     20    node1/crm: adding new service 'ct:108' on node 'node1'
 info     20    node1/crm: adding new service 'ct:109' on node 'node1'
+info     20    node1/crm: service 'ct:102': state changed from 'request_start' to 'started'  (node = node2)
+info     20    node1/crm: service 'ct:103': state changed from 'request_start' to 'started'  (node = node3)
+info     20    node1/crm: service 'ct:104': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'ct:105': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'ct:106': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'ct:107': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'ct:108': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'ct:109': state changed from 'request_start' to 'started'  (node = node1)
 info     21    node1/lrm: got lock 'ha_agent_node1_lock'
 info     21    node1/lrm: status change wait_for_agent_lock => active
 info     21    node1/lrm: starting service ct:104

diff --git a/src/test/test-locked-service1/log.expect b/src/test/test-locked-service1/log.expect
index ca8b008b3882de3121eac1f6c5c1755258fc1c38..7846fba3fbeac7f7aff9f6e15306c23a72e97ba7 100644 (file)
--- a/src/test/test-locked-service1/log.expect
+++ b/src/test/test-locked-service1/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     24    node3/crm: status change wait_for_quorum => slave
 info     25    node3/lrm: got lock 'ha_agent_node3_lock'

diff --git a/src/test/test-locked-service2/log.expect b/src/test/test-locked-service2/log.expect
index 6d564ca0cac312b424e1527e466e4804f0d6ce18..35fce8842cc3a8dfb49251c31f54638f382ac43b 100644 (file)
--- a/src/test/test-locked-service2/log.expect
+++ b/src/test/test-locked-service2/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     24    node3/crm: status change wait_for_quorum => slave
 info     25    node3/lrm: got lock 'ha_agent_node3_lock'

diff --git a/src/test/test-lrm-going-idle1/log.expect b/src/test/test-lrm-going-idle1/log.expect
index 1e034b3e463f8bea98b1b844dd9c8fadb57840ca..95c2369a2c6dd3025091ecf52b25be57cf98eae6 100644 (file)
--- a/src/test/test-lrm-going-idle1/log.expect
+++ b/src/test/test-lrm-going-idle1/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     24    node3/crm: status change wait_for_quorum => slave
 info     25    node3/lrm: got lock 'ha_agent_node3_lock'

diff --git a/src/test/test-reboot1/log.expect b/src/test/test-reboot1/log.expect
index d99a752de75f77bde06fd815f110f019cd376ef7..23ca88432b9e4a4e064cd188fa72249a5dab19db 100644 (file)
--- a/src/test/test-reboot1/log.expect
+++ b/src/test/test-reboot1/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     24    node3/crm: status change wait_for_quorum => slave
 info     25    node3/lrm: got lock 'ha_agent_node3_lock'

diff --git a/src/test/test-recovery1/log.expect b/src/test/test-recovery1/log.expect
index bea4c42ba56cb0220db143c70a5fb7afc03c6ed7..ad36e03950234bc4ce681adb0074141efec05e75 100644 (file)
--- a/src/test/test-recovery1/log.expect
+++ b/src/test/test-recovery1/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:102' on node 'node2'
+info     20    node1/crm: service 'vm:102': state changed from 'request_start' to 'started'  (node = node2)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     23    node2/lrm: got lock 'ha_agent_node2_lock'
 info     23    node2/lrm: status change wait_for_agent_lock => active

diff --git a/src/test/test-recovery2/log.expect b/src/test/test-recovery2/log.expect
index e5d153e2170fe8fa182b8d99b2fdc6539fff1a80..2305d9a4afdf3379941ce5194b7ca876b2741211 100644 (file)
--- a/src/test/test-recovery2/log.expect
+++ b/src/test/test-recovery2/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:102' on node 'node2'
+info     20    node1/crm: service 'vm:102': state changed from 'request_start' to 'started'  (node = node2)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     23    node2/lrm: got lock 'ha_agent_node2_lock'
 info     23    node2/lrm: status change wait_for_agent_lock => active

diff --git a/src/test/test-recovery4/log.expect b/src/test/test-recovery4/log.expect
index 2d05ec9b3c640a686a2f9d3c52d1f7cecc1232f9..12983b5fa7ec093ddf5a42f646e0442892309efa 100644 (file)
--- a/src/test/test-recovery4/log.expect
+++ b/src/test/test-recovery4/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:102' on node 'node2'
+info     20    node1/crm: service 'vm:102': state changed from 'request_start' to 'started'  (node = node2)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     23    node2/lrm: got lock 'ha_agent_node2_lock'
 info     23    node2/lrm: status change wait_for_agent_lock => active

diff --git a/src/test/test-resource-failure3/log.expect b/src/test/test-resource-failure3/log.expect
index 857c0948a27988750227db4fffd66a74929010ff..bb5f77c6f2f5cb22b553649bbc3fffa3942f769e 100644 (file)
--- a/src/test/test-resource-failure3/log.expect
+++ b/src/test/test-resource-failure3/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'fa:101' on node 'node2'
+info     20    node1/crm: service 'fa:101': state changed from 'request_start' to 'started'  (node = node2)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     23    node2/lrm: got lock 'ha_agent_node2_lock'
 info     23    node2/lrm: status change wait_for_agent_lock => active

diff --git a/src/test/test-resource-failure4/log.expect b/src/test/test-resource-failure4/log.expect
index 77c23677a8c700d76563f9044dd6f19be7d8ed61..e9d5f2a7e01b843160d0af5323a154b74b6e5c34 100644 (file)
--- a/src/test/test-resource-failure4/log.expect
+++ b/src/test/test-resource-failure4/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'fa:1001' on node 'node3'
+info     20    node1/crm: service 'fa:1001': state changed from 'request_start' to 'started'  (node = node3)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     24    node3/crm: status change wait_for_quorum => slave
 info     25    node3/lrm: got lock 'ha_agent_node3_lock'

diff --git a/src/test/test-restart-lrm/log.expect b/src/test/test-restart-lrm/log.expect
index 198aef9b79913a13c335212824f15776dd2e88d1..dafc652da6ab7d65c0a02a19fc1537d6296bdcd4 100644 (file)
--- a/src/test/test-restart-lrm/log.expect
+++ b/src/test/test-restart-lrm/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     24    node3/crm: status change wait_for_quorum => slave
 info     25    node3/lrm: got lock 'ha_agent_node3_lock'

diff --git a/src/test/test-service-command1/log.expect b/src/test/test-service-command1/log.expect
index bfd18d686061d7a97f93bcdb97243b78ecec2d4d..1e276d33cf7316f8c483346058fe5bce9819696e 100644 (file)
--- a/src/test/test-service-command1/log.expect
+++ b/src/test/test-service-command1/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     24    node3/crm: status change wait_for_quorum => slave
 info     25    node3/lrm: got lock 'ha_agent_node3_lock'

diff --git a/src/test/test-service-command2/log.expect b/src/test/test-service-command2/log.expect
index 4ebe556bb988534a811d85ac1ff2337b4fa36f7b..daf3e445c81f25b44625e7b71364a0426ad84412 100644 (file)
--- a/src/test/test-service-command2/log.expect
+++ b/src/test/test-service-command2/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     24    node3/crm: status change wait_for_quorum => slave
 info     25    node3/lrm: got lock 'ha_agent_node3_lock'

diff --git a/src/test/test-service-command3/log.expect b/src/test/test-service-command3/log.expect
index a9d8615eed5c9c84a4534fc4e20c9d975b919c2e..b9c55d0fb2cecc0cbf91b3364d08c35eb5c0569a 100644 (file)
--- a/src/test/test-service-command3/log.expect
+++ b/src/test/test-service-command3/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     24    node3/crm: status change wait_for_quorum => slave
 info     25    node3/lrm: got lock 'ha_agent_node3_lock'

diff --git a/src/test/test-service-command4/log.expect b/src/test/test-service-command4/log.expect
index e5a29276c6c221e0592032c2b67463673b4c87bf..31b2f6c814645ae5c1a8e3ed5645c890595f28a5 100644 (file)
--- a/src/test/test-service-command4/log.expect
+++ b/src/test/test-service-command4/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     24    node3/crm: status change wait_for_quorum => slave
 info     25    node3/lrm: got lock 'ha_agent_node3_lock'

diff --git a/src/test/test-service-command5/log.expect b/src/test/test-service-command5/log.expect
index 32506f11b14608e672238a2440ba52a08489abf4..2419d68ff6fde7dd2bcb9fcf87ea96db1e84d2b9 100644 (file)
--- a/src/test/test-service-command5/log.expect
+++ b/src/test/test-service-command5/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     24    node3/crm: status change wait_for_quorum => slave
 info     25    node3/lrm: got lock 'ha_agent_node3_lock'

diff --git a/src/test/test-service-command6/log.expect b/src/test/test-service-command6/log.expect
index 3ce489592c5e53c21dde4e58adecf80a02486388..f8aee6201f52a5fc695d7237ecc7397ae74c1283 100644 (file)
--- a/src/test/test-service-command6/log.expect
+++ b/src/test/test-service-command6/log.expect
@@ -15,6 +15,7 @@ info    120    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info    120    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info    120    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info    120    node1/crm: adding new service 'vm:103' on node 'node1'
+info    120    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node1)
 info    121    node1/lrm: got lock 'ha_agent_node1_lock'
 info    121    node1/lrm: status change wait_for_agent_lock => active
 info    121    node1/lrm: starting service vm:103

diff --git a/src/test/test-service-ignore1/log.expect b/src/test/test-service-ignore1/log.expect
index 1b9830359b4bfeae940e19962e5897ac39907167..94c3fa0b4bb0b417ced6e4408814392b72e6ff0d 100644 (file)
--- a/src/test/test-service-ignore1/log.expect
+++ b/src/test/test-service-ignore1/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     24    node3/crm: status change wait_for_quorum => slave
 info     25    node3/lrm: got lock 'ha_agent_node3_lock'

diff --git a/src/test/test-service-ignore2/log.expect b/src/test/test-service-ignore2/log.expect
index b6f3eef2f9a05301ea357fa3cbb59b9543770096..384798c895ddb12f88bfdc6a85bc02338f02abbd 100644 (file)
--- a/src/test/test-service-ignore2/log.expect
+++ b/src/test/test-service-ignore2/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     24    node3/crm: status change wait_for_quorum => slave
 info     25    node3/lrm: got lock 'ha_agent_node3_lock'
@@ -32,6 +33,7 @@ info    266    node3/lrm: killed by poweroff
 info    266     hardware: server 'node3' stopped by poweroff (watchdog)
 info    320      cmdlist: execute service vm:103 started
 info    320    node1/crm: adding new service 'vm:103' on node 'node3'
+info    320    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info    320    node1/crm: service 'vm:103': state changed from 'started' to 'fence'
 info    320    node1/crm: node 'node3': state changed from 'unknown' => 'fence'
 emai    320    node1/crm: FENCE: Try to fence node 'node3'

diff --git a/src/test/test-shutdown-policy-migrate-fail1/log.expect b/src/test/test-shutdown-policy-migrate-fail1/log.expect
index 73b89548f9effc64ba0198f03a7a61f05d71cb7f..84c05701a0d6ae7e023545d2cb0e69779bc21988 100644 (file)
--- a/src/test/test-shutdown-policy-migrate-fail1/log.expect
+++ b/src/test/test-shutdown-policy-migrate-fail1/log.expect
@@ -15,6 +15,8 @@ info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'fa:109' on node 'node3'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'fa:109': state changed from 'request_start' to 'started'  (node = node3)
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     24    node3/crm: status change wait_for_quorum => slave
 info     25    node3/lrm: got lock 'ha_agent_node3_lock'

diff --git a/src/test/test-shutdown-policy1/log.expect b/src/test/test-shutdown-policy1/log.expect
index b80799df67751804b4c6a7af393fc0dcf95d6295..f797a0cacb40ce2644b38e1950fcc4ac8bb91219 100644 (file)
--- a/src/test/test-shutdown-policy1/log.expect
+++ b/src/test/test-shutdown-policy1/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     24    node3/crm: status change wait_for_quorum => slave
 info     25    node3/lrm: got lock 'ha_agent_node3_lock'

diff --git a/src/test/test-shutdown-policy2/log.expect b/src/test/test-shutdown-policy2/log.expect
index 6e8c1722664ff42de2ab4ca57126177ffc14c300..80a42adfb9b2b4c37109cd1777bc96e872ec4ac5 100644 (file)
--- a/src/test/test-shutdown-policy2/log.expect
+++ b/src/test/test-shutdown-policy2/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     24    node3/crm: status change wait_for_quorum => slave
 info     25    node3/lrm: got lock 'ha_agent_node3_lock'

diff --git a/src/test/test-shutdown-policy3/log.expect b/src/test/test-shutdown-policy3/log.expect
index ca68ee1e80019dc2362db5d9b5ccd50c497e55aa..bacf7c79e19107b3d31a396305638f06d3ccf999 100644 (file)
--- a/src/test/test-shutdown-policy3/log.expect
+++ b/src/test/test-shutdown-policy3/log.expect
@@ -15,6 +15,8 @@ info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'ct:102' on node 'node3'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'ct:102': state changed from 'request_start' to 'started'  (node = node3)
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     24    node3/crm: status change wait_for_quorum => slave
 info     25    node3/lrm: got lock 'ha_agent_node3_lock'

diff --git a/src/test/test-shutdown-policy4/log.expect b/src/test/test-shutdown-policy4/log.expect
index 021306375fdcaac026d3992f7b93a93def8c8645..cb3e3512387e12cf8124f259e86044a09ecde984 100644 (file)
--- a/src/test/test-shutdown-policy4/log.expect
+++ b/src/test/test-shutdown-policy4/log.expect
@@ -16,6 +16,8 @@ info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'ct:102' on node 'node3'
 info     20    node1/crm: adding new service 'ct:105' on node 'node3'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'ct:102': state changed from 'request_start' to 'started'  (node = node3)
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     24    node3/crm: status change wait_for_quorum => slave
 info     25    node3/lrm: got lock 'ha_agent_node3_lock'

diff --git a/src/test/test-shutdown-policy5/log.expect b/src/test/test-shutdown-policy5/log.expect
index 7f6640cc3427a0b034adc48ca55eccbb39a602b9..92c68c09df22d04ce46398859967f32b1ebaec42 100644 (file)
--- a/src/test/test-shutdown-policy5/log.expect
+++ b/src/test/test-shutdown-policy5/log.expect
@@ -15,6 +15,8 @@ info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'ct:102' on node 'node1'
 info     20    node1/crm: adding new service 'vm:103' on node 'node1'
+info     20    node1/crm: service 'ct:102': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node1)
 info     21    node1/lrm: got lock 'ha_agent_node1_lock'
 info     21    node1/lrm: status change wait_for_agent_lock => active
 info     21    node1/lrm: starting service ct:102

diff --git a/src/test/test-shutdown-policy6/log.expect b/src/test/test-shutdown-policy6/log.expect
index 1f13552cb829276fa6d17d04e8f9853e4d17ac96..a3604f7bf78396ffed3c4b9951bc4d7160f06404 100644 (file)
--- a/src/test/test-shutdown-policy6/log.expect
+++ b/src/test/test-shutdown-policy6/log.expect
@@ -17,6 +17,10 @@ info     20    node1/crm: adding new service 'vm:103' on node 'node3'
 info     20    node1/crm: adding new service 'vm:104' on node 'node3'
 info     20    node1/crm: adding new service 'vm:105' on node 'node3'
 info     20    node1/crm: adding new service 'vm:106' on node 'node3'
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
+info     20    node1/crm: service 'vm:104': state changed from 'request_start' to 'started'  (node = node3)
+info     20    node1/crm: service 'vm:105': state changed from 'request_start' to 'started'  (node = node3)
+info     20    node1/crm: service 'vm:106': state changed from 'request_start' to 'started'  (node = node3)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     24    node3/crm: status change wait_for_quorum => slave
 info     25    node3/lrm: got lock 'ha_agent_node3_lock'

diff --git a/src/test/test-shutdown1/log.expect b/src/test/test-shutdown1/log.expect
index 6b5d896ff3f3872db83f87aafdf5b0a02adf2e68..1cd4b8916daab117de17e3330c374d0e59ceee70 100644 (file)
--- a/src/test/test-shutdown1/log.expect
+++ b/src/test/test-shutdown1/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     24    node3/crm: status change wait_for_quorum => slave
 info     25    node3/lrm: got lock 'ha_agent_node3_lock'

diff --git a/src/test/test-shutdown2/log.expect b/src/test/test-shutdown2/log.expect
index cb0adb6418392d5eac5423a32f2d55b1f48e3486..3d43b0d4d489a77db6043acf99a0452ace9ee808 100644 (file)
--- a/src/test/test-shutdown2/log.expect
+++ b/src/test/test-shutdown2/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     24    node3/crm: status change wait_for_quorum => slave
 info     25    node3/lrm: got lock 'ha_agent_node3_lock'

diff --git a/src/test/test-shutdown3/log.expect b/src/test/test-shutdown3/log.expect
index 61699cd01b145d0d9b623736f72698fa5545378f..ec53e7b25156834b97f50eb2b3bd82368896cbef 100644 (file)
--- a/src/test/test-shutdown3/log.expect
+++ b/src/test/test-shutdown3/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'ct:103' on node 'node3'
+info     20    node1/crm: service 'ct:103': state changed from 'request_start' to 'started'  (node = node3)
 info     22    node2/crm: status change wait_for_quorum => slave
 info     24    node3/crm: status change wait_for_quorum => slave
 info     25    node3/lrm: got lock 'ha_agent_node3_lock'

diff --git a/src/test/test-shutdown4/log.expect b/src/test/test-shutdown4/log.expect
index 4aaadfb607ccdf86b565cb6e38a050828dc17676..4884673912d51b150166b8a8c0f3a9984452b70a 100644 (file)
--- a/src/test/test-shutdown4/log.expect
+++ b/src/test/test-shutdown4/log.expect
@@ -14,6 +14,7 @@ info     20    node1/crm: node 'node1': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node2': state changed from 'unknown' => 'online'
 info     20    node1/crm: node 'node3': state changed from 'unknown' => 'online'
 info     20    node1/crm: adding new service 'vm:100' on node 'node1'
+info     20    node1/crm: service 'vm:100': state changed from 'request_start' to 'started'  (node = node1)
 info     21    node1/lrm: got lock 'ha_agent_node1_lock'
 info     21    node1/lrm: status change wait_for_agent_lock => active
 info     21    node1/lrm: starting service vm:100

diff --git a/src/test/test-stop-command1/log.expect b/src/test/test-stop-command1/log.expect
index a79204c921c22c340cc4e42c71ec3eb24c311449..c0ee4897636458cdb9aaaf085cdf5ba5e4c2085d 100644 (file)
--- a/src/test/test-stop-command1/log.expect
+++ b/src/test/test-stop-command1/log.expect
@@ -17,6 +17,10 @@ info     20    node1/crm: adding new service 'fa:1001' on node 'node3'
 info     20    node1/crm: adding new service 'vm:101' on node 'node1'
 info     20    node1/crm: adding new service 'vm:102' on node 'node2'
 info     20    node1/crm: adding new service 'vm:103' on node 'node3'
+info     20    node1/crm: service 'fa:1001': state changed from 'request_start' to 'started'  (node = node3)
+info     20    node1/crm: service 'vm:101': state changed from 'request_start' to 'started'  (node = node1)
+info     20    node1/crm: service 'vm:102': state changed from 'request_start' to 'started'  (node = node2)
+info     20    node1/crm: service 'vm:103': state changed from 'request_start' to 'started'  (node = node3)
 info     21    node1/lrm: got lock 'ha_agent_node1_lock'
 info     21    node1/lrm: status change wait_for_agent_lock => active
 info     21    node1/lrm: starting service vm:101