[PATCH ha-manager 7/7] fix #7230: resources: let shutdown api handle timeout fallback value

[Daniel Kral <d.kral@proxmox.com>]

PVE::API2::LXC::Status::vm_shutdown() and PVE::API2::Qemu::vm_shutdown()
already fallback to either the configured shutdown timeout or the
default value of 60 seconds. Therefore, let the API handlers decide what
the timeout value should be set to.

This does only partially fix #7230 as HA resources are still
force-stopped as the shutdown timeout runs out.

Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
 src/PVE/HA/Resources/PVECT.pm | 10 +++++-----
 src/PVE/HA/Resources/PVEVM.pm | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/PVE/HA/Resources/PVECT.pm b/src/PVE/HA/Resources/PVECT.pm
index 177b9070..ead66e0e 100644
--- a/src/PVE/HA/Resources/PVECT.pm
+++ b/src/PVE/HA/Resources/PVECT.pm
@@ -87,7 +87,6 @@ sub shutdown {
     my ($class, $haenv, $id, $timeout) = @_;
 
     my $nodename = $haenv->nodename();
-    my $shutdown_timeout = $timeout // 60;
 
     my $upid;
     my $params = {
@@ -95,11 +94,12 @@ sub shutdown {
         vmid => $id,
     };
 
-    if ($shutdown_timeout) {
-        $params->{timeout} = $shutdown_timeout;
-        $upid = PVE::API2::LXC::Status->vm_shutdown($params);
-    } else {
+    # stop the CT immediately if $timeout is set to exactly 0
+    if (defined($timeout) && $timeout == 0) {
         $upid = PVE::API2::LXC::Status->vm_stop($params);
+    } else {
+        $params->{timeout} = $timeout;
+        $upid = PVE::API2::LXC::Status->vm_shutdown($params);
     }
 
     PVE::HA::Tools::upid_wait($upid, $haenv);
diff --git a/src/PVE/HA/Resources/PVEVM.pm b/src/PVE/HA/Resources/PVEVM.pm
index 87532716..d89a0bce 100644
--- a/src/PVE/HA/Resources/PVEVM.pm
+++ b/src/PVE/HA/Resources/PVEVM.pm
@@ -87,7 +87,6 @@ sub shutdown {
     my ($class, $haenv, $id, $timeout) = @_;
 
     my $nodename = $haenv->nodename();
-    my $shutdown_timeout = $timeout // 60;
 
     my $upid;
     my $params = {
@@ -95,12 +94,13 @@ sub shutdown {
         vmid => $id,
     };
 
-    if ($shutdown_timeout) {
-        $params->{timeout} = $shutdown_timeout;
+    # stop the VM immediately if $timeout is set to exactly 0
+    if (defined($timeout) && $timeout == 0) {
+        $upid = PVE::API2::Qemu->vm_stop($params);
+    } else {
+        $params->{timeout} = $timeout;
         $params->{forceStop} = 1;
         $upid = PVE::API2::Qemu->vm_shutdown($params);
-    } else {
-        $upid = PVE::API2::Qemu->vm_stop($params);
     }
 
     PVE::HA::Tools::upid_wait($upid, $haenv);
-- 
2.47.3