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

Display VM disk purge message instead of just logging it

Browse Source
This commit is contained in:
Mark Gurevich 2020-01-15 11:10:03 -05:00
parent d3511b2b0a
commit 2d07085122
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/source/guides/admin-guides/references/man1/rmvm.1.rst
View File

@ -45,7 +45,7 @@ DESCRIPTION
***********
The rmvm command removes the partitions specified in noderange. If noderange is an CEC, all the partitions associated with that CEC will be removed. Note that removed partitions are automatically removed from the xCAT database. For IVM-managed systems, care must be taken to not remove the VIOS partition, or all the associated partitions will be removed as well.
The \ **rmvm**\ command removes the partitions specified in \ *noderange*\ . If \ *noderange*\ is an CEC, all the partitions associated with that CEC will be removed. Note that removed partitions are automatically removed from the xCAT database. For IVM-managed systems, care must be taken to not remove the VIOS partition, or all the associated partitions will be removed as well.
For DFM-managed (short For Direct FSP Management mode) normal power machines, only partitions can be removed. No options is needed.
@ -65,7 +65,11 @@ OPTIONS
\ **-**\ **-service**\ Remove the service partitions of the specified CECs.
\ **-p**\ KVM: Purge the existence of the VM from persistent storage. This will erase all storage related to the VM in addition to removing it from the active virtualization configuration. PPC: Remove the specified partition on normal power machine.
\ **-p**\
KVM: Purge the existence of the VM from persistent storage. This will erase all storage related to the VM in addition to removing it from the active virtualization configuration. Storage devices of "raw" or "block" type are not removed.
PPC: Remove the specified partition on normal power machine.
\ **-f**\ Force remove the VM, even if the VM appears to be online. This will bring down a live VM if requested.

8
xCAT-client/pods/man1/rmvm.1.pod
View File

@ -20,7 +20,7 @@ B<rmvm [-p]> I<noderange>
=head1 DESCRIPTION
The rmvm command removes the partitions specified in noderange. If noderange is an CEC, all the partitions associated with that CEC will be removed. Note that removed partitions are automatically removed from the xCAT database. For IVM-managed systems, care must be taken to not remove the VIOS partition, or all the associated partitions will be removed as well.
The B<rmvm> command removes the partitions specified in I<noderange>. If I<noderange> is an CEC, all the partitions associated with that CEC will be removed. Note that removed partitions are automatically removed from the xCAT database. For IVM-managed systems, care must be taken to not remove the VIOS partition, or all the associated partitions will be removed as well.
For DFM-managed (short For Direct FSP Management mode) normal power machines, only partitions can be removed. No options is needed.
@ -37,7 +37,11 @@ B<-r> Retain the data object definitions of the nodes.
B<--service> Remove the service partitions of the specified CECs.
B<-p> KVM: Purge the existence of the VM from persistent storage. This will erase all storage related to the VM in addition to removing it from the active virtualization configuration. PPC: Remove the specified partition on normal power machine.
B<-p>
KVM: Purge the existence of the VM from persistent storage. This will erase all storage related to the VM in addition to removing it from the active virtualization configuration. Storage devices of "raw" or "block" type are not removed.
PPC: Remove the specified partition on normal power machine.
B<-f> Force remove the VM, even if the VM appears to be online. This will bring down a live VM if requested.

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

@ -1802,13 +1802,13 @@ sub rmvm {
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");
# For raw or block devices, do not remove device, even if purge was specified. Display info message.
xCAT::SvrUtils::sendmsg("Not purging raw or block storage device: $disk", $callback, $node);
next;
}
my $file = $disk->getAttribute("file");
unless ($file) {
xCAT::MsgUtils->trace(0, "w", "Not able to find 'file' attribute value for: $disk");
xCAT::SvrUtils::sendmsg("Not able to find 'file' attribute value for: $disk", $callback, $node);
next;
}