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

-Optimize Table 'getAllNodeAttribs' function. makeconservercf now takes 1 second on 500 nodes, and less than 10 for 10,0000 on my test system

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1860 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2008-07-10 13:40:32 +00:00
parent 4fd9a21a84
commit 15409f472c
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
perl-xCAT/xCAT/Table.pm
View File

@ -930,7 +930,9 @@ sub getNodesAttribs {
sub _build_cache { #PRIVATE FUNCTION, PLEASE DON'T CALL DIRECTLY
my $self = shift;
my $attriblist = shift;
push @$attriblist,'node';
unless (grep /^node$/,@$attriblist) {
push @$attriblist,'node';
}
my @tabcache = $self->getAllAttribs(@$attriblist);
$self->{_tablecache} = \@tabcache;
$self->{_nodecache} = {};
@ -1318,6 +1320,12 @@ sub getAllNodeAttribs
. " WHERE \"disable\" is NULL or \"disable\" in ('','0','no','NO','no')");
$query->execute();
xCAT::NodeRange::retain_cache(1);
$self->{_use_cache} = 0;
$self->{nodelist}->{_use_cache}=0;
$self->_build_cache($attribq);
$self->{nodelist}->_build_cache(['node','groups']);
$self->{_use_cache} = 1;
$self->{nodelist}->{_use_cache}=1;
while (my $data = $query->fetchrow_hashref())
{
@ -1326,7 +1334,7 @@ sub getAllNodeAttribs
my @nodes =
xCAT::NodeRange::noderange($data->{node})
; #expand node entry, to make groups expand
my $localhash = $self->getNodesAttribs(\@nodes,$attribq);
#my $localhash = $self->getNodesAttribs(\@nodes,$attribq); #NOTE: This is stupid, rebuilds the cache for every entry, FIXME
foreach (@nodes)
{
if ($donenodes{$_}) { next; }
@ -1340,7 +1348,7 @@ sub getAllNodeAttribs
# }
#} else {
my @attrs =
@{$localhash->{$_}} #$self->getNodeAttribs($_, $attribq)
$self->getNodeAttribs($_, $attribq);#@{$localhash->{$_}} #$self->getNodeAttribs($_, $attribq)
; #Logic moves to getNodeAttribs
#}
#populate node attribute by default, this sort of expansion essentially requires it.
@ -1353,6 +1361,8 @@ sub getAllNodeAttribs
}
}
}
$self->{_use_cache} = 0;
$self->{nodelist}->{_use_cache} = 0;
xCAT::NodeRange::retain_cache(0);
$query->finish();
return @results;
@ -1389,6 +1399,7 @@ sub getAllAttribs
#Takes a list of attributes, returns all records in the table.
my $self = shift;
#print "Being asked to dump ".$self->{tabname}."for something\n";
my @attribs = @_;
my @results = ();
if ($self->{_use_cache}) {