Author: arkurth
Date: Tue Sep 25 20:33:48 2012
New Revision: 1390118
URL: http://svn.apache.org/viewvc?rev=1390118&view=rev
Log:
Merged revision(s) 1390112 from vcl/trunk/managementnode/lib/VCL/new.pm:
VCL-634
Updated new.pm to add the "nodeready" computerloadlog entry whenever
reload_image returns true.
........
Modified:
vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/new.pm (contents,
props changed)
Modified: vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/new.pm
URL:
http://svn.apache.org/viewvc/vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/new.pm?rev=1390118&r1=1390117&r2=1390118&view=diff
==============================================================================
--- vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/new.pm (original)
+++ vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/new.pm Tue Sep 25
20:33:48 2012
@@ -290,6 +290,7 @@ sub process {
# Confirm requested resouces are available
if ($self->reload_image()) {
notify($ERRORS{'OK'}, 0, "$computer_short_name is loaded with
$image_name");
+ insertloadlog($reservation_id, $computer_id, "nodeready",
"$computer_short_name is loaded with $image_name");
}
elsif ($request_preload_only) {
# Load failed preload only = true
@@ -580,7 +581,6 @@ sub reload_image {
if ($node_status_string =~ /^ready/i) {
# node_status returned 'ready'
notify($ERRORS{'OK'}, 0, "node_status returned
'$node_status_string', $computer_short_name will not be reloaded");
- insertloadlog($reservation_id, $computer_id, "nodeready", "node
status is $node_status_string, $computer_short_name will not be reloaded");
}
elsif ($node_status_string =~ /^post_load/i) {
@@ -677,11 +677,7 @@ sub reload_image {
insertloadlog($reservation_id, $computer_id,
"loadimagefailed", "$image_name failed to load on $computer_short_name");
return;
}
-
- notify($ERRORS{'OK'}, 0, "node ready: successfully reloaded
$computer_short_name with $image_name");
- insertloadlog($reservation_id, $computer_id, "nodeready",
"$computer_short_name was reloaded with $image_name");
}
-
# Update the current image ID in the computer table
if (update_currentimage($computer_id, $image_id, $imagerevision_id,
$image_id)) {
Propchange: vcl/branches/vcl-2.3-bugfixes/managementnode/lib/VCL/new.pm
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Sep 25 20:33:48 2012
@@ -0,0 +1 @@
+/vcl/trunk/managementnode/lib/VCL/new.pm:1378995,1383454,1390112
