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

When doing getAllNodeAttribs, institute a noderange result cache to avoid many noderange() calls

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@12644 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2012-05-11 19:33:00 +00:00
parent c122edd400
commit df89dee4c6
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2938,6 +2938,7 @@ sub getAllNodeAttribs
}
my $attribq = shift;
my $hashretstyle = shift;
my %options=@_;
my $rethash;
my @results = ();
my %donenodes
@ -2956,10 +2957,12 @@ sub getAllNodeAttribs
$query = $self->{dbh}->prepare($qstring);
$query->execute();
xCAT::NodeRange::retain_cache(1);
unless (%options{prefetchcache}) {
$self->{_use_cache} = 0;
$self->{nodelist}->{_use_cache}=0;
$self->_clear_cache();
$self->{nodelist}->_clear_cache();
}
$self->_build_cache($attribq);
$self->{nodelist}->_build_cache(['node','groups']);
$self->{_use_cache} = 1;
@ -2969,9 +2972,14 @@ sub getAllNodeAttribs
unless ($data->{$nodekey} =~ /^$/ || !defined($data->{$nodekey}))
{ #ignore records without node attrib, not possible?
my @nodes =
xCAT::NodeRange::noderange($data->{$nodekey})
; #expand node entry, to make groups expand
my @nodes;
unless ($self->{nrcache}->{$data->{$nodekey}} and (($self->{nrcache}->{$data->{$nodekey}}->{tstamp} + 5) > time())) {
my @cnodes = xCAT::NodeRange::noderange($data->{$nodekey});
$self->{nrcache}->{$data->{$nodekey}}->{value} = \@cnodes;
$self->{nrcache}->{$data->{$nodekey}}->{tstamp} = time();
}
@nodes = @{$self->{nrcache}->{$data->{$nodekey}}->{value}}; #expand node entry, to make groups expand
unless (@nodes) { #in the event of an entry not in nodelist, use entry value verbatim
@nodes = ($data->{$nodekey});
}

2
perl-xCAT/xCAT/Utils.pm
View File

@ -3896,7 +3896,7 @@ sub isSN
return 0;
}
my @nodes = $servicenodetab->getAllNodeAttribs(['tftpserver']);
my @nodes = $servicenodetab->getAllNodeAttribs(['tftpserver'],undef,prefetchcache=>1);
$servicenodetab->close;
foreach my $nodes (@nodes)
{