You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2018/05/29 19:52:59 UTC
lucene-solr:master: Don't restart Overseer when picking a node
randomly. Enable this test for now.
Repository: lucene-solr
Updated Branches:
refs/heads/master 7ce6dbda1 -> 64e4dda64
Don't restart Overseer when picking a node randomly. Enable this test for now.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/64e4dda6
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/64e4dda6
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/64e4dda6
Branch: refs/heads/master
Commit: 64e4dda64ec38608deca5c526b340137cad7d4b8
Parents: 7ce6dbd
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Tue May 29 21:52:31 2018 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Tue May 29 21:52:31 2018 +0200
----------------------------------------------------------------------
.../admin/AutoscalingHistoryHandlerTest.java | 33 ++++++++++++++++----
1 file changed, 27 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/64e4dda6/solr/core/src/test/org/apache/solr/handler/admin/AutoscalingHistoryHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/AutoscalingHistoryHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/AutoscalingHistoryHandlerTest.java
index 23959fd..589e2b5 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/AutoscalingHistoryHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/AutoscalingHistoryHandlerTest.java
@@ -134,7 +134,7 @@ public class AutoscalingHistoryHandlerTest extends SolrCloudTestCase {
"'name' : '" + PREFIX + "_node_added_trigger'," +
"'event' : 'nodeAdded'," +
"'waitFor' : '0s'," +
- "'enabled' : true," +
+ "'enabled' : false," +
"'actions' : [" +
"{'name':'compute_plan','class':'solr.ComputePlanAction'}," +
"{'name':'execute_plan','class':'solr.ExecutePlanAction'}," +
@@ -151,7 +151,7 @@ public class AutoscalingHistoryHandlerTest extends SolrCloudTestCase {
"'name' : '" + PREFIX + "_node_lost_trigger'," +
"'event' : 'nodeLost'," +
"'waitFor' : '0s'," +
- "'enabled' : true," +
+ "'enabled' : false," +
"'actions' : [" +
"{'name':'compute_plan','class':'solr.ComputePlanAction'}," +
"{'name':'execute_plan','class':'solr.ExecutePlanAction'}," +
@@ -234,6 +234,24 @@ public class AutoscalingHistoryHandlerTest extends SolrCloudTestCase {
response = solrClient.request(req);
assertEquals(response.get("result").toString(), "success");
+ // setup is complete, enable the triggers
+ String resumeTriggerCommand = "{" +
+ "'resume-trigger' : {" +
+ "'name' : '" + PREFIX + "_node_added_trigger'," +
+ "}" +
+ "}";
+ req = createAutoScalingRequest(SolrRequest.METHOD.POST, resumeTriggerCommand);
+ response = solrClient.request(req);
+ assertEquals(response.get("result").toString(), "success");
+ resumeTriggerCommand = "{" +
+ "'resume-trigger' : {" +
+ "'name' : '" + PREFIX + "_node_lost_trigger'," +
+ "}" +
+ "}";
+ req = createAutoScalingRequest(SolrRequest.METHOD.POST, resumeTriggerCommand);
+ response = solrClient.request(req);
+ assertEquals(response.get("result").toString(), "success");
+
}
private void resetLatches() {
@@ -242,7 +260,7 @@ public class AutoscalingHistoryHandlerTest extends SolrCloudTestCase {
}
@Test
- @BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 09-Apr-2018
+ //@BadApple(bugUrl="https://issues.apache.org/jira/browse/SOLR-12028") // 09-Apr-2018
public void testHistory() throws Exception {
waitForState("Timed out wait for collection be active", COLL_NAME,
clusterShape(1, 3));
@@ -314,12 +332,15 @@ public class AutoscalingHistoryHandlerTest extends SolrCloudTestCase {
// reset latches
resetLatches();
- // kill a node where a replica exists
+ // kill a node where a replica exists - BUT not the Overseer
+ NamedList<Object> overSeerStatus = cluster.getSolrClient().request(CollectionAdminRequest.getOverseerStatus());
+ String overseerLeader = (String) overSeerStatus.get("leader");
ClusterState state = cluster.getSolrClient().getZkStateReader().getClusterState();
DocCollection coll = state.getCollection(COLL_NAME);
String nodeToKill = null;
for (Replica r : coll.getReplicas()) {
- if (r.isActive(state.getLiveNodes())) {
+ if (r.isActive(state.getLiveNodes()) &&
+ !r.getNodeName().equals(overseerLeader)) {
nodeToKill = r.getNodeName();
break;
}
@@ -351,7 +372,7 @@ public class AutoscalingHistoryHandlerTest extends SolrCloudTestCase {
query = params(CommonParams.QT, CommonParams.AUTOSCALING_HISTORY_PATH,
AutoscalingHistoryHandler.TRIGGER_PARAM, PREFIX + "_node_lost_trigger");
docs = solrClient.query(query).getResults();
- assertEquals(8, docs.size());
+ assertEquals(docs.toString(), 8, docs.size());
query = params(CommonParams.QT, CommonParams.AUTOSCALING_HISTORY_PATH,
AutoscalingHistoryHandler.TRIGGER_PARAM, PREFIX + "_node_lost_trigger",