Author: fapeeler
Date: Fri Dec 5 20:29:38 2014
New Revision: 1643419
URL: http://svn.apache.org/r1643419
Log:
VCL-568, VCL-308
more tweaks on the flow
Modified:
vcl/trunk/managementnode/lib/VCL/Module/OS.pm
vcl/trunk/managementnode/lib/VCL/new.pm
Modified: vcl/trunk/managementnode/lib/VCL/Module/OS.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/OS.pm?rev=1643419&r1=1643418&r2=1643419&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/OS.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/Module/OS.pm Fri Dec 5 20:29:38 2014
@@ -789,7 +789,7 @@ sub wait_for_response {
my $end_time = time();
my $duration = ($end_time - $start_time);
- # insertloadlog($reservation_id, $computer_id, "osrespond",
"$computer_node_name is responding to SSH after $duration seconds");
+ insertloadlog($reservation_id, $computer_id, "machinebooted",
"$computer_node_name is responding to SSH after $duration seconds");
notify($ERRORS{'OK'}, 0, "$computer_node_name is responding to SSH
after $duration seconds");
return 1;
}
Modified: vcl/trunk/managementnode/lib/VCL/new.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/new.pm?rev=1643419&r1=1643418&r2=1643419&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/new.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/new.pm Fri Dec 5 20:29:38 2014
@@ -593,11 +593,11 @@ sub reload_image {
# Try to retrieve the image files from another
management node
if ($self->provisioner->can("retrieve_image")) {
notify($ERRORS{'DEBUG'}, 0, "calling "
. ref($self->provisioner) . "->retrieve_image()");
- # Needed for computerloadflow
- insertloadlog($reservation_id,
$computer_id, "copyfrompartnerMN", "Retrieving image");
if
($self->provisioner->retrieve_image($image_name)) {
notify($ERRORS{'OK'}, 0,
"$image_name was retrieved from another management node");
+ # Needed for computerloadflow
+ insertloadlog($reservation_id,
$computer_id, "copyfrompartnerMN", "Retrieving image");
}
else {
notify($ERRORS{'CRITICAL'}, 0,
"$image_name does not exist on management node and could not be retrieved");
