Author: arkurth
Date: Wed May 24 23:32:11 2017
New Revision: 1796116
URL: http://svn.apache.org/viewvc?rev=1796116&view=rev
Log:
VCL-1051
Added check for 'checkpoint' state in:
* xCAT.pm::DESTROY
* new.pm::computer_not_being_used
Modified:
vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
vcl/trunk/managementnode/lib/VCL/new.pm
Modified: vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm?rev=1796116&r1=1796115&r2=1796116&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm Wed May 24
23:32:11 2017
@@ -2565,7 +2565,7 @@ sub DESTROY {
if (!defined($node) || !defined($request_state_name)) {
notify($ERRORS{'DEBUG'}, 0, "skipping xCAT DESTROY
tasks, unable to retrieve node name and request state name from DataStructure");
}
- elsif ($request_state_name =~ /^(new|reload|image)$/) {
+ elsif ($request_state_name =~
/^(new|reload|image|checkpoint)$/) {
notify($ERRORS{'DEBUG'}, 0, "request state is
'$request_state_name', attempting to set nodeset state of $node to 'boot'");
$self->_nodeset($node, 'boot');
}
Modified: vcl/trunk/managementnode/lib/VCL/new.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/new.pm?rev=1796116&r1=1796115&r2=1796116&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/new.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/new.pm Wed May 24 23:32:11 2017
@@ -712,7 +712,7 @@ sub computer_not_being_used {
notify($ERRORS{'DEBUG'}, 0, "checking reservation
assigned to $computer_short_name:\n$competing_request_info_string");
# Check for existing image creation requests
- if ($competing_request_state =~ /^(image)$/ ||
$competing_request_laststate =~ /^(image)$/) {
+ if ($competing_request_state =~ /^(image|checkpoint)$/
|| $competing_request_laststate =~ /^(image|checkpoint)$/) {
notify($ERRORS{'WARNING'}, 0,
"$computer_short_name is NOT available, it is assigned to an existing imaging
reservation:\n$competing_request_info_string");
return 0;
}
