From 341e980c5286169142338b0d1439b0c20cd60308 Mon Sep 17 00:00:00 2001 From: Shay Banon Date: Thu, 18 Jun 2015 20:38:48 +0200 Subject: [PATCH] [TEST] Use the correct renamed setting and make the default value setting private --- .../java/org/elasticsearch/cluster/routing/UnassignedInfo.java | 2 +- .../elasticsearch/cluster/routing/DelayedAllocationTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/elasticsearch/cluster/routing/UnassignedInfo.java b/core/src/main/java/org/elasticsearch/cluster/routing/UnassignedInfo.java index f909d647591..2be85e4bc37 100644 --- a/core/src/main/java/org/elasticsearch/cluster/routing/UnassignedInfo.java +++ b/core/src/main/java/org/elasticsearch/cluster/routing/UnassignedInfo.java @@ -42,7 +42,7 @@ public class UnassignedInfo implements ToXContent, Writeable { public static final FormatDateTimeFormatter DATE_TIME_FORMATTER = Joda.forPattern("dateOptionalTime"); public static final String INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING = "index.unassigned.node_left.delayed_timeout"; - public static final TimeValue DEFAULT_DELAYED_NODE_LEFT_TIMEOUT = TimeValue.timeValueMillis(0); + private static final TimeValue DEFAULT_DELAYED_NODE_LEFT_TIMEOUT = TimeValue.timeValueMillis(0); /** * Reason why the shard is in unassigned state. diff --git a/core/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationTests.java b/core/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationTests.java index 61dabe02a4b..e60ba6cafc0 100644 --- a/core/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationTests.java +++ b/core/src/test/java/org/elasticsearch/cluster/routing/DelayedAllocationTests.java @@ -49,7 +49,7 @@ public class DelayedAllocationTests extends ElasticsearchIntegrationTest { prepareCreate("test").setSettings(Settings.builder() .put(IndexMetaData.SETTING_NUMBER_OF_SHARDS, 1) .put(IndexMetaData.SETTING_NUMBER_OF_REPLICAS, 1) - .put(UnassignedInfo.DEFAULT_DELAYED_NODE_LEFT_TIMEOUT, 0)).get(); + .put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING, 0)).get(); ensureGreen("test"); indexRandomData(); internalCluster().stopRandomNode(InternalTestCluster.nameFilter(findNodeWithShard()));