From f908dfa0719b6e0d835813311eb27568f431709c Mon Sep 17 00:00:00 2001 From: David Turner Date: Tue, 1 Oct 2024 12:42:58 +0100 Subject: [PATCH 1/2] Reinstate support for `GET _cluster/stats?timeout=...` Relates #112478 --- .../rest-api-spec/test/cluster.stats/10_basic.yml | 9 +++++++++ .../action/admin/cluster/RestClusterStatsAction.java | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_basic.yml index 06139542c5e55..c50d7e6da2e3c 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_basic.yml @@ -30,6 +30,15 @@ - is_true: nodes.plugins - is_true: nodes.network_types +--- +"cluster stats accepts timeout param": + - do: + cluster.stats: + timeout: 24h + + - is_true: timestamp + - is_true: cluster_name + --- "cluster stats with human flag returns docs as human readable size": - requires: diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStatsAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStatsAction.java index 53ae50bc0b75f..449f5d5b770c4 100644 --- a/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStatsAction.java +++ b/server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStatsAction.java @@ -25,6 +25,7 @@ import java.util.Set; import static org.elasticsearch.rest.RestRequest.Method.GET; +import static org.elasticsearch.rest.RestUtils.REST_TIMEOUT_PARAM; import static org.elasticsearch.rest.RestUtils.getTimeout; @ServerlessScope(Scope.INTERNAL) @@ -46,7 +47,7 @@ public String getName() { @Override public Set supportedQueryParameters() { - return Set.of("include_remotes", "nodeId"); + return Set.of("include_remotes", "nodeId", REST_TIMEOUT_PARAM); } @Override From 8edc5215a0a62890fd7e390cbc07968921e3de23 Mon Sep 17 00:00:00 2001 From: David Turner Date: Tue, 1 Oct 2024 15:08:55 +0100 Subject: [PATCH 2/2] Temporary test skip --- .../resources/rest-api-spec/test/cluster.stats/10_basic.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_basic.yml b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_basic.yml index c50d7e6da2e3c..022ef626d3cae 100644 --- a/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_basic.yml +++ b/rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_basic.yml @@ -32,6 +32,10 @@ --- "cluster stats accepts timeout param": + - skip: + cluster_features: "gte_v8.16.0" + reason: "Suppress this test for merging & backporting https://github.com/elastic/elasticsearch/pull/113852" + - do: cluster.stats: timeout: 24h