Ensure that IndexShard is mutable before force merges #122275
Merged
Conversation
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
Closes ES-10787
fcofdez
added
>non-issue
:Distributed Indexing/Engine
|
Pinging @elastic/es-distributed-indexing (Team:Distributed Indexing) |
fcofdez
commented
Feb 11, 2025
...c/main/java/org/elasticsearch/action/admin/indices/forcemerge/TransportForceMergeAction.java
Show resolved
Hide resolved
elasticsearchmachine
added
the
serverless-linked
arteam
approved these changes
Feb 11, 2025
| @@ -92,12 +93,16 @@ protected void shardOperation( | |||
| ActionListener<TransportBroadcastByNodeAction.EmptyResult> listener | |||
| ) { | |||
| assert (task instanceof CancellableTask) == false; // TODO: add cancellation handling here once the task supports it | |||
| threadPool.executor(ThreadPool.Names.FORCE_MERGE).execute(ActionRunnable.supply(listener, () -> { | |||
| SubscribableListener.<IndexShard>newForked(l -> { | |||
There was a problem hiding this comment.
Nit: seems to be neater to initialize indexShard and use SubscribableListener<Void> for indexShard.ensureMutable?
IndexShard indexShard = indicesService.indexServiceSafe(shardRouting.shardId().getIndex()).getShard(shardRouting.shardId().id());
SubscribableListener.<Void>newForked(l -> indexShard.ensureMutable(l))
.<EmptyResult>andThen(l -> threadPool.executor(ThreadPool.Names.FORCE_MERGE).execute(ActionRunnable.supply(l, () -> {
indexShard.forceMerge(request);
return EmptyResult.INSTANCE;
})))
.addListener(listener);There was a problem hiding this comment.
We need to do the error handling when the index doesn't exist in the node anymore, that's why I included it in the listener.
kingherc
reviewed
Feb 11, 2025
...c/main/java/org/elasticsearch/action/admin/indices/forcemerge/TransportForceMergeAction.java
Show resolved
Hide resolved
...c/main/java/org/elasticsearch/action/admin/indices/forcemerge/TransportForceMergeAction.java
Show resolved
Hide resolved
...c/main/java/org/elasticsearch/action/admin/indices/forcemerge/TransportForceMergeAction.java
Show resolved
Hide resolved
kingherc
approved these changes
Feb 12, 2025
...c/main/java/org/elasticsearch/action/admin/indices/forcemerge/TransportForceMergeAction.java
Show resolved
Hide resolved
|
Thanks for the reviews! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Closes ES-10787