From 95c0a1000d326ebab4189bd204eb8f6a1411d726 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 27 Aug 2009 19:57:41 +0000
Subject: [PATCH] -Fix sf bug 2845378, stale cache data being returned in
 noderange expansions

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4057 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/NodeRange.pm |  2 ++
 perl-xCAT/xCAT/Table.pm     | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/perl-xCAT/xCAT/NodeRange.pm b/perl-xCAT/xCAT/NodeRange.pm
index 7ae3c5117..2acfda798 100644
--- a/perl-xCAT/xCAT/NodeRange.pm
+++ b/perl-xCAT/xCAT/NodeRange.pm
@@ -397,6 +397,7 @@ sub extnoderange { #An extended noderange function.  Needed as the more straight
         $return->{intersectinggroups}=[sort keys %grouphash];
     }
     $retaincache=0;
+    $nodelist->_clear_cache();
     undef ($nodelist);
     @allnodeset=();
     return $return;
@@ -523,6 +524,7 @@ sub noderange {
         $recurselevel--;
     } else {
         unless ($retaincache) {
+            $nodelist->_clear_cache();
             undef $nodelist;
             @allnodeset=();
         }
diff --git a/perl-xCAT/xCAT/Table.pm b/perl-xCAT/xCAT/Table.pm
index a452325e2..3c6ffbd4b 100644
--- a/perl-xCAT/xCAT/Table.pm
+++ b/perl-xCAT/xCAT/Table.pm
@@ -216,6 +216,8 @@ sub handle_dbc_request {
          return $opentables{$tablename}->{$autocommit}->_set_use_cache(@args);
     } elsif ($functionname eq '_build_cache') {
          return $opentables{$tablename}->{$autocommit}->_build_cache(@args);
+    } elsif ($functionname eq '_clear_cache') {
+         return $opentables{$tablename}->{$autocommit}->_clear_cache(@args);
     } else {
         die "undefined function $functionname";
     }
@@ -1367,16 +1369,32 @@ sub getNodesAttribs {
         my @nodeentries=$self->getNodeAttribs($_,\@attribs);
         $rethash->{$_} = \@nodeentries; #$self->getNodeAttribs($_,\@attribs);
     }
+    $self->_clear_cache;
     $self->{_use_cache} = 0;
+    $self->{nodelist}->_clear_cache;
     $self->{nodelist}->{_use_cache} = 0;
     return $rethash;
 }
 
+sub _clear_cache { #PRIVATE FUNCTION TO EXPIRE CACHED DATA EXPLICITLY
+    #This is no longer sufficient to do at destructor time, as Table objects actually live an indeterminite amount of time now
+    my $self = shift;
+    if ($dbworkerpid) {
+        return dbc_call($self,'_clear_cache',$_);
+    }
+    $self->{_use_cache}=0; # Signal slow operation to any in-flight operations that may fail with empty cache
+    undef $self->{_tablecache};
+    undef $self->{_nodecache};
+}
+
 sub _build_cache { #PRIVATE FUNCTION, PLEASE DON'T CALL DIRECTLY
     my $self = shift;
     if ($dbworkerpid) {
         return dbc_call($self,'_build_cache',@_);
     }
+    my $oldusecache = $self->{_use_cache}; #save previous 'use_cache' setting
+    $self->{_use_cache} = 0; #This function must disable cache 
+                            #to function
     my $attriblist = shift;
     unless (grep /^node$/,@$attriblist) {
         push @$attriblist,'node';
@@ -1390,6 +1408,7 @@ sub _build_cache { #PRIVATE FUNCTION, PLEASE DON'T CALL DIRECTLY
         }
     }
 
+    $self->{_use_cache} = $oldusecache; #Restore setting to previous value
     $self->{_cachestamp} = time;
 }
 #--------------------------------------------------------------------------