proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-05-03 03:38:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

api: snapshot delete: prefix lock-fail error

Browse Source 
otherwise users might get confused if they just get a message about a
migrate lock not being available..

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2022-03-15 13:28:27 +01:00
parent fdbbed2fac
commit 1770b70fdf
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/API2/Qemu.pm
View File

@ -4580,7 +4580,9 @@ __PACKAGE__->register_method({
my $snapname = extract_param($param, 'snapname'); my $snapname = extract_param($param, 'snapname');
my $lock_obtained;
my $do_delete = sub { my $do_delete = sub {
$lock_obtained = 1;
PVE::Cluster::log_msg('info', $authuser, "delete snapshot VM $vmid: $snapname"); PVE::Cluster::log_msg('info', $authuser, "delete snapshot VM $vmid: $snapname");
PVE::QemuConfig->snapshot_delete($vmid, $snapname, $param->{force}); PVE::QemuConfig->snapshot_delete($vmid, $snapname, $param->{force});
}; };
@ -4589,7 +4591,11 @@ __PACKAGE__->register_method({
if ($param->{force}) { if ($param->{force}) {
$do_delete->(); $do_delete->();
} else { } else {
PVE::GuestHelpers::guest_migration_lock($vmid, 10, $do_delete); eval { PVE::GuestHelpers::guest_migration_lock($vmid, 10, $do_delete); };
if (my $err = $@) {
die $err if $lock_obtained;
die "Failed to obtain guest migration lock - replication running?\n";
}
} }
}; };