You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by ar...@apache.org on 2009/09/14 20:27:18 UTC
svn commit: r814771 -
/incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vmware.pm
Author: arkurth
Date: Mon Sep 14 18:27:17 2009
New Revision: 814771
URL: http://svn.apache.org/viewvc?rev=814771&view=rev
Log:
VCL-218
Added check to the section in vmware.pm where it deleted unused VMs to reclaim space for VM files used for imaging reservations. These are ignored and never reclaimed in order to prevent the loss of an image which is supposed to be captured.
Also added missing else block if the copying of .vmdk files to the image repository fails.
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vmware.pm
Modified: incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vmware.pm
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vmware.pm?rev=814771&r1=814770&r2=814771&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vmware.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/vmware.pm Mon Sep 14 18:27:17 2009
@@ -409,16 +409,28 @@
my @sshcmd_3 = run_ssh_command($hostnode, $identity, "ls -1 $datastorepath", "root");
foreach my $d (@{$sshcmd_3[1]}) {
next if ($d =~ /Warning: /);
+
+ # Ignore VMs which aren't named vmware*, these are imaging reservations
+ if ($d !~ /vmware[^\/]+$/) {
+ notify($ERRORS{'OK'}, 0, "disk cleanup - ignoring image capture VM: $d");
+ next;
+ }
+ else {
+ notify($ERRORS{'DEBUG'}, 0, "disk cleanup - NOT an image capture VM: $d, proceeding with additional cleanup checks");
+ }
+
chomp($d);
my $save = 0;
- foreach my $v (%vmlist) {
+ foreach my $v (keys %vmlist) {
#print "checking if $d is part of a running vm of $v\n";
if ($vmlist{$v}{path} =~ /$d/) {
if ($vmlist{$v}{state} eq "on") {
$save = 1;
+ notify($ERRORS{'DEBUG'}, 0, "VM is on, it will be saved: $vmlist{$v}{path}");
}
elsif ($vmlist{$v}{state} eq "off") {
- $save = 0;
+ #$save = 0;
+ notify($ERRORS{'DEBUG'}, 0, "VM is off, it will NOT be saved: $vmlist{$v}{path}");
if (defined(run_ssh_command($hostnode, $identity, "vmware-cmd -s unregister $vmlist{$v}{path}", "root"))) {
notify($ERRORS{'DEBUG'}, 0, "unregistered $vmlist{$v}{path}");
}
@@ -1332,6 +1344,10 @@
return 1;
} ## end if (open(LISTFILES, "ls -s1 $VMWAREREPOSITORY/$image_name |"...
} ## end if (run_scp_command("$hostnodename:\"$vmhost_vmpath/$vmx_directory/*.vmdk\""...
+ else {
+ notify($ERRORS{'CRITICAL'}, 0, "failed to copy .vmdk files to image repository");
+ return 0;
+ }
} ## end if ($vmprofile_vmdisk eq "localdisk")
elsif ($vmprofile_vmdisk eq "networkdisk") {