Skip to content

Commit 62772cc

Browse files
committed
Remove put settings API capability and replace with node feature.
1 parent 2edf4a7 commit 62772cc

File tree

2 files changed

+2
-12
lines changed

2 files changed

+2
-12
lines changed

modules/data-streams/src/yamlRestTest/resources/rest-api-spec/test/data_stream/220_failure_store_cluster_setting.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
setup:
22
- requires:
3-
reason: "Data stream options was added in 8.18+"
3+
cluster_features: [ "data_stream.failure_store" ]
4+
reason: "Failure store GA in 8.19+"
45
test_runner_features: [ capabilities, allowed_warnings, contains ]
56
capabilities:
67
- method: POST
@@ -9,9 +10,6 @@ setup:
910
- method: POST
1011
path: /_index_template/{template}
1112
capabilities: [ 'failure_store_in_template' ]
12-
- method: PUT
13-
path: /_cluster/settings
14-
capabilities: [ 'data_stream_failure_store_cluster_setting' ]
1513

1614
- do:
1715
cluster.put_settings:

server/src/main/java/org/elasticsearch/rest/action/admin/cluster/RestClusterUpdateSettingsAction.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest;
1313
import org.elasticsearch.client.internal.node.NodeClient;
14-
import org.elasticsearch.cluster.metadata.DataStream;
1514
import org.elasticsearch.common.settings.Settings;
1615
import org.elasticsearch.rest.BaseRestHandler;
1716
import org.elasticsearch.rest.RestRequest;
@@ -34,9 +33,6 @@ public class RestClusterUpdateSettingsAction extends BaseRestHandler {
3433
private static final String PERSISTENT = "persistent";
3534
private static final String TRANSIENT = "transient";
3635

37-
// TODO: Remove this and use a single cluster feature / capability for the whole failure store feature when the feature flag is removed
38-
private static final String DATA_STREAM_FAILURE_STORE_CLUSTER_SETTING_CAPABILITY = "data_stream_failure_store_cluster_setting";
39-
4036
@Override
4137
public List<Route> routes() {
4238
return List.of(new Route(PUT, "/_cluster/settings"));
@@ -78,8 +74,4 @@ public boolean canTripCircuitBreaker() {
7874
return false;
7975
}
8076

81-
@Override
82-
public Set<String> supportedCapabilities() {
83-
return DataStream.isFailureStoreFeatureFlagEnabled() ? Set.of(DATA_STREAM_FAILURE_STORE_CLUSTER_SETTING_CAPABILITY) : Set.of();
84-
}
8577
}

0 commit comments

Comments
 (0)