lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject [2/2] lucene-solr:branch_6x: SOLR-9846: Don't run Overseer threads if CoreContainer is shutdown.
Date Wed, 22 Feb 2017 17:23:16 GMT
SOLR-9846: Don't run Overseer threads if CoreContainer is shutdown.


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

Branch: refs/heads/branch_6x
Commit: 20cac581713ee26af029aaa93e708eade65a2bd1
Parents: 4de034a
Author: markrmiller <markrmiller@apache.org>
Authored: Sun Feb 19 14:18:04 2017 -0500
Committer: markrmiller <markrmiller@apache.org>
Committed: Wed Feb 22 12:21:15 2017 -0500

----------------------------------------------------------------------
 solr/core/src/java/org/apache/solr/cloud/ElectionContext.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/20cac581/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java b/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
index 3db6950..6c073b9 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
@@ -744,8 +744,9 @@ final class OverseerElectionContext extends ElectionContext {
         log.warn("Wait interrupted ", e);
       }
     }
-    
-    overseer.start(id);
+    if (overseer.getZkController() == null || overseer.getZkController().getCoreContainer()
== null || !overseer.getZkController().getCoreContainer().isShutDown()) {
+      overseer.start(id);
+    }
   }
   
   @Override


Mime
View raw message