From 2c8f39959887060b8ca0d51c7e5bf9229e858a40 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 26 Apr 2011 16:48:35 +0000
Subject: [PATCH] -Second stab at nodelist criteria in noderange
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9403 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
perl-xCAT/xCAT/NodeRange.pm | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/perl-xCAT/xCAT/NodeRange.pm b/perl-xCAT/xCAT/NodeRange.pm
index b36d5a5e3..de8642198 100644
--- a/perl-xCAT/xCAT/NodeRange.pm
+++ b/perl-xCAT/xCAT/NodeRange.pm
@@ -39,6 +39,7 @@ my %allgrphash;
my $retaincache=0;
my $recurselevel=0;
+my @cachedcolumns;
#TODO: With a very large nodelist (i.e. 65k or so), deriving the members
# of a group is a little sluggish. We may want to put in a mechanism to
# maintain a two-way hash anytime nodelist or nodegroup changes, allowing
@@ -129,6 +130,21 @@ sub nodesbycriteria {
foreach $tab (keys %tables) {
my $tabh = xCAT::Table->new($tab,-create=>0);
unless ($tabh) { next; }
+ if ($tab eq "nodelist") { #fun caching interaction
+ my $neednewcache=0;
+ foreach (@cols) {
+ unless (grep /^$_\z/,@cachedcolumns) {
+ $neednewcache=1;
+ push @cachedcolumns,$_;
+ }
+ }
+ if ($neednewcache) {
+ if ($nodelist) {
+ $nodelist->_clear_cache();
+ $nodelist->_build_cache(\@cachedcolumns);
+ }
+ }
+ }
my @cols;
foreach (@{$tables{$tab}}) {
push @cols, $_->[0];
@@ -518,7 +534,8 @@ sub noderange {
unless ($nodelist) {
$nodelist =xCAT::Table->new('nodelist',-create =>1);
$nodelist->_set_use_cache(0); #TODO: a more proper external solution
- $nodelist->_build_cache(['node','groups']);
+ @cachedcolumns = ('node','groups');
+ $nodelist->_build_cache(\@cachedcolumns);
$nodelist->_set_use_cache(1); #TODO: a more proper external solution
}
my %nodes = ();