[PATCH qemu-server v4 2/3] qm cleanup: die early when encountering a running stop mode backup

[Dominik Csapak <d.csapak@proxmox.com>]

this is an expected situation, so abort here early with a better message
than 'vm still running'

Reviewed-by: Fiona Ebner <f.ebner@proxmox.com>
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
changes from v3:
* style improvement

 src/PVE/CLI/qm.pm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/PVE/CLI/qm.pm b/src/PVE/CLI/qm.pm
index 81ccc564..3c9e8812 100755
--- a/src/PVE/CLI/qm.pm
+++ b/src/PVE/CLI/qm.pm
@@ -1102,7 +1102,16 @@ __PACKAGE__->register_method({
             sub {
                 my $conf = PVE::QemuConfig->load_config($vmid);
                 my $pid = PVE::QemuServer::check_running($vmid);
-                die "vm still running\n" if $pid;
+
+                if ($pid) {
+                    # With a stop mode backup, we might run here into a running vm with a backup
+                    # lock, but this already did the cleanup and is an expected state, so abort
+                    # here with a good message
+                    die "skipping cleanup - 'backup' lock is present and vm is running again\n"
+                        if $clean && $conf->{lock} && $conf->{lock} eq 'backup';
+
+                    die "vm still running\n";
+                }
 
                 # Rollback already does cleanup when preparing and afterwards temporarily drops the
                 # lock on the configuration file to rollback the volumes. Deactivating volumes here
-- 
2.47.3