xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 11:22:27 +00:00
Code Issues Releases Wiki Activity

fixed defect 3316949

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10300 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
linggao
2011-08-17 13:51:12 +00:00
parent 29cc018a5b
commit 1f947237fd
2 changed files with 94 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT-client/pods/man1/snmove.1.pod
View File

@@ -50,7 +50,7 @@ service node.
If the -i option is specified, the nodes themselves will not be modified.
If the -i option is NOT specified then the nodes will e modified as follows:
If the -i option is NOT specified then the nodes will be modified as follows:
=over 3
@@ -68,6 +68,10 @@ The B<mkresolvconf> script will be run IF it was included in the nodes postscrip
=item 4.
The default gateway will be switched to the backup service node if B<networks.gateway=<xcatmaster>>.
=item 5.
If it is an AIX diskful node then the B<niminit> command will be run so that it will recognize the new service node as it's NIM master.
=back

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

@@ -606,106 +606,107 @@ sub process_request
}
} # end - for Linux system only
#
# for both AIX and Linux systems
#
# setup the default gateway if the network.gateway=xcatmaster for the node
my %nethash;
my %ipmap=();
my %gwhash=();
my $nwtab=xCAT::Table->new("networks");
if ($nwtab) {
my @tmp1=$nwtab->getAllAttribs(('net','mask','gateway','mgtifname'));
if (@tmp1 && (@tmp1 > 0)) {
foreach my $nwitem (@tmp1) {
my $gw=$nwitem->{'gateway'};
if (!$gw) {
next;
}
chomp $gw;
if ($gw ne '<xcatmaster>') {
next;
}
#now only handle the networks that has <xcatmaster> as the gateway
my $NM = $nwitem->{'mask'};
my $net=$nwitem->{'net'};
my $ifname=$nwitem->{'mgtifname'};
chomp $NM;
chomp $net;
chomp $ifname;
#print "NM=$NM, net=$net, ifname=$ifname, nodes=@nodes\n";
# for each node - get the network info
foreach my $node (@nodes)
{
# get, check, split the node IP
my $IP = xCAT::NetworkUtils->getipaddr($node);
chomp $IP;
if (!$::IGNORE){
#
# for both AIX and Linux systems
#
# setup the default gateway if the network.gateway=xcatmaster for the node
my %nethash;
my %ipmap=();
my %gwhash=();
my $nwtab=xCAT::Table->new("networks");
if ($nwtab) {
my @tmp1=$nwtab->getAllAttribs(('net','mask','gateway','mgtifname'));
if (@tmp1 && (@tmp1 > 0)) {
foreach my $nwitem (@tmp1) {
my $gw=$nwitem->{'gateway'};
if (!$gw) {
next;
}
# check the entries of the networks table
# - if the bitwise AND of the IP and the netmask gives you
# the "net" name then that is the entry you want.
if(xCAT::NetworkUtils->ishostinsubnet($IP, $NM, $net))
chomp $gw;
if ($gw ne '<xcatmaster>') {
next;
}
#now only handle the networks that has <xcatmaster> as the gateway
my $NM = $nwitem->{'mask'};
my $net=$nwitem->{'net'};
my $ifname=$nwitem->{'mgtifname'};
chomp $NM;
chomp $net;
chomp $ifname;
#print "NM=$NM, net=$net, ifname=$ifname, nodes=@nodes\n";
# for each node - get the network info
foreach my $node (@nodes)
{
my $newmaster=$newxcatmaster{$node};
my $newmasterIP;
if (exists($ipmap{$newmaster})) {
$newmasterIP=$ipmap{$newmaster};
} else {
$newmasterIP = xCAT::NetworkUtils->getipaddr($newmaster);
chomp($newmasterIP);
$ipmap{$newmaster}=$newmasterIP;
}
$nethash{$node}{'gateway'}=$newmasterIP;
$nethash{$node}{'net'} = $net;
$nethash{$node}{'mask'} = $NM;
$nethash{$node}{'mgtifname'} = $ifname;
if ($newmasterIP) {
if (exists($gwhash{$newmasterIP})) {
my $pa=$gwhash{$newmasterIP};
push (@$pa, $node);
# get, check, split the node IP
my $IP = xCAT::NetworkUtils->getipaddr($node);
chomp $IP;
# check the entries of the networks table
# - if the bitwise AND of the IP and the netmask gives you
# the "net" name then that is the entry you want.
if(xCAT::NetworkUtils->ishostinsubnet($IP, $NM, $net))
{
my $newmaster=$newxcatmaster{$node};
my $newmasterIP;
if (exists($ipmap{$newmaster})) {
$newmasterIP=$ipmap{$newmaster};
} else {
$gwhash{$newmasterIP}=[$node];
$newmasterIP = xCAT::NetworkUtils->getipaddr($newmaster);
chomp($newmasterIP);
$ipmap{$newmaster}=$newmasterIP;
}
$nethash{$node}{'gateway'}=$newmasterIP;
$nethash{$node}{'net'} = $net;
$nethash{$node}{'mask'} = $NM;
$nethash{$node}{'mgtifname'} = $ifname;
if ($newmasterIP) {
if (exists($gwhash{$newmasterIP})) {
my $pa=$gwhash{$newmasterIP};
push (@$pa, $node);
} else {
$gwhash{$newmasterIP}=[$node];
}
}
}
}
}
}
}
}
if (keys(%gwhash) > 0) {
my $rsp;
$rsp->{data}->[0]="Setting up the default routes on the nodes.";
xCAT::MsgUtils->message("I", $rsp, $callback);
}
foreach my $gw (keys %gwhash) {
my $cmd="route add default gw"; #this is temporary,TODO, set perminant route on the nodes.
if (xCAT::Utils->isAIX()) {
$cmd="route add default";
}
my $ret =
xCAT::Utils->runxcmd(
{
command => ['xdsh'],
node => $gwhash{$gw},
arg => ["-v", "$cmd $gw"],
},
$sub_req, -1, 1
);
if ($::RUNCMD_RC != 0)
{
$error++;
}
my $rsp;
$rsp->{data}=$ret;
xCAT::MsgUtils->message("I", $rsp, $callback);
if (keys(%gwhash) > 0) {
my $rsp;
$rsp->{data}->[0]="Setting up the default routes on the nodes.";
xCAT::MsgUtils->message("I", $rsp, $callback);
}
foreach my $gw (keys %gwhash) {
my $cmd="route add default gw"; #this is temporary,TODO, set perminant route on the nodes.
if (xCAT::Utils->isAIX()) {
$cmd="route add default";
}
my $ret =
xCAT::Utils->runxcmd(
{
command => ['xdsh'],
node => $gwhash{$gw},
arg => ["-v", "$cmd $gw"],
},
$sub_req, -1, 1
);
if ($::RUNCMD_RC != 0)
{
$error++;
}
my $rsp;
$rsp->{data}=$ret;
xCAT::MsgUtils->message("I", $rsp, $callback);
}
}
# run postscripts to take care of syslog, ntp, and mkresolvconf
# - if they are included in the postscripts table
if (!$::IGNORE) # unless the user does not want us to touch the node