From 1753c49beb8865fbb4cc2683cf17d4bfb94dacf8 Mon Sep 17 00:00:00 2001 From: Boaz Leskes Date: Tue, 11 Oct 2016 10:43:38 +0200 Subject: [PATCH] add promised comment to testCanResetUnreasonableSettings it got lost in a broken git song and dance. --- .../indices/memory/breaker/CircuitBreakerServiceIT.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java b/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java index dc8f2aec6ca..ed371eca895 100644 --- a/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java +++ b/core/src/test/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java @@ -417,6 +417,8 @@ public class CircuitBreakerServiceIT extends ESIntegTestCase { .build(); client().admin().cluster().prepareUpdateSettings().setTransientSettings(insane).get(); + // calls updates settings to reset everything to default, checking that the request + // is not blocked by the above inflight circuit breaker reset(); assertThat(client().admin().cluster().prepareState().get()