test/sim: also log delay commands

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

diff --git a/src/PVE/HA/Sim/TestHardware.pm b/src/PVE/HA/Sim/TestHardware.pm
index b4123387554f9aa97ca4280fbddc29a680754201..6b2968f7b172d5f78e27bfe090f4f271635ca739 100644 (file)
--- a/src/PVE/HA/Sim/TestHardware.pm
+++ b/src/PVE/HA/Sim/TestHardware.pm
@@ -224,6 +224,7 @@ sub run {
                $last_command_time = $self->{cur_time};
 
                if ($cmd =~ m/^delay\s+(\d+)\s*$/) {
+                   $self->log('info', "execute $cmd", 'cmdlist');
                    $next_cmd_at = $self->{cur_time} + $1;
                } else {
                    $self->sim_hardware_cmd($cmd, 'cmdlist');

diff --git a/src/test/test-basic5/log.expect b/src/test/test-basic5/log.expect
index 4af7447e2173b7e26fb34b4fb5a575292d23f505..d7c1b75445056d4d28ad430ccc8ba14e1abef1b6 100644 (file)
--- a/src/test/test-basic5/log.expect
+++ b/src/test/test-basic5/log.expect
@@ -38,6 +38,7 @@ info    162     watchdog: execute power node1 off
 info    161    node1/crm: killed by poweroff
 info    162    node1/lrm: killed by poweroff
 info    162     hardware: server 'node1' stopped by poweroff (watchdog)
+info    220      cmdlist: execute delay 200
 info    222    node3/crm: got lock 'ha_manager_lock'
 info    222    node3/crm: status change slave => master
 info    222    node3/crm: node 'node1': state changed from 'online' => 'unknown'

diff --git a/src/test/test-lrm-going-idle1/log.expect b/src/test/test-lrm-going-idle1/log.expect
index 2dce3e9376fd8e860bfa2d6cb66954a2f328f6ef..1e034b3e463f8bea98b1b844dd9c8fadb57840ca 100644 (file)
--- a/src/test/test-lrm-going-idle1/log.expect
+++ b/src/test/test-lrm-going-idle1/log.expect
@@ -24,6 +24,13 @@ info    120      cmdlist: execute service vm:103 delete
 info    120    node1/crm: removing stale service 'vm:103' (no config)
 info    122    node2/crm: status change slave => wait_for_quorum
 info    124    node3/crm: status change slave => wait_for_quorum
+info    220      cmdlist: execute delay 0
+info    320      cmdlist: execute delay 0
+info    420      cmdlist: execute delay 0
+info    520      cmdlist: execute delay 0
+info    620      cmdlist: execute delay 0
+info    720      cmdlist: execute delay 0
+info    820      cmdlist: execute delay 0
 info   1325    node3/lrm: node had no service configured for 60 rounds, going idle.
 info   1325    node3/lrm: status change active => wait_for_agent_lock
 info   1420     hardware: exit simulation - done

diff --git a/src/test/test-recovery2/log.expect b/src/test/test-recovery2/log.expect
index 31a964795d03eabf3476c273ce7616c5af0c471d..e5d153e2170fe8fa182b8d99b2fdc6539fff1a80 100644 (file)
--- a/src/test/test-recovery2/log.expect
+++ b/src/test/test-recovery2/log.expect
@@ -31,6 +31,7 @@ info    164     watchdog: execute power node2 off
 info    163    node2/crm: killed by poweroff
 info    164    node2/lrm: killed by poweroff
 info    164     hardware: server 'node2' stopped by poweroff (watchdog)
+info    220      cmdlist: execute delay 0
 info    240    node1/crm: got lock 'ha_agent_node2_lock'
 info    240    node1/crm: fencing: acknowledged - got agent lock for node 'node2'
 info    240    node1/crm: node 'node2': state changed from 'fence' => 'unknown'
@@ -40,46 +41,55 @@ err     240    node1/crm: recovering service 'vm:102' from fenced node 'node2' f
 err     260    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     280    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     300    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
+info    320      cmdlist: execute delay 0
 err     320    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     340    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     360    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     380    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     400    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
+info    420      cmdlist: execute delay 0
 err     420    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     440    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     460    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     480    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     500    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
+info    520      cmdlist: execute delay 0
 err     520    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     540    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     560    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     580    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     600    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
+info    620      cmdlist: execute delay 0
 err     620    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     640    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     660    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     680    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     700    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
+info    720      cmdlist: execute delay 0
 err     720    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     740    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     760    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     780    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     800    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
+info    820      cmdlist: execute delay 0
 err     820    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     840    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     860    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     880    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     900    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
+info    920      cmdlist: execute delay 0
 err     920    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     940    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     960    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err     980    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err    1000    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
+info   1020      cmdlist: execute delay 0
 err    1020    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err    1040    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err    1060    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err    1080    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err    1100    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
+info   1120      cmdlist: execute delay 0
 err    1120    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err    1140    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found
 err    1160    node1/crm: recovering service 'vm:102' from fenced node 'node2' failed, no recovery node found

diff --git a/src/test/test-recovery3/log.expect b/src/test/test-recovery3/log.expect
index 9b484096bf60a723cdb8b5932330d672481a3d79..d424f087429304d731b5b8a51f6b8bbb940cdae3 100644 (file)
--- a/src/test/test-recovery3/log.expect
+++ b/src/test/test-recovery3/log.expect
@@ -11,4 +11,5 @@ info     21    node2/lrm: got lock 'ha_agent_node2_lock'
 info     21    node2/lrm: status change wait_for_agent_lock => active
 info     21    node2/lrm: starting service vm:102
 info     21    node2/lrm: service status vm:102 started
+info    120      cmdlist: execute delay 0
 info    720     hardware: exit simulation - done

diff --git a/src/test/test-recovery4/log.expect b/src/test/test-recovery4/log.expect
index 6380c8e471b16b6a35d138338aa0f436fd0a2be1..2d05ec9b3c640a686a2f9d3c52d1f7cecc1232f9 100644 (file)
--- a/src/test/test-recovery4/log.expect
+++ b/src/test/test-recovery4/log.expect
@@ -31,6 +31,7 @@ info    164     watchdog: execute power node2 off
 info    163    node2/crm: killed by poweroff
 info    164    node2/lrm: killed by poweroff
 info    164     hardware: server 'node2' stopped by poweroff (watchdog)
+info    220      cmdlist: execute delay 0
 info    240    node1/crm: got lock 'ha_agent_node2_lock'
 info    240    node1/crm: fencing: acknowledged - got agent lock for node 'node2'
 info    240    node1/crm: node 'node2': state changed from 'fence' => 'unknown'

diff --git a/src/test/test-shutdown2/log.expect b/src/test/test-shutdown2/log.expect
index 9ef2c8dd7345e9109c84980d9f2b0b3cbb8435f7..cb0adb6418392d5eac5423a32f2d55b1f48e3486 100644 (file)
--- a/src/test/test-shutdown2/log.expect
+++ b/src/test/test-shutdown2/log.expect
@@ -45,6 +45,7 @@ info    201    node1/lrm: got lock 'ha_agent_node1_lock'
 info    201    node1/lrm: status change wait_for_agent_lock => active
 info    201    node1/lrm: starting service vm:103
 info    201    node1/lrm: service status vm:103 started
+info    220      cmdlist: execute delay 200
 info    500      cmdlist: execute power node3 on
 info    500    node3/crm: status change startup => wait_for_quorum
 info    500    node3/lrm: status change startup => wait_for_agent_lock

diff --git a/src/test/test-shutdown3/log.expect b/src/test/test-shutdown3/log.expect
index 85a63b4cc73843762c544ab7feae48d01b51dfcb..61699cd01b145d0d9b623736f72698fa5545378f 100644 (file)
--- a/src/test/test-shutdown3/log.expect
+++ b/src/test/test-shutdown3/log.expect
@@ -45,6 +45,7 @@ info    201    node1/lrm: got lock 'ha_agent_node1_lock'
 info    201    node1/lrm: status change wait_for_agent_lock => active
 info    201    node1/lrm: starting service ct:103
 info    201    node1/lrm: service status ct:103 started
+info    220      cmdlist: execute delay 200
 info    500      cmdlist: execute power node3 on
 info    500    node3/crm: status change startup => wait_for_quorum
 info    500    node3/lrm: status change startup => wait_for_agent_lock