You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/10/12 21:30:04 UTC

[lucene-solr] 04/05: @974 Stop watcher process executor before closing zookeeper object.

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 c32844e5dee5f332f2b20803035a8ce1b7f3607a
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Mon Oct 12 16:14:09 2020 -0500

    @974 Stop watcher process executor before closing zookeeper object.
---
 .../src/java/org/apache/solr/common/cloud/ConnectionManager.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
index 63f3ee3..6c40616 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
@@ -340,15 +340,14 @@ public class ConnectionManager implements Watcher, Closeable {
     this.likelyExpiredState = LikelyExpiredState.EXPIRED;
 
 
-
+    client.zkCallbackExecutor.shutdown();
     client.zkConnManagerCallbackExecutor.shutdown();
     if (keeper != null) {
       keeper.close();
     }
     keeper = null;
-    client.zkCallbackExecutor.shutdown();
+
     ExecutorUtil.awaitTermination(client.zkCallbackExecutor);
-  //  client.zkConnManagerCallbackExecutor.shutdownNow();
     ExecutorUtil.awaitTermination(client.zkConnManagerCallbackExecutor);
 
     assert ObjectReleaseTracker.release(this);