-
Notifications
You must be signed in to change notification settings - Fork 24.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement ILM/settings operator handlers (#88097)
Relates to #86224
- Loading branch information
Showing
15 changed files
with
753 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
90 changes: 90 additions & 0 deletions
90
...src/main/java/org/elasticsearch/immutablestate/action/ImmutableClusterSettingsAction.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
| * in compliance with, at your election, the Elastic License 2.0 or the Server | ||
| * Side Public License, v 1. | ||
| */ | ||
|
|
||
| package org.elasticsearch.immutablestate.action; | ||
|
|
||
| import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsRequest; | ||
| import org.elasticsearch.action.admin.cluster.settings.TransportClusterUpdateSettingsAction; | ||
| import org.elasticsearch.client.internal.Requests; | ||
| import org.elasticsearch.cluster.ClusterState; | ||
| import org.elasticsearch.common.settings.ClusterSettings; | ||
| import org.elasticsearch.immutablestate.ImmutableClusterStateHandler; | ||
| import org.elasticsearch.immutablestate.TransformState; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.HashSet; | ||
| import java.util.Map; | ||
| import java.util.Set; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import static org.elasticsearch.common.util.Maps.asMap; | ||
|
|
||
| /** | ||
| * This Action is the immutable state save version of RestClusterUpdateSettingsAction | ||
| * <p> | ||
| * It is used by the ImmutableClusterStateController to update the persistent cluster settings. | ||
| * Since transient cluster settings are deprecated, this action doesn't support updating transient cluster settings. | ||
| */ | ||
| public class ImmutableClusterSettingsAction implements ImmutableClusterStateHandler<ClusterUpdateSettingsRequest> { | ||
|
|
||
| public static final String NAME = "cluster_settings"; | ||
|
|
||
| private final ClusterSettings clusterSettings; | ||
|
|
||
| public ImmutableClusterSettingsAction(ClusterSettings clusterSettings) { | ||
| this.clusterSettings = clusterSettings; | ||
| } | ||
|
|
||
| @Override | ||
| public String name() { | ||
| return NAME; | ||
| } | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| private ClusterUpdateSettingsRequest prepare(Object input, Set<String> previouslySet) { | ||
| final ClusterUpdateSettingsRequest clusterUpdateSettingsRequest = Requests.clusterUpdateSettingsRequest(); | ||
|
|
||
| Map<String, ?> source = asMap(input); | ||
| Map<String, Object> persistentSettings = new HashMap<>(); | ||
| Set<String> toDelete = new HashSet<>(previouslySet); | ||
|
|
||
| source.forEach((k, v) -> { | ||
| persistentSettings.put(k, v); | ||
| toDelete.remove(k); | ||
| }); | ||
|
|
||
| toDelete.forEach(k -> persistentSettings.put(k, null)); | ||
|
|
||
| clusterUpdateSettingsRequest.persistentSettings(persistentSettings); | ||
| return clusterUpdateSettingsRequest; | ||
| } | ||
|
|
||
| @Override | ||
| public TransformState transform(Object input, TransformState prevState) { | ||
| ClusterUpdateSettingsRequest request = prepare(input, prevState.keys()); | ||
|
|
||
| // allow empty requests, this is how we clean up settings | ||
| if (request.persistentSettings().isEmpty() == false) { | ||
| validate(request); | ||
| } | ||
|
|
||
| ClusterState state = prevState.state(); | ||
|
|
||
| TransportClusterUpdateSettingsAction.ClusterUpdateSettingsTask updateSettingsTask = | ||
| new TransportClusterUpdateSettingsAction.ClusterUpdateSettingsTask(clusterSettings, request); | ||
|
|
||
| state = updateSettingsTask.execute(state); | ||
| Set<String> currentKeys = request.persistentSettings() | ||
| .keySet() | ||
| .stream() | ||
| .filter(k -> request.persistentSettings().hasValue(k)) | ||
| .collect(Collectors.toSet()); | ||
|
|
||
| return new TransformState(state, currentKeys); | ||
| } | ||
| } |
100 changes: 100 additions & 0 deletions
100
...est/java/org/elasticsearch/immutablestate/action/ImmutableClusterSettingsActionTests.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0 and the Server Side Public License, v 1; you may not use this file except | ||
| * in compliance with, at your election, the Elastic License 2.0 or the Server | ||
| * Side Public License, v 1. | ||
| */ | ||
|
|
||
| package org.elasticsearch.immutablestate.action; | ||
|
|
||
| import org.elasticsearch.cluster.ClusterName; | ||
| import org.elasticsearch.cluster.ClusterState; | ||
| import org.elasticsearch.common.settings.ClusterSettings; | ||
| import org.elasticsearch.common.settings.Settings; | ||
| import org.elasticsearch.immutablestate.TransformState; | ||
| import org.elasticsearch.test.ESTestCase; | ||
| import org.elasticsearch.xcontent.XContentParser; | ||
| import org.elasticsearch.xcontent.XContentParserConfiguration; | ||
| import org.elasticsearch.xcontent.XContentType; | ||
|
|
||
| import java.util.Collections; | ||
|
|
||
| import static org.hamcrest.Matchers.containsInAnyOrder; | ||
|
|
||
| public class ImmutableClusterSettingsActionTests extends ESTestCase { | ||
|
|
||
| private TransformState processJSON(ImmutableClusterSettingsAction action, TransformState prevState, String json) throws Exception { | ||
| try (XContentParser parser = XContentType.JSON.xContent().createParser(XContentParserConfiguration.EMPTY, json)) { | ||
| return action.transform(parser.map(), prevState); | ||
| } | ||
| } | ||
|
|
||
| public void testValidation() throws Exception { | ||
| ClusterSettings clusterSettings = new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS); | ||
|
|
||
| ClusterState state = ClusterState.builder(new ClusterName("elasticsearch")).build(); | ||
| TransformState prevState = new TransformState(state, Collections.emptySet()); | ||
| ImmutableClusterSettingsAction action = new ImmutableClusterSettingsAction(clusterSettings); | ||
|
|
||
| String badPolicyJSON = """ | ||
| { | ||
| "indices.recovery.min_bytes_per_sec": "50mb" | ||
| }"""; | ||
|
|
||
| assertEquals( | ||
| "persistent setting [indices.recovery.min_bytes_per_sec], not recognized", | ||
| expectThrows(IllegalArgumentException.class, () -> processJSON(action, prevState, badPolicyJSON)).getMessage() | ||
| ); | ||
| } | ||
|
|
||
| public void testSetUnsetSettings() throws Exception { | ||
| ClusterSettings clusterSettings = new ClusterSettings(Settings.EMPTY, ClusterSettings.BUILT_IN_CLUSTER_SETTINGS); | ||
|
|
||
| ClusterState state = ClusterState.builder(new ClusterName("elasticsearch")).build(); | ||
| TransformState prevState = new TransformState(state, Collections.emptySet()); | ||
| ImmutableClusterSettingsAction action = new ImmutableClusterSettingsAction(clusterSettings); | ||
|
|
||
| String emptyJSON = ""; | ||
|
|
||
| TransformState updatedState = processJSON(action, prevState, emptyJSON); | ||
| assertEquals(0, updatedState.keys().size()); | ||
| assertEquals(prevState.state(), updatedState.state()); | ||
|
|
||
| String settingsJSON = """ | ||
| { | ||
| "indices.recovery.max_bytes_per_sec": "50mb", | ||
| "cluster": { | ||
| "remote": { | ||
| "cluster_one": { | ||
| "seeds": [ | ||
| "127.0.0.1:9300" | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| }"""; | ||
|
|
||
| prevState = updatedState; | ||
| updatedState = processJSON(action, prevState, settingsJSON); | ||
| assertThat(updatedState.keys(), containsInAnyOrder("indices.recovery.max_bytes_per_sec", "cluster.remote.cluster_one.seeds")); | ||
| assertEquals("50mb", updatedState.state().metadata().persistentSettings().get("indices.recovery.max_bytes_per_sec")); | ||
| assertEquals("[127.0.0.1:9300]", updatedState.state().metadata().persistentSettings().get("cluster.remote.cluster_one.seeds")); | ||
|
|
||
| String oneSettingJSON = """ | ||
| { | ||
| "indices.recovery.max_bytes_per_sec": "25mb" | ||
| }"""; | ||
|
|
||
| prevState = updatedState; | ||
| updatedState = processJSON(action, prevState, oneSettingJSON); | ||
| assertThat(updatedState.keys(), containsInAnyOrder("indices.recovery.max_bytes_per_sec")); | ||
| assertEquals("25mb", updatedState.state().metadata().persistentSettings().get("indices.recovery.max_bytes_per_sec")); | ||
| assertNull(updatedState.state().metadata().persistentSettings().get("cluster.remote.cluster_one.seeds")); | ||
|
|
||
| prevState = updatedState; | ||
| updatedState = processJSON(action, prevState, emptyJSON); | ||
| assertEquals(0, updatedState.keys().size()); | ||
| assertNull(updatedState.state().metadata().persistentSettings().get("indices.recovery.max_bytes_per_sec")); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 32 additions & 0 deletions
32
...lugin/ilm/src/main/java/org/elasticsearch/xpack/ilm/ILMImmutableStateHandlerProvider.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| package org.elasticsearch.xpack.ilm; | ||
|
|
||
| import org.elasticsearch.immutablestate.ImmutableClusterStateHandler; | ||
| import org.elasticsearch.immutablestate.ImmutableClusterStateHandlerProvider; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.Collection; | ||
| import java.util.Set; | ||
| import java.util.concurrent.ConcurrentHashMap; | ||
|
|
||
| /** | ||
| * ILM Provider implementation for the {@link ImmutableClusterStateHandlerProvider} service interface | ||
| */ | ||
| public class ILMImmutableStateHandlerProvider implements ImmutableClusterStateHandlerProvider { | ||
| private static final Set<ImmutableClusterStateHandler<?>> handlers = ConcurrentHashMap.newKeySet(); | ||
|
|
||
| @Override | ||
| public Collection<ImmutableClusterStateHandler<?>> handlers() { | ||
| return handlers; | ||
| } | ||
|
|
||
| public static void registerHandlers(ImmutableClusterStateHandler<?>... stateHandlers) { | ||
| handlers.addAll(Arrays.asList(stateHandlers)); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.