From 5ccd44519ab3d998fbd69c8b07b8da95f2b2f8f9 Mon Sep 17 00:00:00 2001 From: mikemccand Date: Wed, 23 Jul 2014 05:35:52 -0400 Subject: [PATCH] Test: make test less evil --- .../elasticsearch/indices/settings/UpdateSettingsTests.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java b/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java index 68f9e2e71b6..138b80b24f2 100644 --- a/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java +++ b/src/test/java/org/elasticsearch/indices/settings/UpdateSettingsTests.java @@ -320,13 +320,15 @@ public class UpdateSettingsTests extends ElasticsearchIntegrationTest { assertFalse(mockAppender.sawUpdateSetting); - // Now make a live change to reduce allowed merge threads: + // Now make a live change to reduce allowed merge threads, and waaay over-throttle merging so they fall behind: client() .admin() .indices() .prepareUpdateSettings("test") .setSettings(ImmutableSettings.builder() - .put(ConcurrentMergeSchedulerProvider.MAX_THREAD_COUNT, "1")) + .put(ConcurrentMergeSchedulerProvider.MAX_THREAD_COUNT, "1") + .put(AbstractIndexStore.INDEX_STORE_THROTTLE_MAX_BYTES_PER_SEC, "10kb") + ) .get(); // Make sure we log the change: