From e1c55be4fff5ac5943c0e4779b6715798991c49a Mon Sep 17 00:00:00 2001 From: lissav Date: Fri, 18 Oct 2013 07:50:22 -0400 Subject: [PATCH] defect 3844 --- xCAT-server/lib/xcat/plugins/destiny.pm | 4 ++-- xCAT-server/lib/xcat/plugins/nodediscover.pm | 4 ++-- xCAT-server/lib/xcat/plugins/pxe.pm | 16 ++++++++-------- xCAT-server/lib/xcat/plugins/vsmppxe.pm | 6 +++--- xCAT-server/lib/xcat/plugins/yaboot.pm | 10 +++++----- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/destiny.pm b/xCAT-server/lib/xcat/plugins/destiny.pm index 538cda78b..a29818908 100644 --- a/xCAT-server/lib/xcat/plugins/destiny.pm +++ b/xCAT-server/lib/xcat/plugins/destiny.pm @@ -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 diff --git a/xCAT-server/lib/xcat/plugins/nodediscover.pm b/xCAT-server/lib/xcat/plugins/nodediscover.pm index bd828f8c8..34724164b 100644 --- a/xCAT-server/lib/xcat/plugins/nodediscover.pm +++ b/xCAT-server/lib/xcat/plugins/nodediscover.pm @@ -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; diff --git a/xCAT-server/lib/xcat/plugins/pxe.pm b/xCAT-server/lib/xcat/plugins/pxe.pm index 1247b76ec..23aa71ec4 100644 --- a/xCAT-server/lib/xcat/plugins/pxe.pm +++ b/xCAT-server/lib/xcat/plugins/pxe.pm @@ -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; diff --git a/xCAT-server/lib/xcat/plugins/vsmppxe.pm b/xCAT-server/lib/xcat/plugins/vsmppxe.pm index 8bf893bf8..4d157ccd5 100644 --- a/xCAT-server/lib/xcat/plugins/vsmppxe.pm +++ b/xCAT-server/lib/xcat/plugins/vsmppxe.pm @@ -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; diff --git a/xCAT-server/lib/xcat/plugins/yaboot.pm b/xCAT-server/lib/xcat/plugins/yaboot.pm index b68699dd3..fda2ccb33 100644 --- a/xCAT-server/lib/xcat/plugins/yaboot.pm +++ b/xCAT-server/lib/xcat/plugins/yaboot.pm @@ -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=();