From 3d1d970800bd54a50fcea5b189fbe1c4fba0ce0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Letterer?= <48132449+111andre111@users.noreply.github.com> Date: Fri, 5 Apr 2019 01:50:20 +0200 Subject: [PATCH] Fixed synchronizing REST API inflight breaker names with internal variable The internal configuration settings were like that: network.breaker.inflight_requests But the exposed REST API had the value names with underscore like that: network.breaker.in_flight_requests This was now corrected to without underscores like that: network.breaker.inflight_requests --- docs/reference/migration/migrate_8_0.asciidoc | 2 ++ docs/reference/migration/migrate_8_0/breaker.asciidoc | 11 +++++++++++ .../elasticsearch/common/breaker/CircuitBreaker.java | 2 +- .../breaker/HierarchyCircuitBreakerServiceTests.java | 4 ++-- 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 docs/reference/migration/migrate_8_0/breaker.asciidoc diff --git a/docs/reference/migration/migrate_8_0.asciidoc b/docs/reference/migration/migrate_8_0.asciidoc index a346e35841de9..05b2c6a9123cf 100644 --- a/docs/reference/migration/migrate_8_0.asciidoc +++ b/docs/reference/migration/migrate_8_0.asciidoc @@ -13,6 +13,7 @@ coming[8.0.0] * <> * <> +* <> * <> * <> * <> @@ -53,6 +54,7 @@ Elasticsearch 7.x in order to be readable by Elasticsearch 8.x. include::migrate_8_0/analysis.asciidoc[] include::migrate_8_0/allocation.asciidoc[] +include::migrate_8_0/breaker.asciidoc[] include::migrate_8_0/discovery.asciidoc[] include::migrate_8_0/mappings.asciidoc[] include::migrate_8_0/packaging.asciidoc[] diff --git a/docs/reference/migration/migrate_8_0/breaker.asciidoc b/docs/reference/migration/migrate_8_0/breaker.asciidoc new file mode 100644 index 0000000000000..59ab2b4ae8d99 --- /dev/null +++ b/docs/reference/migration/migrate_8_0/breaker.asciidoc @@ -0,0 +1,11 @@ +[float] +[[breaking_80_breaker_changes]] +=== Packaging changes + +//tag::notable-breaking-changes[] +[float] +==== In Flight Request Circuit Breaker + +The name of the in flight requests circuit breaker in log output and diagnostic APIs (such as the node stats API) changes from `in_flight_requests` to `inflight_requests` to align it with the name of the corresponding settings. + +//end::notable-breaking-changes[] diff --git a/server/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java b/server/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java index 6cc818e03aca7..2908856b84f1b 100644 --- a/server/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java +++ b/server/src/main/java/org/elasticsearch/common/breaker/CircuitBreaker.java @@ -53,7 +53,7 @@ public interface CircuitBreaker { * The in-flight request breaker tracks bytes allocated for reading and * writing requests on the network layer. */ - String IN_FLIGHT_REQUESTS = "in_flight_requests"; + String IN_FLIGHT_REQUESTS = "inflight_requests"; /** * The accounting breaker tracks things held in memory that is independent * of the request lifecycle. This includes memory used by Lucene for diff --git a/server/src/test/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerServiceTests.java b/server/src/test/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerServiceTests.java index 9918b0c6e6188..b72d8b9800934 100644 --- a/server/src/test/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerServiceTests.java +++ b/server/src/test/java/org/elasticsearch/indices/breaker/HierarchyCircuitBreakerServiceTests.java @@ -201,7 +201,7 @@ public void testBorrowingSiblingBreakerMemory() throws Exception { assertThat(exception.getMessage(), containsString("[parent] Data too large, data for [should break] would be")); assertThat(exception.getMessage(), containsString("which is larger than the limit of [209715200/200mb]")); assertThat(exception.getMessage(), - containsString("usages [request=157286400/150mb, fielddata=54001664/51.5mb, in_flight_requests=0/0b, accounting=0/0b]")); + containsString("usages [request=157286400/150mb, fielddata=54001664/51.5mb, accounting=0/0b, inflight_requests=0/0b]")); assertThat(exception.getDurability(), equalTo(CircuitBreaker.Durability.TRANSIENT)); } } @@ -249,7 +249,7 @@ long currentMemoryUsage() { final long requestCircuitBreakerUsed = (requestBreaker.getUsed() + reservationInBytes) * 2; assertThat(exception.getMessage(), containsString("usages [request=" + requestCircuitBreakerUsed + "/" + new ByteSizeValue(requestCircuitBreakerUsed) + - ", fielddata=0/0b, in_flight_requests=0/0b, accounting=0/0b]")); + ", fielddata=0/0b, accounting=0/0b, inflight_requests=0/0b]")); assertThat(exception.getDurability(), equalTo(CircuitBreaker.Durability.TRANSIENT)); assertEquals(0, requestBreaker.getTrippedCount()); assertEquals(1, service.stats().getStats(CircuitBreaker.PARENT).getTrippedCount());