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

fixed the issue that xnba,pxe,vsmppex,yaboot failed for service node when no valid nodes in the handled network

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11882 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
daniceexi
2012-03-16 10:31:33 +00:00
parent f8138b1687
commit 9e2b250062
4 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
xCAT-server/lib/xcat/plugins/pxe.pm
View File

@@ -3,6 +3,7 @@ package xCAT_plugin::pxe;
use Data::Dumper;
use Sys::Syslog;
use xCAT::Scope;
use xCAT::MsgUtils;
use Socket;
use File::Copy;
use File::Path;
@@ -392,15 +393,19 @@ sub process_request {
if (xCAT::Utils->nodeonmynet($_)) {
push @nodes,$_;
} else {
my $rsp;
$rsp->{data}->[0]="$_: stop configuration because of none sharedtftp and not on same network with its xcatmaster";
$callback->($rsp);
xCAT::MsgUtils->message("S", "$_: pxe netboot: stop configuration because of none sharedtftp and not on same network with its xcatmaster.");
}
}
} else {
@nodes = @rnodes;
}
# return directly if no nodes in the same network
unless (@nodes) {
xCAT::MsgUtils->message("S", "xCAT: pxe netboot: no valid nodes. Stop the operation on this server.");
return;
}
if (ref($request->{arg})) {
@args=@{$request->{arg}};
} else {

11
xCAT-server/lib/xcat/plugins/vsmppxe.pm
View File

@@ -5,6 +5,7 @@ use Sys::Syslog;
use Socket;
use File::Copy;
use Getopt::Long;
use xCAT::MsgUtils;
my $addkcmdlinehandled;
my $request;
@@ -292,15 +293,19 @@ sub process_request {
if (xCAT::Utils->nodeonmynet($_)) {
push @nodes,$_;
} else {
my $rsp;
$rsp->{data}->[0]="$_: stop configuration because of none sharedtftp and not on same network with its xcatmaster";
$callback->($rsp);
xCAT::MsgUtils->message("S", "$_: vsmppxe netboot: stop configuration because of none sharedtftp and not on same network with its xcatmaster.");
}
}
} else {
@nodes = @rnodes;
}
# return directly if no nodes in the same network
unless (@nodes) {
xCAT::MsgUtils->message("S", "xCAT: vsmppxe netboot: no valid nodes. Stop the operation on this server.");
return;
}
if (ref($request->{arg})) {
@args=@{$request->{arg}};
} else {

11
xCAT-server/lib/xcat/plugins/xnba.pm
View File

@@ -6,6 +6,7 @@ use Socket;
use File::Copy;
use File::Path;
use xCAT::Scope;
use xCAT::MsgUtils;
use Getopt::Long;
my $addkcmdlinehandled;
@@ -416,15 +417,19 @@ sub process_request {
if (xCAT::Utils->nodeonmynet($_)) {
push @nodes,$_;
} else {
my $rsp;
$rsp->{data}->[0]="$_: stop configuration because of none sharedtftp and not on same network with its xcatmaster";
$callback->($rsp);
xCAT::MsgUtils->message("S", "$_: xnba netboot: stop configuration because of none sharedtftp and not on same network with its xcatmaster.");
}
}
} else {
@nodes = @rnodes;
}
# return directly if no nodes in the same network
unless (@nodes) {
xCAT::MsgUtils->message("S", "xCAT: xnba netboot: no valid nodes. Stop the operation on this server.");
return;
}
if (ref($request->{arg})) {
@args=@{$request->{arg}};
} else {

12
xCAT-server/lib/xcat/plugins/yaboot.pm
View File

@@ -4,6 +4,7 @@ use Data::Dumper;
use Sys::Syslog;
use xCAT::Scope;
use xCAT::NetworkUtils;
use xCAT::MsgUtils;
use File::Path;
use Socket;
use Getopt::Long;
@@ -421,15 +422,18 @@ sub process_request {
if (xCAT::Utils->nodeonmynet($_)) {
push @nodes,$_;
} else {
my $rsp;
$rsp->{data}->[0]="$_: stop configuration because of none sharedtftp and not on same network with its xcatmaster";
$callback->($rsp);
xCAT::MsgUtils->message("S", "$_: yaboot netboot: stop configuration because of none sharedtftp and not on same network with its xcatmaster.");
}
}
} else {
@nodes = @rnodes;
}
#print "nodes=@nodes\nrnodes=@rnodes\n";
# return directly if no nodes in the same network
unless (@nodes) {
xCAT::MsgUtils->message("S", "xCAT: yaboot netboot: no valid nodes. Stop the operation on this server.");
return;
}
if (ref($request->{arg})) {
@args=@{$request->{arg}};