Skip to content

[8.x] Reinstate support for GET _cluster/stats?timeout=... (#113852) #113878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 1, 2024
Merged

[8.x] Reinstate support for GET _cluster/stats?timeout=... (#113852) #113878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_basic.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,19 @@
- is_true: nodes.plugins
- is_true: nodes.network_types

---
"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

- is_true: timestamp
- is_true: cluster_name

---
"cluster stats with human flag returns docs as human readable size":
- requires:
Expand Down
3 changes: 2 additions & 1 deletion server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterStatsAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -46,7 +47,7 @@ public String getName() {

@Override
public Set<String> supportedQueryParameters() {
return Set.of("include_remotes", "nodeId");
return Set.of("include_remotes", "nodeId", REST_TIMEOUT_PARAM);
}

@Override
Expand Down