You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mk...@apache.org on 2018/05/16 10:13:10 UTC

lucene-solr:branch_7x: SOLR-12200: abandon OverseerExitThread when ZkController is closed.

Repository: lucene-solr
Updated Branches:
  refs/heads/branch_7x b4239ed51 -> a238f393f


SOLR-12200: abandon OverseerExitThread when ZkController is closed.


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a238f393
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a238f393
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a238f393

Branch: refs/heads/branch_7x
Commit: a238f393fb239e4023ed01bf9c75de006268be7d
Parents: b4239ed
Author: Mikhail Khludnev <mk...@apache.org>
Authored: Wed May 16 11:07:23 2018 +0300
Committer: Mikhail Khludnev <mk...@apache.org>
Committed: Wed May 16 13:14:13 2018 +0300

----------------------------------------------------------------------
 solr/CHANGES.txt                                           | 2 ++
 solr/core/src/java/org/apache/solr/cloud/Overseer.java     | 4 +++-
 solr/core/src/java/org/apache/solr/cloud/ZkController.java | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a238f393/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index cd58f3d..2334dd8 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -194,6 +194,8 @@ Bug Fixes
 * SOLR-12307: exiting OverseerTriggerThread without endless noise in log when Zookeeper session is expired
   (Mikhail Khludnev) 
 
+* SOLR-12200: abandon OverseerExitThread when ZkController is closed. (Mikhail Khludnev) 
+
 Optimizations
 ----------------------
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a238f393/solr/core/src/java/org/apache/solr/cloud/Overseer.java
----------------------------------------------------------------------
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 760433c..2c66699 100644
--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java
+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java
@@ -298,7 +298,9 @@ public class Overseer implements SolrCloseable {
     }
 
     private void checkIfIamStillLeader() {
-      if (zkController != null && zkController.getCoreContainer().isShutDown()) return;//shutting down no need to go further
+      if (zkController != null && (zkController.getCoreContainer().isShutDown() || zkController.isClosed())) {
+        return;//shutting down no need to go further
+      }
       org.apache.zookeeper.data.Stat stat = new org.apache.zookeeper.data.Stat();
       String path = OVERSEER_ELECT + "/leader";
       byte[] data;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a238f393/solr/core/src/java/org/apache/solr/cloud/ZkController.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index 8cd02b6..367a131 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -699,6 +699,10 @@ public class ZkController {
     return zkServerAddress;
   }
 
+  boolean isClosed() {
+    return isClosed;
+  }
+
   /**
    * Create the zknodes necessary for a cluster to operate
    *