Skip to content

Fix Force Merge Action Invoking a Listener Twice (#75897) #76529

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
Aug 14, 2021
Merged

Fix Force Merge Action Invoking a Listener Twice (#75897) #76529

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
6 changes: 3 additions & 3 deletions ...ain/java/org/elasticsearch/action/admin/indices/forcemerge/TransportForceMergeAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ protected ForceMergeRequest readRequestFrom(StreamInput in) throws IOException {
@Override
protected void shardOperation(ForceMergeRequest request, ShardRouting shardRouting, Task task,
ActionListener<TransportBroadcastByNodeAction.EmptyResult> listener) {
threadPool.executor(ThreadPool.Names.FORCE_MERGE).execute(ActionRunnable.run(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,
() -> {
assert (task instanceof CancellableTask) == false; // TODO: add cancellation handling here once the task supports it
IndexShard indexShard = indicesService.indexServiceSafe(shardRouting.shardId().getIndex())
.getShard(shardRouting.shardId().id());
indexShard.forceMerge(request);
listener.onResponse(EmptyResult.INSTANCE);
return EmptyResult.INSTANCE;
}));
}

Expand Down