remove 'running' from migrate/relocate log message

As relocate is never 'running' and migrate is only 'running
if the resource is a VM this could only generate confusion,
better use an neutral message.

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

diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm
index b0788e77988cad668545d06203c6dd570f9ad3ba..48826e77a5cfcc5abda3a1a4e4b23b13231502b1 100644 (file)
--- a/src/PVE/HA/Manager.pm
+++ b/src/PVE/HA/Manager.pm
@@ -546,7 +546,7 @@ sub next_state_started {
                } elsif ($sd->{node} eq $target) {
                    $haenv->log('info', "ignore service '$sid' $cmd request - service already on node '$target'");
                } else {
-                   $haenv->log('info', "$cmd service '$sid' to node '$target' (running)");
+                   $haenv->log('info', "$cmd service '$sid' to node '$target'");
                    &$change_service_state($self, $sid, $cmd, node => $sd->{node}, target => $target);
                }
            } else {

diff --git a/src/test/test-service-command2/log.expect b/src/test/test-service-command2/log.expect
index 397cceea4153bcb17ce0a6dd3f19b8bafbfeb444..4ebe556bb988534a811d85ac1ff2337b4fa36f7b 100644 (file)
--- a/src/test/test-service-command2/log.expect
+++ b/src/test/test-service-command2/log.expect
@@ -22,7 +22,7 @@ info     25    node3/lrm: starting service vm:103
 info     25    node3/lrm: service status vm:103 started
 info    120      cmdlist: execute service vm:103 migrate node1
 info    120    node1/crm: got crm command: migrate vm:103 node1
-info    120    node1/crm: migrate service 'vm:103' to node 'node1' (running)
+info    120    node1/crm: migrate service 'vm:103' to node 'node1'
 info    120    node1/crm: service 'vm:103': state changed from 'started' to 'migrate'  (node = node3, target = 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'

diff --git a/src/test/test-service-command3/log.expect b/src/test/test-service-command3/log.expect
index 2edcd5d160ee971fe1c6aa3eee110b41d3e7cb4f..a9d8615eed5c9c84a4534fc4e20c9d975b919c2e 100644 (file)
--- a/src/test/test-service-command3/log.expect
+++ b/src/test/test-service-command3/log.expect
@@ -22,7 +22,7 @@ info     25    node3/lrm: starting service vm:103
 info     25    node3/lrm: service status vm:103 started
 info    120      cmdlist: execute service vm:103 migrate node1
 info    120    node1/crm: got crm command: migrate vm:103 node1
-info    120    node1/crm: migrate service 'vm:103' to node 'node1' (running)
+info    120    node1/crm: migrate service 'vm:103' to node 'node1'
 info    120    node1/crm: service 'vm:103': state changed from 'started' to 'migrate'  (node = node3, target = 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'
@@ -33,7 +33,7 @@ info    141    node1/lrm: starting service vm:103
 info    141    node1/lrm: service status vm:103 started
 info    220      cmdlist: execute service vm:103 migrate node3
 info    220    node1/crm: got crm command: migrate vm:103 node3
-info    220    node1/crm: migrate service 'vm:103' to node 'node3' (running)
+info    220    node1/crm: migrate service 'vm:103' to node 'node3'
 info    220    node1/crm: service 'vm:103': state changed from 'started' to 'migrate'  (node = node1, target = node3)
 info    221    node1/lrm: service vm:103 - start migrate to node 'node3'
 info    221    node1/lrm: service vm:103 - end migrate to node 'node3'

diff --git a/src/test/test-service-command4/log.expect b/src/test/test-service-command4/log.expect
index 01a6380a5f2d86b0ad8189911f57345ede01df23..e5a29276c6c221e0592032c2b67463673b4c87bf 100644 (file)
--- a/src/test/test-service-command4/log.expect
+++ b/src/test/test-service-command4/log.expect
@@ -22,7 +22,7 @@ info     25    node3/lrm: starting service vm:103
 info     25    node3/lrm: service status vm:103 started
 info    120      cmdlist: execute service vm:103 relocate node1
 info    120    node1/crm: got crm command: relocate vm:103 node1
-info    120    node1/crm: relocate service 'vm:103' to node 'node1' (running)
+info    120    node1/crm: relocate service 'vm:103' to node 'node1'
 info    120    node1/crm: service 'vm:103': state changed from 'started' to 'relocate'  (node = node3, target = node1)
 info    125    node3/lrm: service vm:103 - start relocate to node 'node1'
 info    125    node3/lrm: stopping service vm:103 (relocate)