[lucene-solr] branch reference_impl_dev updated: @1021 Tweak for close.

[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 51ae317  @1021 Tweak for close.
51ae317 is described below

commit 51ae31732722a25cc24b526411b83b62e2f03fda
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sat Oct 17 14:06:56 2020 -0500

    @1021 Tweak for close.
---
 solr/core/src/java/org/apache/solr/cloud/Overseer.java           | 2 +-
 solr/core/src/java/org/apache/solr/cloud/ZkDistributedQueue.java | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
index 3b2583b..d2836b2 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -748,7 +748,7 @@ public class Overseer implements SolrCloseable {
 
     systemCollectionCompatCheck(new StringBiConsumer());
 
-    // TODO: don't track for a moment, can leak out of collection api tests 
+    // TODO: don't track for a moment, can leak out of collection api tests
     // assert ObjectReleaseTracker.track(this);
   }
 
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkDistributedQueue.java b/solr/core/src/java/org/apache/solr/cloud/ZkDistributedQueue.java
index 893556a..9b38a34 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkDistributedQueue.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkDistributedQueue.java
@@ -487,8 +487,7 @@ public class ZkDistributedQueue implements DistributedQueue {
               ParWork.propagateInterrupt(e);
               throw new AlreadyClosedException();
             }
-            if (timeout.hasTimedOut()) {
-              //throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Timeout");
+            if (timeout.hasTimedOut() || zookeeper.isClosed() || !zookeeper.isConnected()) {
               return Collections.emptyList();
             }
           }