xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 01:26:38 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1470 from penguhyang/fix_rinstall

Browse Source 
fix rinstall bug for #1461
This commit is contained in:
Xiaopeng Wang 2016-07-04 19:14:24 +08:00 committed by GitHub
commit ea9311f03b
1 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
xCAT-server/lib/xcat/plugins/rinstall.pm
View File

@ -321,15 +321,13 @@ sub rinstall {
$rc = $::RUNCMD_RC;
my $rsp = {};
if ($rc == 0) {
if ($VERBOSE) {
my @cmd = "Run command: nodeset @nodes @parameter";
push @{$rsp->{data}}, @cmd;
push @{$rsp->{data}}, @$res;
xCAT::MsgUtils->message("I", $rsp, $callback);
}
if ($VERBOSE) {
my @cmd = "Run command: nodeset @nodes @parameter";
push @{$rsp->{data}}, @cmd;
push @{$rsp->{data}}, @$res;
xCAT::MsgUtils->message("I", $rsp, $callback);
}
else {
unless ($rc == 0) {
# We got an error with the nodeset
my @successnodes;
my @failurenodes;
@ -342,10 +340,17 @@ sub rinstall {
$nodes{$successnode} = 0;
push @successnodes, $successnode;
}
if ($line =~ /dhcp server is not running/) {
my $rsp = {};
$rsp->{error}->[0] = "Fatal error";
$rsp->{errorcode}->[0] = 1;
xCAT::MsgUtils->message("E", $rsp, $callback);
return 1;
}
xCAT::MsgUtils->message("I", $rsp, $callback);
}
foreach my $node (@nodes) {
if ($nodes{$node} = 1) {
if ($nodes{$node} == 1) {
push @failurenodes, $node;
}
}
@ -388,15 +393,13 @@ sub rinstall {
$rc = $::RUNCMD_RC;
my $rsp = {};
if ($rc == 0) {
if ($VERBOSE) {
my @cmd = "Run command: rnetboot @nodes";
push @{$rsp->{data}}, @cmd;
push @{$rsp->{data}}, @$res;
xCAT::MsgUtils->message("I", $rsp, $callback);
}
if ($VERBOSE) {
my @cmd = "Run command: rnetboot @nodes";
push @{$rsp->{data}}, @cmd;
push @{$rsp->{data}}, @$res;
xCAT::MsgUtils->message("I", $rsp, $callback);
}
else {
unless ($rc == 0) {
# We got an error with the rnetboot
my @failurenodes;
foreach my $line (@$res) {
@ -410,7 +413,7 @@ sub rinstall {
xCAT::MsgUtils->message("I", $rsp, $callback);
}
foreach my $node (@nodes) {
if ($nodes{$node} = 1) {
if ($nodes{$node} == 1) {
push @failurenodes, $node;
}
}
@ -441,15 +444,13 @@ sub rinstall {
$rc = $::RUNCMD_RC;
my $rsp = {};
if ($rc == 0) {
if ($VERBOSE) {
my @cmd = "Run command: rsetboot @nodes @rsetbootarg";
push @{$rsp->{data}}, @cmd;
push @{$rsp->{data}}, @$res;
xCAT::MsgUtils->message("I", $rsp, $callback);
}
if ($VERBOSE) {
my @cmd = "Run command: rsetboot @nodes @rsetbootarg";
push @{$rsp->{data}}, @cmd;
push @{$rsp->{data}}, @$res;
xCAT::MsgUtils->message("I", $rsp, $callback);
}
else {
unless ($rc == 0) {
# We got an error with the rsetboot
my @successnodes;
my @failurenodes;
@ -465,7 +466,7 @@ sub rinstall {
xCAT::MsgUtils->message("I", $rsp, $callback);
}
foreach my $node (@nodes) {
if ($nodes{$node} = 1) {
if ($nodes{$node} == 1) {
push @failurenodes, $node;
}
}
@ -492,15 +493,13 @@ sub rinstall {
$rc = $::RUNCMD_RC;
my $rsp = {};
if ($rc == 0) {
if ($VERBOSE) {
my @cmd = "Run command: rpower @nodes @rpowerarg";
push @{$rsp->{data}}, @cmd;
push @{$rsp->{data}}, @$res;
xCAT::MsgUtils->message("I", $rsp, $callback);
}
if ($VERBOSE) {
my @cmd = "Run command: rpower @nodes @rpowerarg";
push @{$rsp->{data}}, @cmd;
push @{$rsp->{data}}, @$res;
xCAT::MsgUtils->message("I", $rsp, $callback);
}
else {
unless ($rc == 0) {
# We got an error with the rpower
my @failurenodes;
foreach my $line (@$res) {
@ -514,7 +513,7 @@ sub rinstall {
xCAT::MsgUtils->message("I", $rsp, $callback);
}
foreach my $node (@nodes) {
if ($nodes{$node} = 1) {
if ($nodes{$node} == 1) {
push @failurenodes, $node;
}
}