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

Merge pull request #2631 from gurevichmark/rmvm_purge_msg

Browse Source 
Handle purging block or raw VM disks when removing a VM
This commit is contained in:
zet809 2017-03-15 10:28:44 +08:00 committed by GitHub
commit c194f5a2ac
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1775,7 +1775,20 @@ sub rmvm {
foreach $disk (@purgedisks) {
my $disktype = $disk->parentNode()->getAttribute("device");
if ($disktype eq "cdrom") { next; }
my @driver = $disk->parentNode()->findnodes("driver");
unless ($driver[0]) { next; }
my $drivertype = $driver[0]->getAttribute("type");
if (($drivertype eq "raw") || ($disktype eq "block")) {
#For raw or block devices, do not remove, even if purge was specified. Log info message.
xCAT::MsgUtils->trace(0, "i", "Not purging raw or block storage device: $disk");
next;
}
my $file = $disk->getAttribute("file");
unless ($file) {
xCAT::MsgUtils->trace(0, "w", "Not able to find 'file' attribute value for: $disk");
next;
}
# try to check the existence first, if cannot find, do nothing.
# we do retry because we found sometimes the delete might fail