You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/03/24 12:14:31 UTC
lucene-solr:feature/autoscaling: SOLR-10339: Default actions were not
being persisted to Zookeeper
Repository: lucene-solr
Updated Branches:
refs/heads/feature/autoscaling 0fb9d1bd1 -> c98909bca
SOLR-10339: Default actions were not being persisted to Zookeeper
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c98909bc
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c98909bc
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c98909bc
Branch: refs/heads/feature/autoscaling
Commit: c98909bcac97d2acad569be3110f2ce41a0ba933
Parents: 0fb9d1b
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Fri Mar 24 17:44:23 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Fri Mar 24 17:44:23 2017 +0530
----------------------------------------------------------------------
.../cloud/autoscaling/AutoScalingHandler.java | 1 +
.../autoscaling/AutoScalingHandlerTest.java | 28 ++++++--------------
2 files changed, 9 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c98909bc/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java
index 978299e..4fee59c 100644
--- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java
+++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/AutoScalingHandler.java
@@ -239,6 +239,7 @@ public class AutoScalingHandler extends RequestHandlerBase implements Permission
List<Map<String, String>> actions = (List<Map<String, String>>) op.getVal("actions");
if (actions == null) {
actions = DEFAULT_ACTIONS;
+ op.getDataMap().put("actions", actions);
}
// validate that we can load all the actions
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c98909bc/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java
index c08e6b4..381c758 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java
@@ -20,6 +20,7 @@ package org.apache.solr.cloud.autoscaling;
import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
+import java.util.List;
import java.util.Map;
import org.apache.solr.client.solrj.SolrClient;
@@ -66,10 +67,6 @@ public class AutoScalingHandlerTest extends SolrCloudTestCase {
"\t\t\t\t\"class\" : \"solr.ComputePlanAction\"\n" +
"\t\t\t},\n" +
"\t\t\t{\n" +
- "\t\t\t\t\"name\" : \"execute_plan\",\n" +
- "\t\t\t\t\"class\" : \"solr.ExecutePlanAction\"\n" +
- "\t\t\t},\n" +
- "\t\t\t{\n" +
"\t\t\t\t\"name\" : \"log_plan\",\n" +
"\t\t\t\t\"class\" : \"solr.LogPlanAction\",\n" +
"\t\t\t\t\"collection\" : \".system\"\n" +
@@ -90,6 +87,9 @@ public class AutoScalingHandlerTest extends SolrCloudTestCase {
assertTrue(triggers.containsKey("node_lost_trigger"));
Map<String, Object> nodeLostTrigger = (Map<String, Object>) triggers.get("node_lost_trigger");
assertEquals(4, nodeLostTrigger.size());
+ List<Map<String, String>> actions = (List<Map<String, String>>) nodeLostTrigger.get("actions");
+ assertNotNull(actions);
+ assertEquals(2, actions.size());
assertEquals("600", nodeLostTrigger.get("waitFor").toString());
setTriggerCommand = "{\n" +
@@ -97,22 +97,7 @@ public class AutoScalingHandlerTest extends SolrCloudTestCase {
"\t\t\"name\" : \"node_lost_trigger\",\n" +
"\t\t\"event\" : \"nodeLost\",\n" +
"\t\t\"waitFor\" : \"20m\",\n" +
- "\t\t\"enabled\" : \"false\",\n" +
- "\t\t\"actions\" : [\n" +
- "\t\t\t{\n" +
- "\t\t\t\t\"name\" : \"compute_plan\",\n" +
- "\t\t\t\t\"class\" : \"solr.ComputePlanAction\"\n" +
- "\t\t\t},\n" +
- "\t\t\t{\n" +
- "\t\t\t\t\"name\" : \"execute_plan\",\n" +
- "\t\t\t\t\"class\" : \"solr.ExecutePlanAction\"\n" +
- "\t\t\t},\n" +
- "\t\t\t{\n" +
- "\t\t\t\t\"name\" : \"log_plan\",\n" +
- "\t\t\t\t\"class\" : \"solr.LogPlanAction\",\n" +
- "\t\t\t\t\"collection\" : \".system\"\n" +
- "\t\t\t}\n" +
- "\t\t]\n" +
+ "\t\t\"enabled\" : \"false\"\n" +
"\t}\n" +
"}";
req = new AutoScalingRequest(SolrRequest.METHOD.POST, path, setTriggerCommand);
@@ -128,6 +113,9 @@ public class AutoScalingHandlerTest extends SolrCloudTestCase {
assertEquals(4, nodeLostTrigger.size());
assertEquals("1200", nodeLostTrigger.get("waitFor").toString());
assertEquals("false", nodeLostTrigger.get("enabled").toString());
+ actions = (List<Map<String, String>>) nodeLostTrigger.get("actions");
+ assertNotNull(actions);
+ assertEquals(3, actions.size());
String setListenerCommand = "{\n" +
"\t\"set-listener\" : \n" +