Author: arkurth
Date: Fri May 26 16:54:21 2017
New Revision: 1796304
URL: http://svn.apache.org/viewvc?rev=1796304&view=rev
Log:
VCL-1051
Added checkpoint state check in State.pm::reservation_failed and
Windows.pm::create_update_cygwin_startup_scheduled_task.
Modified:
vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm
vcl/trunk/managementnode/lib/VCL/Module/State.pm
Modified: vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm?rev=1796304&r1=1796303&r2=1796304&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm Fri May 26 16:54:21
2017
@@ -3671,7 +3671,7 @@ sub create_update_cygwin_startup_schedul
my $request_state = $self->data->get_request_state_name();
my $root_password;
- if ($request_state eq 'image') {
+ if ($request_state =~ /(image|checkpoint)/) {
$root_password = $WINDOWS_ROOT_PASSWORD;
}
else {
Modified: vcl/trunk/managementnode/lib/VCL/Module/State.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/State.pm?rev=1796304&r1=1796303&r2=1796304&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/State.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/State.pm Fri May 26 16:54:21 2017
@@ -460,7 +460,7 @@ sub reservation_failed {
# Display the message
notify($ERRORS{'CRITICAL'}, 0, "reservation failed on
$computer_short_name" . ($initialize_failed ? ', process failed to initialize'
: '') . ": $message");
- if ($request_state_name eq 'image') {
+ if ($request_state_name =~ /(image|checkpoint)/) {
$new_request_state_name = 'maintenance';
$new_computer_state_name = 'maintenance';
}
