xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 17:46:38 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1072 from daniceexi/fix_vol_del_fail

Browse Source 
issue 455: do retry when delete a volume for kvm vm
This commit is contained in:
Xiaopeng Wang 2016-05-09 11:24:23 +08:00
commit 5a9eaca587
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
xCAT-server/lib/xcat/plugins/kvm.pm
View File

@ -1751,11 +1751,25 @@ sub rmvm {
my $disktype = $disk->parentNode()->getAttribute("device");
if ($disktype eq "cdrom") { next; }
my $file = $disk->getAttribute("file");
my $vol = $hypconn->get_storage_volume_by_path($file);
if ($vol) {
# Need to call get_info() before deleting a volume, without that, delete() will fail. Issue #455
$vol->get_info();
$vol->delete();
# try to check the existence first, if cannot find, do nothing.
# we do retry because we found sometimes the delete might fail
my $retry = 0;
my $vol;
while ($retry < 10) {
eval { $vol = $hypconn->get_storage_volume_by_path($file); };
if ($@) {
# Cannot find volumn, then stop delete
xCAT::MsgUtils->trace(0, "e", "kvm: $@") if ($retry == 0);
last;
}
if ($vol) {
eval { $vol->delete(); };
if ($@) {
xCAT::MsgUtils->trace(0, "e", "kvm: $@");
}
}
$retry++;
}
}
}