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

fixed a defect when snmove failed if the source service node is down. defect 3487610

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@12378 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
linggao 2012-04-27 18:05:46 +00:00
parent 3660e5d52d
commit b1c7d3d59d
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
xCAT-server/lib/xcat/plugins/snmove.pm
View File

@ -1011,12 +1011,11 @@ sub process_request
},
$sub_req, 0, 1
);
my $rsp;
$rsp->{data}=$ret;
xCAT::MsgUtils->message("I", $rsp, $callback);
if ($::RUNCMD_RC != 0)
{
my $rsp;
push @{$rsp->{data}},
"Could not run the nodeset command.\n";
xCAT::MsgUtils->message("E", $rsp, $callback);
$error++;
}
}
@ -1031,12 +1030,11 @@ sub process_request
},
$sub_req, 0, 1
);
my $rsp;
$rsp->{data}=$ret;
xCAT::MsgUtils->message("I", $rsp, $callback);
if ($::RUNCMD_RC != 0)
{
my $rsp;
push @{$rsp->{data}},
"Could not run the nodeset command.\n";
xCAT::MsgUtils->message("E", $rsp, $callback);
$error++;
}
}

25
xCAT/postscripts/xcatdsklspost
View File

@ -144,17 +144,6 @@ if [ "$MODE" = "4" ]; then # for statelite mode
fi
else # for common mode
downloaded=0;
#open the xcatinfo file to look for the master if it is not set
if [ -f /opt/xcat/xcatinfo ]; then
SIP=`grep 'XCATSERVER' /opt/xcat/xcatinfo |cut -d= -f2`
if [ -n "$SIP" ]; then
download_postscripts $SIP
if [ $? -eq 0 ]; then
downloaded=1
fi
fi
fi
#try the -m if it is specified, -m is passed in the updatenode command
if [ $downloaded -eq 0 ]; then
if [ "XX$P_SIP" != "XX" ]; then
@ -165,6 +154,20 @@ else # for common mode
fi
fi
fi
#open the xcatinfo file to look for the master if it is not set
if [ $downloaded -eq 0 ]; then
if [ -f /opt/xcat/xcatinfo ]; then
SIP=`grep 'XCATSERVER' /opt/xcat/xcatinfo |cut -d= -f2`
if [ -n "$SIP" ]; then
download_postscripts $SIP
if [ $? -eq 0 ]; then
downloaded=1
fi
fi
fi
fi
#try the dhcp server, this is used for initial boot for the node.
if [ $downloaded -eq 0 ]; then