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

Merge branch 'master' of ssh://git.code.sf.net/p/xcat/xcat-core

Browse Source
This commit is contained in:
nott 2013-10-18 07:58:16 -04:00
commit 41b7c99bee
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xCAT-server/lib/xcat/plugins/destiny.pm
View File

@ -553,12 +553,12 @@ sub nextdestiny {
my $chainents = $chaintab->getNodesAttribs(\@nodes,[qw(currstate currchain chain)]);
foreach $node (@nodes) {
unless($chaintab) {
syslog("local1|err","ERROR: $node requested destiny update, no chain table");
syslog("local4|err","ERROR: $node requested destiny update, no chain table");
return; #nothing to do...
}
my $ref = $chainents->{$node}->[0]; #$chaintab->getNodeAttribs($node,[qw(currstate currchain chain)]);
unless ($ref->{chain} or $ref->{currchain}) {
syslog ("local1|err","ERROR: node requested destiny update, no path in chain.currchain");
syslog ("local4|err","ERROR: node requested destiny update, no path in chain.currchain");
return; #Can't possibly do anything intelligent..
}
unless ($ref->{currchain}) { #If no current chain, copy the default

4
xCAT-server/lib/xcat/plugins/nodediscover.pm
View File

@ -342,7 +342,7 @@ sub process_request {
Timeout => '1',
Proto => 'tcp'
);
unless ($sock) { syslog("err","Failed to notify $clientip that it's actually $node."); return; } #Give up if the node won't hear of it.
unless ($sock) { syslog("local4|err","Failed to notify $clientip that it's actually $node."); return; } #Give up if the node won't hear of it.
print $sock $restartstring;
close($sock);
@ -352,7 +352,7 @@ sub process_request {
#Update the discoverydata table to indicate the successful discovery
xCAT::DiscoveryUtils->update_discovery_data($request);
syslog("info","$node has been discovered");
syslog("local4|info","$node has been discovered");
}
1;

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

@ -205,7 +205,7 @@ sub setstate {
close($pcfg);
my $inetn = inet_aton($node);
unless ($inetn) {
syslog("local1|err","xCAT unable to resolve IP for $node in pxe plugin");
syslog("local4|err","xCAT unable to resolve IP for $node in pxe plugin");
return;
}
} else { #TODO: actually, should possibly default to xCAT image?
@ -215,12 +215,12 @@ sub setstate {
my $mactab = xCAT::Table->new('mac'); #to get all the hostnames
my %ipaddrs;
unless (inet_aton($node)) {
syslog("local1|err","xCAT unable to resolve IP in pxe plugin");
syslog("local4|err","xCAT unable to resolve IP in pxe plugin");
return;
}
my $ip = inet_ntoa(inet_aton($node));;
unless ($ip) {
syslog("local1|err","xCAT unable to resolve IP in pxe plugin");
syslog("local4|err","xCAT unable to resolve IP in pxe plugin");
return;
}
$ipaddrs{$ip} = 1;
@ -288,7 +288,6 @@ sub preprocess_request {
@args=($req->{arg});
}
@ARGV = @args;
Getopt::Long::Configure("bundling");
Getopt::Long::Configure("pass_through");
if (!GetOptions('h|?|help' => \$HELP, 'v|version' => \$VERSION) ) {
@ -326,6 +325,7 @@ sub preprocess_request {
return;
}
#my $sent = $stab->getAttribs({key=>'sharedtftp'},'value');
my @entries = xCAT::TableUtils->get_site_attribute("sharedtftp");
my $t_entry = $entries[0];
if ( defined($t_entry) and ($t_entry == 0 or $t_entry =~ /no/i)) {
@ -346,8 +346,8 @@ sub preprocess_request {
if ($req->{inittime}->[0]) {
return [$req];
}
if (@CN >0 ) { # there are computenodes then run on all servicenodes
return xCAT::Scope->get_broadcast_scope($req,@_);
if (@CN >0 ) { # if compute nodes broadcast to all servicenodes
return xCAT::Scope->get_broadcast_scope($req,@_);
}
}
return [$req];
@ -524,12 +524,12 @@ sub process_request {
foreach my $node (@nodes) {
my %ipaddrs;
unless (inet_aton($node)) {
syslog("local1|err","xCAT unable to resolve IP in pxe plugin");
syslog("local4|err","xCAT unable to resolve IP in pxe plugin");
return;
}
my $ip = inet_ntoa(inet_aton($node));;
unless ($ip) {
syslog("local1|err","xCAT unable to resolve IP in pxe plugin");
syslog("local4|err","xCAT unable to resolve IP in pxe plugin");
return;
}
$ipaddrs{$ip} = 1;

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

@ -131,7 +131,7 @@ sub setstate {
close($pcfg);
my $inetn = inet_aton($primarynode);
unless ($inetn) {
syslog("local1|err","xCAT unable to resolve IP for $node in pxe plugin");
syslog("local4|err","xCAT unable to resolve IP for $node in pxe plugin");
return;
}
} else { #TODO: actually, should possibly default to xCAT image?
@ -141,12 +141,12 @@ sub setstate {
my $mactab = xCAT::Table->new('mac'); #to get all the hostnames
my %ipaddrs;
unless (inet_aton($primarynode)) {
syslog("local1|err","xCAT unable to resolve IP in pxe plugin");
syslog("local4|err","xCAT unable to resolve IP in pxe plugin");
return;
}
my $ip = inet_ntoa(inet_aton($primarynode));;
unless ($ip) {
syslog("local1|err","xCAT unable to resolve IP in pxe plugin");
syslog("local4|err","xCAT unable to resolve IP in pxe plugin");
return;
}
$ipaddrs{$ip} = 1;

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

@ -194,7 +194,7 @@ sub setstate {
close($pcfg);
my $inetn = xCAT::NetworkUtils->getipaddr($node);
unless ($inetn) {
syslog("local1|err","xCAT unable to resolve IP for $node in yaboot plugin");
syslog("local4|err","xCAT unable to resolve IP for $node in yaboot plugin");
return;
}
} else { #TODO: actually, should possibly default to xCAT image?
@ -252,7 +252,7 @@ sub setstate {
close($pcfg);
my $inetn = xCAT::NetworkUtils->getipaddr($node);
unless ($inetn) {
syslog("local1|err","xCAT unable to resolve IP for $node in yaboot plugin");
syslog("local4|err","xCAT unable to resolve IP for $node in yaboot plugin");
return;
}
} else { #TODO: actually, should possibly default to xCAT image?
@ -261,7 +261,7 @@ sub setstate {
}
my $ip = xCAT::NetworkUtils->getipaddr($node);
unless ($ip) {
syslog("local1|err","xCAT unable to resolve IP in yaboot plugin");
syslog("local4|err","xCAT unable to resolve IP in yaboot plugin");
return;
}
my $mactab = xCAT::Table->new('mac');
@ -397,7 +397,7 @@ sub preprocess_request {
if ($req->{inittime}->[0]) {
return [$req];
}
if (@CN >0 ) { # if compute nodes broadcast to all servicenodes
if (@CN >0 ) { # if compute nodes broadcast to all servicenodes
return xCAT::Scope->get_broadcast_scope($req,@_);
}
}
@ -408,8 +408,8 @@ sub preprocess_request {
sub process_request {
$request = shift;
$callback = shift;
$sub_req = shift;
$::callback=$callback;
$sub_req = shift;
my $command = $request->{command}->[0];
%breaknetbootnodes=();
%normalnodes=();