You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/01/11 08:01:23 UTC
[47/50] [abbrv] lucene-solr:jira/solr-11702: SOLR-10995: Improve
ChaosMonkey logic to find Jetty running leader node
SOLR-10995: Improve ChaosMonkey logic to find Jetty running leader node
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6a55def1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6a55def1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6a55def1
Branch: refs/heads/jira/solr-11702
Commit: 6a55def1ead44fcd3c3640ead7bb4040db86f8c7
Parents: 077e8b1
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Authored: Tue Jan 9 22:58:22 2018 -0800
Committer: Tomas Fernandez Lobbe <tf...@apache.org>
Committed: Tue Jan 9 22:58:22 2018 -0800
----------------------------------------------------------------------
.../src/java/org/apache/solr/cloud/ChaosMonkey.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6a55def1/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
----------------------------------------------------------------------
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java b/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
index abb6255..71e1b43 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/ChaosMonkey.java
@@ -418,11 +418,7 @@ public class ChaosMonkey {
CoreContainer cc = cjetty.jetty.getCoreContainer();
if (cc != null) {
try (SolrCore core = cc.getCore(leader.getStr(ZkStateReader.CORE_NAME_PROP))) {
- if (core == null) {
- monkeyLog("selected jetty not running correctly - skip");
- return null;
- }
- rtIsLeader = core.getCoreDescriptor().getCloudDescriptor().isLeader();
+ rtIsLeader = core != null && core.getCoreDescriptor().getCloudDescriptor().isLeader();
}
} else {
return null;