From 6ab21e5b1baa14807914a3efaeb0d7b65be7434d Mon Sep 17 00:00:00 2001 From: Michael McCandless Date: Fri, 16 Jan 2015 13:50:17 -0500 Subject: [PATCH] test must start with auto_throttle enabled --- .../org/elasticsearch/indices/settings/UpdateSettingsTests.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java b/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java index e9e5af52ebd..039d178b92a 100644 --- a/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java +++ b/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java @@ -311,6 +311,7 @@ public class UpdateSettingsTests extends ElasticsearchIntegrationTest { .put(TieredMergePolicyProvider.INDEX_MERGE_POLICY_SEGMENTS_PER_TIER, "2") .put(ConcurrentMergeSchedulerProvider.MAX_THREAD_COUNT, "1") .put(ConcurrentMergeSchedulerProvider.MAX_MERGE_COUNT, "2") + .put(ConcurrentMergeSchedulerProvider.AUTO_THROTTLE, "true") )); // Disable auto throttle: