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

-yaboot configuration requests propogated to all xcatd instances, ignored if not directly reachable

Browse Source 
-Factor out common broadcast scope to xCAT::Scope


git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@380 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2008-02-03 00:01:35 +00:00
parent a4c0b58fe8
commit e452d1d7b0
2 changed files with 74 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
perl-xCAT-2.0/xCAT/Scope.pm Normal file
View File

@ -0,0 +1,27 @@
package xCAT::Scope;
use xCAT::Utils;
use xCAT::Table;
sub get_broadcast_scope {
my $req = shift;
if ($req =~ /xCAT::Scope/) {
$req = shift;
}
$callback = shift;
if ($req->{_xcatdest}) { return [$req]; } #Exit if the packet has been preprocessed in its history
my @requests = ({%$req}); #Start with a straight copy to reflect local instance
my $sitetab = xCAT::Table->new('site');
(my $ent) = $sitetab->getAttribs({key=>'xcatservers'},'value');
$sitetab->close;
if ($ent and $ent->{value}) {
foreach (split /,/,$ent->{value}) {
if (xCAT::Utils->thishostisnot($_)) {
my $reqcopy = {%$req};
$reqcopy->{'_xcatdest'} = $_;
push @requests,$reqcopy;
}
}
}
return \@requests;
}
1;

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

@ -2,6 +2,7 @@
package xCAT_plugin::yaboot;
use Data::Dumper;
use Sys::Syslog;
use xCAT::Scope;
use Socket;
my $request;
@ -127,39 +128,42 @@ sub pass_along {
sub preprocess_request {
my $req = shift;
my $callback = shift;
my %localnodehash;
my %dispatchhash;
my $nrtab = xCAT::Table->new('noderes');
foreach my $node (@{$req->{node}}) {
my $nodeserver;
my $tent = $nrtab->getNodeAttribs($node,['tftpserver']);
if ($tent) { $nodeserver = $tent->{tftpserver} }
unless ($tent and $tent->{tftpserver}) {
$tent = $nrtab->getNodeAttribs($node,['servicenode']);
if ($tent) { $nodeserver = $tent->{servicenode} }
}
if ($nodeserver) {
$dispatchhash{$nodeserver}->{$node} = 1;
} else {
$localnodehash{$node} = 1;
}
}
my @requests;
my $reqc = {%$req};
$reqc->{node} = [ keys %localnodehash ];
if (scalar(@{$reqc->{node}})) { push @requests,$reqc }
foreach my $dtarg (keys %dispatchhash) { #iterate dispatch targets
my $reqcopy = {%$req}; #deep copy
$reqcopy->{'_xcatdest'} = $dtarg;
$reqcopy->{node} = [ keys %{$dispatchhash{$dtarg}}];
push @requests,$reqcopy;
}
return \@requests;
return xCAT::Scope->get_broadcast_scope(@_);
}
#sub preprocess_request {
# my $req = shift;
# my $callback = shift;
# my %localnodehash;
# my %dispatchhash;
# my $nrtab = xCAT::Table->new('noderes');
# foreach my $node (@{$req->{node}}) {
# my $nodeserver;
# my $tent = $nrtab->getNodeAttribs($node,['tftpserver']);
# if ($tent) { $nodeserver = $tent->{tftpserver} }
# unless ($tent and $tent->{tftpserver}) {
# $tent = $nrtab->getNodeAttribs($node,['servicenode']);
# if ($tent) { $nodeserver = $tent->{servicenode} }
# }
# if ($nodeserver) {
# $dispatchhash{$nodeserver}->{$node} = 1;
# } else {
# $localnodehash{$node} = 1;
# }
# }
# my @requests;
# my $reqc = {%$req};
# $reqc->{node} = [ keys %localnodehash ];
# if (scalar(@{$reqc->{node}})) { push @requests,$reqc }
#
# foreach my $dtarg (keys %dispatchhash) { #iterate dispatch targets
# my $reqcopy = {%$req}; #deep copy
# $reqcopy->{'_xcatdest'} = $dtarg;
# $reqcopy->{node} = [ keys %{$dispatchhash{$dtarg}}];
# push @requests,$reqcopy;
# }
# return \@requests;
#}
#
sub process_request {
@ -168,18 +172,25 @@ sub process_request {
$sub_req = shift;
my @args;
my @nodes;
my @rnodes;
if (ref($request->{node})) {
@nodes = @{$request->{node}};
@rnodes = @{$request->{node}};
} else {
if ($request->{node}) { @nodes = ($request->{node}); }
if ($request->{node}) { @rnodes = ($request->{node}); }
}
unless (@nodes) {
unless (@rnodes) {
if ($usage{$request->{command}->[0]}) {
$callback->({data=>$usage{$request->{command}->[0]}});
}
return;
}
@nodes = ();
foreach (@rnodes) {
if (xCAT::Utils->nodeonmynet($_)) {
push @nodes,$_;
}
}
if (ref($request->{arg})) {
@args=@{$request->{arg}};
} else {