From 834e1469182430f66e478aea70a70afe09b28dab Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Mon, 25 Apr 2011 21:06:16 +0000 Subject: [PATCH] It's 5:00 and the last checkin broke, so revert git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9398 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/NodeRange.pm | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/perl-xCAT/xCAT/NodeRange.pm b/perl-xCAT/xCAT/NodeRange.pm index cccff4a2b..b36d5a5e3 100644 --- a/perl-xCAT/xCAT/NodeRange.pm +++ b/perl-xCAT/xCAT/NodeRange.pm @@ -39,7 +39,6 @@ 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 @@ -130,22 +129,6 @@ 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]; @@ -535,8 +518,7 @@ sub noderange { unless ($nodelist) { $nodelist =xCAT::Table->new('nodelist',-create =>1); $nodelist->_set_use_cache(0); #TODO: a more proper external solution - @cachedcolumns = ('node','groups'); - $nodelist->_build_cache(\@cachedcolumns); + $nodelist->_build_cache(['node','groups']); $nodelist->_set_use_cache(1); #TODO: a more proper external solution } my %nodes = ();