Author: arkurth
Date: Thu Nov 18 14:26:02 2010
New Revision: 1036465
URL: http://svn.apache.org/viewvc?rev=1036465&view=rev
Log:
VCL-221
Added code to node_status() in xCAT2.pm and xCAT21.pm subroutines to check if
post_load tasks have run. If not, 'POST_LOAD' is returned instead of 'READY'.
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT21.pm
Modified: incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm?rev=1036465&r1=1036464&r2=1036465&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm
(original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT.pm Thu
Nov 18 14:26:02 2010
@@ -2289,11 +2289,11 @@ sub node_status {
# Check if the OS post_load tasks have run
if ($self->os->get_vcld_post_load_status()) {
- notify($ERRORS{'DEBUG'}, 0, "OS module post_load tasks
have been completed on VM $computer_short_name");
+ notify($ERRORS{'DEBUG'}, 0, "OS module post_load tasks
have been completed on $computer_short_name");
$status{status} = 'READY';
}
else {
- notify($ERRORS{'DEBUG'}, 0, "OS module post_load tasks
have not been completed on VM $computer_short_name, returning 'POST_LOAD'");
+ notify($ERRORS{'DEBUG'}, 0, "OS module post_load tasks
have not been completed on $computer_short_name, returning 'POST_LOAD'");
$status{status} = 'POST_LOAD';
}
}
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm?rev=1036465&r1=1036464&r2=1036465&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm
(original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT2.pm Thu
Nov 18 14:26:02 2010
@@ -1873,6 +1873,16 @@ sub node_status {
# Node is up and doesn't need to be reloaded
if ($status{status} =~ /ready/i) {
notify($ERRORS{'OK'}, $log, "node is up and does not need to be
reloaded");
+
+ # Check if the OS post_load tasks have run
+ if ($self->os->get_vcld_post_load_status()) {
+ notify($ERRORS{'DEBUG'}, 0, "OS module post_load tasks
have been completed on $computer_short_name");
+ $status{status} = 'READY';
+ }
+ else {
+ notify($ERRORS{'DEBUG'}, 0, "OS module post_load tasks
have not been completed on $computer_short_name, returning 'POST_LOAD'");
+ $status{status} = 'POST_LOAD';
+ }
}
else {
notify($ERRORS{'OK'}, $log, "node is either down or needs to be
reloaded");
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT21.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT21.pm?rev=1036465&r1=1036464&r2=1036465&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT21.pm
(original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/xCAT21.pm
Thu Nov 18 14:26:02 2010
@@ -1909,6 +1909,16 @@ sub node_status {
# Node is up and doesn't need to be reloaded
if ($status{status} =~ /ready/i) {
notify($ERRORS{'OK'}, $log, "node is up and does not need to be
reloaded");
+
+ # Check if the OS post_load tasks have run
+ if ($self->os->get_vcld_post_load_status()) {
+ notify($ERRORS{'DEBUG'}, 0, "OS module post_load tasks
have been completed on $computer_short_name");
+ $status{status} = 'READY';
+ }
+ else {
+ notify($ERRORS{'DEBUG'}, 0, "OS module post_load tasks
have not been completed on $computer_short_name, returning 'POST_LOAD'");
+ $status{status} = 'POST_LOAD';
+ }
}
else {
notify($ERRORS{'OK'}, $log, "node is either down or needs to be
reloaded");
