Author: arkurth
Date: Fri Jan 23 08:40:56 2009
New Revision: 737074
URL: http://svn.apache.org/viewvc?rev=737074&view=rev
Log:
VCL-62
Added 'use VCL::Module::Provisioning::xCAT' and changed all calls in Windows.pm
to xCAT.pm's _rpower() subroutine to
'VCL::Module::Provisioning::xCAT::_rpower()'. Reservation processes were dying
whenever _rpower() was called because it was undefined. None of the subroutines
in xCAT.pm are exported so the full package path must be specified.
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm
Modified: incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm
URL:
http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm?rev=737074&r1=737073&r2=737074&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/OS/Windows.pm Fri Jan 23
08:40:56 2009
@@ -58,6 +58,7 @@
use VCL::Module::Utils::SCP;
use VCL::Module::Utils::SSH;
use File::Basename;
+use VCL::Module::Provisioning::xCAT;
##############################################################################
@@ -474,7 +475,7 @@
# force a reboot, or really a power cycle.
#crap hate to do this.
notify($ERRORS{'WARNING'}, 0, "forcing a power cycle");
- if (_rpower($computer_node_name, "boot")) {
+ if
(VCL::Module::Provisioning::xCAT::_rpower($computer_node_name, "boot")) {
notify($ERRORS{'WARNING'}, 0, "forced power
cycle complete");
next;
}
@@ -498,7 +499,7 @@
}
if ($pingloop > 10) {
notify($ERRORS{'CRITICAL'}, 0, "$computer_node_name
should have rebooted by now, trying to force it");
- if (_rpower($computer_node_name, "boot")) {
+ if
(VCL::Module::Provisioning::xCAT::_rpower($computer_node_name, "boot")) {
notify($ERRORS{'WARNING'}, 0, "forced power
cycle complete");
sleep 25;
next;
@@ -554,7 +555,7 @@
}
notify($ERRORS{'CRITICAL'}, 0, "discovered ssh read
from socket failure on $computer_node_name, attempting to repair");
#power cycle node
- if (_rpower($computer_node_name, "cycle")) {
+ if
(VCL::Module::Provisioning::xCAT::_rpower($computer_node_name, "cycle")) {
notify($ERRORS{'CRITICAL'}, 0,
"$computer_node_name power cycled going to reboot check routine");
sleep 40;
$socketflag = 1;