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

Fixed the bug -f does not work if the Cstate of nim machine is ready.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12132 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
sjing 2012-04-05 14:12:04 +00:00
parent a3f7e76b03
commit 7fe393e420
1 changed files with 33 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
xCAT-server/lib/xcat/plugins/aixinstall.pm
View File

@ -954,55 +954,49 @@ sub nimnodeset
my $shorthost;
($shorthost = $node) =~ s/\..*$//;
chomp $shorthost;
# need to pass in this server name
my $cstate = xCAT::InstUtils->get_nim_attr_val($shorthost, "Cstate", $callback, "$Sname", $subreq);
if (defined($cstate) && (!($cstate =~ /ready/)))
if ($::FORCE)
{
if ($::FORCE)
if ($::VERBOSE)
{
# if it's not in a ready state then reset it
if ($::VERBOSE)
{
my $rsp;
push @{$rsp->{data}},
"$Sname: Reseting NIM definition for $shorthost.\n";
xCAT::MsgUtils->message("I", $rsp, $callback);
}
my $rcmd =
"/usr/sbin/nim -Fo reset -a force=yes $shorthost;/usr/sbin/nim -Fo deallocate -a subclass=all $shorthost";
my $output = xCAT::Utils->runcmd("$rcmd", -1);
if ($::RUNCMD_RC != 0)
{
my $rsp;
push @{$rsp->{data}},
"$Sname: Could not reset the existing NIM object named \'$shorthost\'.\n";
if ($::VERBOSE)
{
push @{$rsp->{data}}, "$output";
}
xCAT::MsgUtils->message("E", $rsp, $callback);
$error++;
push(@nodesfailed, $node);
next;
}
}
else
{
my $rsp;
push @{$rsp->{data}},
"$Sname: The NIM machine named $shorthost is not in the ready state and cannot be initialized.\n";
"$Sname: Reseting NIM definition for $shorthost.\n";
xCAT::MsgUtils->message("I", $rsp, $callback);
}
my $rcmd =
"/usr/sbin/nim -Fo reset -a force=yes $shorthost;/usr/sbin/nim -Fo deallocate -a subclass=all $shorthost";
my $output = xCAT::Utils->runcmd("$rcmd", -1);
if ($::RUNCMD_RC != 0)
{
my $rsp;
push @{$rsp->{data}},
"$Sname: Could not reset the existing NIM object named \'$shorthost\'.\n";
if ($::VERBOSE)
{
push @{$rsp->{data}}, "$output";
}
xCAT::MsgUtils->message("E", $rsp, $callback);
$error++;
push(@nodesfailed, $node);
next;
}
}
# need to pass in this server name
my $cstate = xCAT::InstUtils->get_nim_attr_val($shorthost, "Cstate", $callback, "$Sname", $subreq);
if (defined($cstate) && (!($cstate =~ /ready/)))
{
my $rsp;
push @{$rsp->{data}},
"$Sname: The NIM machine named $shorthost is not in the ready state and cannot be initialized. Use -f flag to forcely initialize it.\n";
xCAT::MsgUtils->message("E", $rsp, $callback);
$error++;
push(@nodesfailed, $node);
next;
}
# set the NIM machine type
$type = "standalone";