[lucene-solr] 04/09: @1428 Tweak cache.

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit ec1ef1291d0790e2aec573197baf0ee0dda2f3b1
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sat Mar 6 13:59:58 2021 -0600

    @1428 Tweak cache.
    
    Took 11 minutes
---
 solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java | 4 ++--
 solr/test-framework/src/java/org/apache/solr/SolrTestCase.java     | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java b/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
index 9449813..dd9f337 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
@@ -48,7 +48,7 @@ public class ZkSolrResourceLoader extends SolrResourceLoader implements Resource
   private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   private final SolrZkClient zkClient;
 
-  private static Map CONFIG_CACHE = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK) {
+  public static Map CONFIG_CACHE = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK) {
     {
       purgeBeforeRead();
       purgeBeforeWrite();
@@ -94,7 +94,7 @@ public class ZkSolrResourceLoader extends SolrResourceLoader implements Resource
         } catch (KeeperException | InterruptedException e) {
           throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, e);
         }
-        if (checkStat != null && checkStat.getVersion() <= cached.getStat().getVersion()) {
+        if (checkStat != null && checkStat.getVersion() == cached.getStat().getVersion()) {
           return new ZkSolrResourceLoader.ZkByteArrayInputStream(cached.getBytes(), cached.getStat());
         }
 
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
index bfb382f..6aec83c 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -43,6 +43,7 @@ import org.apache.lucene.util.RunListenerPrintReproduceInfo;
 import org.apache.lucene.util.TestRuleMarkFailure;
 import org.apache.solr.client.solrj.impl.Http2SolrClient;
 import org.apache.solr.client.solrj.impl.HttpClientUtil;
+import org.apache.solr.cloud.ZkSolrResourceLoader;
 import org.apache.solr.common.AlreadyClosedException;
 import org.apache.solr.common.ParWork;
 import org.apache.solr.common.ParWorkExecutor;
@@ -590,6 +591,7 @@ public class SolrTestCase extends Assert {
       Http2SolrClient.resetSslContextFactory();
       TestInjection.reset();
       JSONTestUtil.failRepeatedKeys = false;
+      ZkSolrResourceLoader.CONFIG_CACHE.clear();
       random = null;
       reusedKeys = null;
       sslConfig = null;