[pve-devel] [PATCH] die if vdisk_free fail on delete_drive

Alexandre Derumier aderumier at odiso.com
Tue May 29 07:56:16 CEST 2012


 replace the warn by a die.

 Currently, if we vdisk_free a disk and something goes wrong (network
 storage problem by example), the drive is removed from config and we
 cannot retry to remove it later.

Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
 PVE/API2/Qemu.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 3895b18..fb4b280 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -599,7 +599,7 @@ my $delete_drive = sub {
 	if (&$vm_is_volid_owner($storecfg, $vmid, $volid)) {
 	    if ($force || $key =~ m/^unused/) {
 		eval { PVE::Storage::vdisk_free($storecfg, $volid); };
-		warn $@ if $@;
+		die $@ if $@;
 	    } else {
 		PVE::QemuServer::add_unused_volume($conf, $volid, $vmid);
 	    }
-- 
1.7.2.5



More information about the pve-devel mailing list