arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove some print in FSPpower.pm; change SIG{CHLD}='DEFAULT'

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5498 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jjhua 2010-03-17 06:44:06 +00:00
parent e44e080a9a
commit 9d51ab0c9a
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
perl-xCAT/xCAT/FSPflash.pm
View File

@ -214,24 +214,24 @@ sub process_node {
}
print "in process_node1, node $node\n";
print Dumper($node);
#print Dumper($node);
my $ent = $tab->getNodeAttribs($node, ['serial', 'mtm']);
print "in process_node\n";
print Dumper($ent);
#print "in process_node\n";
#print Dumper($ent);
my $serial = $ent->{'serial'};
my $mtm = $ent->{'mtm'};
#################################
#Get node
#################################
print "in get_related_fsp_bpa(), serial = $serial, mtm= $mtm\n";
#print "in get_related_fsp_bpa(), serial = $serial, mtm= $mtm\n";
my @ents = $tab->getAllAttribsWhere("serial=\"$serial\" and mtm=\"$mtm\"", 'node');
if (@ents < 0) {
$msg = "failed to get the FSPs or BPAs whose mtm is $mtm, serial is $serial!";
return ("", $msg);
}
my $e;
print Dumper(@ents);
#print Dumper(@ents);
foreach $e (@ents) {
if($e->{node} ne $node) {
# push @{$req->{node}},$e->{node};

10
perl-xCAT/xCAT/FSPpower.pm
View File

@ -57,8 +57,8 @@ sub powercmd_boot {
}
my $res = xCAT::Utils::fsp_api_action ($node_name, $d, "state");
print "In boot, state\n";
print Dumper($res);
#print "In boot, state\n";
#print Dumper($res);
my $Rc = @$res[2];
my $data = @$res[1];
#my $type = @$d[4];
@ -76,7 +76,7 @@ sub powercmd_boot {
# Convert state to on/off
##################################
my $state = power_status($data);
print "boot:state:$state\n";
#print "boot:state:$state\n";
my $op = ($state =~ /^off$/) ? "on" : "reset";
$res = xCAT::Utils::fsp_api_action ($node_name, $d, $op);
@ -106,8 +106,8 @@ sub powercmd {
my @output;
my $action = $request->{'op'};
print "++++in powercmd++++\n";
print Dumper($hash);
#print "++++in powercmd++++\n";
#print Dumper($hash);
####################################
# Power commands are grouped by cec or lpar

12
perl-xCAT/xCAT/Utils.pm
View File

@ -5508,8 +5508,8 @@ sub fsp_api_action {
my $password = $myhash{$fsp_name}{"passwd.HMC"};
#print "fspname:$fsp_name password:$password\n";
if(!$password ) {
$res = "The password.hscroot of $fsp_name in ppcdirect table is empty";
return ([$node_name, $res, -1]);
$res = "The password.HMC of $fsp_name in ppcdirect table is empty";
return ([$node_name, $res, -1]);
}
my $user = "HMC";
#my $user = "hscroot";
@ -5541,8 +5541,8 @@ sub fsp_api_action {
return ([$node_name, $res, -1]);
}
print "fsp name: $fsp_name\n";
print "fsp ip: $fsp_ip\n";
#print "fsp name: $fsp_name\n";
#print "fsp ip: $fsp_ip\n";
my $cmd;
if( $action =~ /^code_update$/) {
@ -5551,8 +5551,8 @@ sub fsp_api_action {
$cmd = "$fsp_api -a $action -u $user -p $password -T $tooltype -t $type:$fsp_ip:$id:$node_name:";
}
print "cmd: $cmd\n";
$SIG{CHLD} = ();
#print "cmd: $cmd\n";
$SIG{CHLD} = 'DEFAULT';
$res = xCAT::Utils->runcmd($cmd, -1);
#$res = "good";
$Rc = $::RUNCMD_RC;