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/02 06:52:42 UTC

[lucene-solr] 01/03: @923 Bring it back.

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 4ae3713f93b63481a1c795db5dad60115ca2605d
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Fri Oct 2 00:16:42 2020 -0500

    @923 Bring it back.
---
 .../apache/solr/cloud/OverseerElectionContext.java | 26 +++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/cloud/OverseerElectionContext.java b/solr/core/src/java/org/apache/solr/cloud/OverseerElectionContext.java
index 07e678c..893c58f 100644
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerElectionContext.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerElectionContext.java
@@ -56,19 +56,19 @@ final class OverseerElectionContext extends ShardLeaderElectionContextBase {
     // TODO: the idea here is that we could clear the Overseer queue
     // if we knew we are the first Overseer in a cluster startup
     // needs more testing in real world vs tests
-//    if (!weAreReplacement) {
-//      // kills the queues
-//      ZkDistributedQueue queue = new ZkDistributedQueue(
-//          overseer.getZkController().getZkStateReader().getZkClient(),
-//          "/overseer/queue", new Stats(), 0, new ConnectionManager.IsClosed() {
-//        public boolean isClosed() {
-//          return overseer.isClosed() || overseer.getZkController()
-//              .getCoreContainer().isShutDown();
-//        }
-//      });
-//      clearQueue(queue);
-//      clearQueue(Overseer.getInternalWorkQueue(zkClient, new Stats()));
-//    }
+    if (!weAreReplacement) {
+      // kills the queues
+      ZkDistributedQueue queue = new ZkDistributedQueue(
+          overseer.getZkController().getZkStateReader().getZkClient(),
+          "/overseer/queue", new Stats(), 0, new ConnectionManager.IsClosed() {
+        public boolean isClosed() {
+          return overseer.isClosed() || overseer.getZkController()
+              .getCoreContainer().isShutDown();
+        }
+      });
+      clearQueue(queue);
+      clearQueue(Overseer.getInternalWorkQueue(zkClient, new Stats()));
+    }
 
     log.info("Running the leader process for Overseer");