From 77a5dfe381f3f58c3df0fa5269afade22be28361 Mon Sep 17 00:00:00 2001 From: Andrzej Bialecki Date: Mon, 31 Jul 2017 15:38:50 +0200 Subject: [PATCH] Fix string / boolean conversions and fix an assertion that is no longer true due to .auto_add_replicas trigger. --- .../org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java | 2 +- .../java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java | 2 +- .../apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java index 2197dd06acc..77e42af90f0 100644 --- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java +++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeAddedTrigger.java @@ -85,7 +85,7 @@ public class NodeAddedTrigger extends TriggerBase { } lastLiveNodes = new HashSet<>(container.getZkController().getZkStateReader().getClusterState().getLiveNodes()); log.debug("Initial livenodes: {}", lastLiveNodes); - this.enabled = (boolean) properties.getOrDefault("enabled", true); + this.enabled = Boolean.parseBoolean(String.valueOf(properties.getOrDefault("enabled", "true"))); this.waitForSecond = ((Long) properties.getOrDefault("waitFor", -1L)).intValue(); this.eventType = TriggerEventType.valueOf(properties.get("event").toString().toUpperCase(Locale.ROOT)); log.debug("NodeAddedTrigger {} instantiated with properties: {}", name, properties); diff --git a/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java b/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java index fba1f3cc601..5c5a4549b86 100644 --- a/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java +++ b/solr/core/src/java/org/apache/solr/cloud/autoscaling/NodeLostTrigger.java @@ -85,7 +85,7 @@ public class NodeLostTrigger extends TriggerBase { } lastLiveNodes = new HashSet<>(container.getZkController().getZkStateReader().getClusterState().getLiveNodes()); log.debug("Initial livenodes: {}", lastLiveNodes); - this.enabled = (boolean) properties.getOrDefault("enabled", true); + this.enabled = Boolean.parseBoolean(String.valueOf(properties.getOrDefault("enabled", "true"))); this.waitForSecond = ((Long) properties.getOrDefault("waitFor", -1L)).intValue(); this.eventType = TriggerEventType.valueOf(properties.get("event").toString().toUpperCase(Locale.ROOT)); } 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 9130b1539aa..fd9ca7561a2 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 @@ -617,7 +617,7 @@ public class AutoScalingHandlerTest extends SolrCloudTestCase { Map triggers = (Map) response.get("triggers"); assertNotNull(triggers); - assertEquals(1, triggers.size()); + assertEquals(2, triggers.size()); assertTrue(triggers.containsKey("node_added_trigger1")); Map node_added_trigger1 = (Map) triggers.get("node_added_trigger1"); assertEquals(4, node_added_trigger1.size());