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

fix 2:EOF error return

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11024 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2011-11-17 17:10:20 +00:00
parent fa19d0d38f
commit 1eb9f9b547
2 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
perl-xCAT/xCAT/RemoteShellExp.pm
View File

@ -523,10 +523,9 @@ sub sendnodeskeys
{
my $rsp = {};
$rsp->{data}->[0] =
"Unable to run $spawnmkdir.";
"Unable to run $spawnmkdir on $node";
xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1);
next; # go to next node
next;
}
#
@ -555,8 +554,7 @@ sub sendnodeskeys
$prompt3, # Permission denied
sub {
$rc= 1;
$sendkeys->soft_close();
next; # go to next node
$sendkeys->hard_close();
}
],
); # end prompts
@ -566,14 +564,17 @@ sub sendnodeskeys
if (defined($result[1]))
{
my $msg = $result[1];
if ($msg =~ /status 0/i) { # no error
if ($msg =~ /status 0/i) { # no error
$rc=0;
} else {
my $rsp = {};
$rsp->{data}->[0] = "$node has error,$msg";
xCAT::MsgUtils->message("I", $rsp, $::CALLBACK);
$rc=1;
next; # go to next node
if ($msg =~ /2:EOF/i) { # no error
$rc=0;
} else {
my $rsp = {};
$rsp->{data}->[0] = "mkdir:$node has error,$msg";
xCAT::MsgUtils->message("I", $rsp, $::CALLBACK);
$rc=1;
}
}
}
$sendkeys->soft_close();
@ -612,10 +613,9 @@ sub sendnodeskeys
{
my $rsp = {};
$rsp->{data}->[0] =
"Unable to run $spawncopyfiles.";
"Unable to run $spawncopyfiles on $node.";
xCAT::MsgUtils->message("E", $rsp, $::CALLBACK, 1);
next; # go to next node
next;
}
my @result = $sendkeys->expect(
@ -640,8 +640,7 @@ sub sendnodeskeys
$prompt3, # Permission denied
sub {
$rc= 1;
$sendkeys->soft_close();
next; # go to next node
$sendkeys->hard_close();
}
],
@ -655,11 +654,14 @@ sub sendnodeskeys
if ($msg =~ /status 0/i) { # no error
$rc=0;
} else {
my $rsp = {};
$rsp->{data}->[0] = "$node has error,$msg";
xCAT::MsgUtils->message("I", $rsp, $::CALLBACK);
$rc=1;
next; # go to next node
if ($msg =~ /2:EOF/i) { # no error
$rc=0;
} else {
my $rsp = {};
$rsp->{data}->[0] = "copykeys:$node has error,$msg";
xCAT::MsgUtils->message("I", $rsp, $::CALLBACK);
$rc=1;
}
}
}
$sendkeys->soft_close();
@ -724,8 +726,7 @@ sub sendnodeskeys
$prompt3, # Permission denied
sub {
$rc= 1;
$sendkeys->soft_close();
next; # go to next node
$sendkeys->hard_close();
}
],
); # end prompts
@ -738,11 +739,14 @@ sub sendnodeskeys
if ($msg =~ /status 0/i) { # no error
$rc=0;
} else {
my $rsp = {};
$rsp->{data}->[0] = "$node has error,$msg";
xCAT::MsgUtils->message("I", $rsp, $::CALLBACK);
$rc=1;
next; # go to next node
if ($msg =~ /2:EOF/i) { # no error
$rc=0;
} else {
my $rsp = {};
$rsp->{data}->[0] = "copy.sh:$node has error,$msg";
xCAT::MsgUtils->message("I", $rsp, $::CALLBACK);
$rc=1;
}
}
}
$sendkeys->soft_close();

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

@ -1668,7 +1668,7 @@ cp /tmp/$to_userid/.ssh/id_rsa \$home/.ssh/id_rsa 2>&1
chmod 0600 \$home/.ssh/id_* 2>&1
rm -f /tmp/$to_userid/.ssh/* 2>&1
rmdir \"/tmp/$to_userid/.ssh\"
rmdir \"/tmp/$to_userid\"";
rmdir \"/tmp/$to_userid\" \n";
close FILE;
chmod 0777,"$home/.ssh/copy.sh";