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/22 08:28:40 UTC
lucene-solr:branch_7x: SOLR-12377: Don't spin off overseer when Zk
controller is closed.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 0934e2a99 -> 68bf65c1e
SOLR-12377: Don't spin off overseer when Zk controller is closed.
enable TestLeaderElectionZkExpiry
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/68bf65c1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/68bf65c1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/68bf65c1
Branch: refs/heads/branch_7x
Commit: 68bf65c1efa4a6b8bcbaaf615c2d553c492b4a98
Parents: 0934e2a
Author: Mikhail Khludnev <mk...@apache.org>
Authored: Tue May 22 11:25:57 2018 +0300
Committer: Mikhail Khludnev <mk...@apache.org>
Committed: Tue May 22 11:28:11 2018 +0300
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
solr/core/src/java/org/apache/solr/cloud/ElectionContext.java | 2 +-
.../src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java | 1 -
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/68bf65c1/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 574e22c..aac103a 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -201,6 +201,8 @@ Bug Fixes
* SOLR-12355: Fixes hash conflict in HashJoinStream and OuterHashJoinStream (Dennis Gove)
+* SOLR-12377: Don't spin off overseer when Zk controller is closed (Mikhail Khludnev)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/68bf65c1/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 ae5c452..5ee5bdd 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
@@ -847,7 +847,7 @@ final class OverseerElectionContext extends ElectionContext {
log.warn("Wait interrupted ", e);
}
}
- if (overseer.getZkController() == null || overseer.getZkController().getCoreContainer() == null || !overseer.getZkController().getCoreContainer().isShutDown()) {
+ if (!overseer.getZkController().isClosed() && !overseer.getZkController().getCoreContainer().isShutDown()) {
overseer.start(id);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/68bf65c1/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java
index 17cfbe3..b890777 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestLeaderElectionZkExpiry.java
@@ -41,7 +41,6 @@ public class TestLeaderElectionZkExpiry extends SolrTestCaseJ4 {
private static final int MIN_NODES = 4;
@Test
- @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 17-Mar-2018
public void testLeaderElectionWithZkExpiry() throws Exception {
String zkDir = createTempDir("zkData").toFile().getAbsolutePath();
Path ccDir = createTempDir("testLeaderElectionWithZkExpiry-solr");