[lucene-solr] branch reference_impl_dev updated: @697 We can still stop watching a collection we actually still care about and is local.

[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


The following commit(s) were added to refs/heads/reference_impl_dev by this push:
     new ba69288  @697 We can still stop watching a collection we actually still care about and is local.
ba69288 is described below

commit ba69288b4a27bdd4a16ab27eeedfdd2479572672
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Wed Sep 2 06:22:59 2020 -0500

    @697 We can still stop watching a collection we actually still care about and is local.
---
 .../src/java/org/apache/solr/common/cloud/ZkStateReader.java  | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index 78704f7..38fa54d 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -1546,8 +1546,7 @@ public class ZkStateReader implements SolrCloseable {
     collectionWatches.compute(collection, (k, v) -> {
       if (v == null)
         return null;
-      if (v.coreRefCount.get() > 0)
-        v.coreRefCount.decrementAndGet();
+      v.coreRefCount.decrementAndGet();
       if (v.canBeRemoved()) {
         watchedCollectionStates.remove(collection);
         lazyCollectionStates.put(collection, new LazyCollectionRef(collection));
@@ -1868,10 +1867,10 @@ public class ZkStateReader implements SolrCloseable {
     }
 
     // Resolve race with unregisterCore.
-    if (!collectionWatches.containsKey(coll)) {
-      watchedCollectionStates.remove(coll);
-      log.debug("Removing uninteresting collection [{}]", coll);
-    }
+//    if (!collectionWatches.containsKey(coll)) {
+//      watchedCollectionStates.remove(coll);
+//      log.debug("Removing uninteresting collection [{}]", coll);
+//    }
 
     return updated;
   }