-
Notifications
You must be signed in to change notification settings - Fork 25k
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.
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
Add OperatorHandler interface #87767
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
04d0e29
Add OperatorHandler and SPI
6dac760
Merge branch 'master' into operator/handler_interface
elasticmachine bbf0def
Merge branch 'master' into operator/handler_interface
0215b13
Revert SPI helper changes
339e903
Add tests for OperatorHandler
1eb5fe4
Merge branch 'master' into operator/handler_interface
6390f32
Apply feedback
ccd0c01
Merge branch 'master' into operator/handler_interface
0041593
Fix test
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
98 changes: 98 additions & 0 deletions
98
server/src/main/java/org/elasticsearch/operator/OperatorHandler.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,98 @@ | ||
/* | ||
* 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.operator; | ||
|
||
import org.elasticsearch.action.ActionRequestValidationException; | ||
import org.elasticsearch.action.support.master.MasterNodeRequest; | ||
|
||
import java.util.Collection; | ||
import java.util.Collections; | ||
|
||
/** | ||
* OperatorHandler base interface used for implementing operator state actions. | ||
* | ||
* <p> | ||
* Updating cluster state in operator mode, for file based settings and modules/plugins, requires | ||
* that we have a separate update handler interface that is different than REST handlers. This interface declares | ||
* the basic contract for implementing cluster state update handlers in operator mode. | ||
* </p> | ||
*/ | ||
public interface OperatorHandler<T> { | ||
String CONTENT = "content"; | ||
|
||
/** | ||
* Unique identifier for the handler. | ||
* | ||
* <p> | ||
* The operator handler name is a unique identifier that is matched to a section in a | ||
* cluster state update content. The operator cluster state updates are done as a single | ||
* cluster state update and the cluster state is typically supplied as a combined content, | ||
* unlike the REST handlers. This name must match a desired content key name in the combined | ||
* cluster state update, e.g. "ilm" or "cluster_settings" (for persistent cluster settings update). | ||
* </p> | ||
* | ||
* @return a String with the operator key name, e.g "ilm". | ||
*/ | ||
String name(); | ||
|
||
/** | ||
* The transformation method implemented by the handler. | ||
* | ||
* <p> | ||
* The transform method of the operator handler should apply the necessary changes to | ||
* the cluster state as it normally would in a REST handler. One difference is that the | ||
* transform method in an operator handler must perform all CRUD operations of the cluster | ||
* state in one go. For that reason, we supply a wrapper class to the cluster state called | ||
* {@link TransformState}, which contains the current cluster state as well as any previous keys | ||
* set by this handler on prior invocation. | ||
* </p> | ||
* | ||
* @param source The parsed information specific to this handler from the combined cluster state content | ||
* @param prevState The previous cluster state and keys set by this handler (if any) | ||
* @return The modified state and the current keys set by this handler | ||
* @throws Exception | ||
*/ | ||
TransformState transform(Object source, TransformState prevState) throws Exception; | ||
|
||
/** | ||
* List of dependent handler names for this handler. | ||
* | ||
* <p> | ||
* Sometimes certain parts of the cluster state cannot be created/updated without previously | ||
* setting other cluster state components, e.g. composable templates. Since the cluster state handlers | ||
* are processed in random order by the OperatorClusterStateController, this method gives an opportunity | ||
* to any operator handler to declare other operator handlers it depends on. Given dependencies exist, | ||
* the OperatorClusterStateController will order those handlers such that the handlers that are dependent | ||
* on are processed first. | ||
* </p> | ||
* | ||
* @return a collection of operator handler names | ||
*/ | ||
default Collection<String> dependencies() { | ||
return Collections.emptyList(); | ||
} | ||
|
||
/** | ||
* Generic validation helper method that throws consistent exception for all handlers. | ||
* | ||
* <p> | ||
* All implementations of OperatorHandler should call the request validate method, by calling this default | ||
* implementation. To aid in any special validation logic that may need to be implemented by the operator handler | ||
* we provide this convenience method. | ||
* </p> | ||
* | ||
* @param request the master node request that we base this operator handler on | ||
*/ | ||
default void validate(MasterNodeRequest<?> request) { | ||
ActionRequestValidationException exception = request.validate(); | ||
if (exception != null) { | ||
throw new IllegalStateException("Validation error", exception); | ||
} | ||
} | ||
} |
25 changes: 25 additions & 0 deletions
25
server/src/main/java/org/elasticsearch/operator/OperatorHandlerProvider.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,25 @@ | ||
/* | ||
* 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.operator; | ||
|
||
import java.util.Collection; | ||
|
||
/** | ||
* SPI service interface for supplying OperatorHandler implementations to Elasticsearch | ||
* from plugins/modules. | ||
*/ | ||
public interface OperatorHandlerProvider { | ||
/** | ||
* Returns a list of OperatorHandler implementations that a module/plugin supplies. | ||
* @see OperatorHandler | ||
* | ||
* @return a list of ${@link OperatorHandler}s | ||
*/ | ||
Collection<OperatorHandler<?>> handlers(); | ||
} |
21 changes: 21 additions & 0 deletions
21
server/src/main/java/org/elasticsearch/operator/TransformState.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,21 @@ | ||
/* | ||
* 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.operator; | ||
|
||
import org.elasticsearch.cluster.ClusterState; | ||
|
||
import java.util.Set; | ||
|
||
/** | ||
* A {@link ClusterState} wrapper used by the OperatorClusterStateController to pass the | ||
* current state as well as previous keys set by an {@link OperatorHandler} to each transform | ||
* step of the cluster state update. | ||
* | ||
*/ | ||
public record TransformState(ClusterState state, Set<String> keys) {} |
107 changes: 107 additions & 0 deletions
107
server/src/test/java/org/elasticsearch/operator/OperatorHandlerTests.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,107 @@ | ||
/* | ||
* 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.operator; | ||
|
||
import org.elasticsearch.action.ActionRequestValidationException; | ||
import org.elasticsearch.action.support.master.MasterNodeRequest; | ||
import org.elasticsearch.common.util.Maps; | ||
import org.elasticsearch.common.xcontent.XContentHelper; | ||
import org.elasticsearch.indices.settings.InternalOrPrivateSettingsPlugin; | ||
import org.elasticsearch.test.ESTestCase; | ||
import org.elasticsearch.xcontent.XContentParser; | ||
import org.elasticsearch.xcontent.XContentParserConfiguration; | ||
import org.elasticsearch.xcontent.XContentType; | ||
|
||
import java.io.IOException; | ||
import java.util.Map; | ||
|
||
import static org.hamcrest.Matchers.containsInAnyOrder; | ||
|
||
public class OperatorHandlerTests extends ESTestCase { | ||
public void testValidation() { | ||
OperatorHandler<ValidRequest> handler = new OperatorHandler<>() { | ||
@Override | ||
public String name() { | ||
return "handler"; | ||
} | ||
|
||
@Override | ||
public TransformState transform(Object source, TransformState prevState) throws Exception { | ||
return prevState; | ||
} | ||
}; | ||
|
||
handler.validate(new ValidRequest()); | ||
assertEquals( | ||
"Validation error", | ||
expectThrows(IllegalStateException.class, () -> handler.validate(new InvalidRequest())).getMessage() | ||
); | ||
} | ||
|
||
public void testAsMapAndFromMap() throws IOException { | ||
String someJSON = """ | ||
{ | ||
"persistent": { | ||
"indices.recovery.max_bytes_per_sec": "25mb", | ||
"cluster": { | ||
"remote": { | ||
"cluster_one": { | ||
"seeds": [ | ||
"127.0.0.1:9300" | ||
] | ||
} | ||
} | ||
} | ||
} | ||
}"""; | ||
|
||
OperatorHandler<ValidRequest> persistentHandler = new OperatorHandler<>() { | ||
@Override | ||
public String name() { | ||
return "persistent"; | ||
} | ||
|
||
@Override | ||
public TransformState transform(Object source, TransformState prevState) throws Exception { | ||
return prevState; | ||
} | ||
}; | ||
|
||
try (XContentParser parser = XContentType.JSON.xContent().createParser(XContentParserConfiguration.EMPTY, someJSON)) { | ||
Map<String, Object> originalMap = parser.map(); | ||
|
||
Map<String, ?> internalHandlerMap = Maps.asMap(originalMap.get(persistentHandler.name())); | ||
assertThat(internalHandlerMap.keySet(), containsInAnyOrder("indices.recovery.max_bytes_per_sec", "cluster")); | ||
assertEquals( | ||
"Unsupported input format", | ||
expectThrows(IllegalStateException.class, () -> Maps.asMap(Integer.valueOf(123))).getMessage() | ||
); | ||
|
||
try (XContentParser newParser = XContentHelper.mapToXContentParser(XContentParserConfiguration.EMPTY, originalMap)) { | ||
Map<String, Object> newMap = newParser.map(); | ||
|
||
assertThat(newMap.keySet(), containsInAnyOrder("persistent")); | ||
} | ||
} | ||
} | ||
|
||
static class ValidRequest extends MasterNodeRequest<InternalOrPrivateSettingsPlugin.UpdateInternalOrPrivateAction.Request> { | ||
@Override | ||
public ActionRequestValidationException validate() { | ||
return null; | ||
} | ||
} | ||
|
||
static class InvalidRequest extends ValidRequest { | ||
@Override | ||
public ActionRequestValidationException validate() { | ||
return new ActionRequestValidationException(); | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this differ across any operator handler implementations? If not, could it just be a local utility method in the operator code?