defect 3844
This commit is contained in:
parent
0ea77b281a
commit
47a5a4c536
@ -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
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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');
|
||||
|
Loading…
Reference in New Issue
Block a user