flushOnIdle use tryWithEngineOrNull #134157
Merged
Conversation
This file contains hidden or 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
Since it is an optimistic operation, we can let it be skipped if the shard is currently being reset. That way the IndexingMemoryController will not get stuck if a lot of shards are gradually having their engines being reset. Relates ES-12413
kingherc
added
:Distributed Indexing/Engine
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR modifies the flushOnIdle method to use tryWithEngineOrNull instead of getEngineOrNull, making it an optimistic operation that can be skipped when the shard's engine is being reset. This prevents the IndexingMemoryController from getting stuck when multiple shards are having their engines reset.
- Changed
flushOnIdleto usetryWithEngineOrNullfor non-blocking engine access - Added trace logging when flush is skipped due to engine being unavailable
- Added comprehensive test to verify the new behavior during concurrent engine reset operations
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
| IndexShard.java | Modified flushOnIdle to use tryWithEngineOrNull and added trace logging |
| IndexShardTests.java | Added test case to verify flush behavior during engine reset operations |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
kingherc
force-pushed
the
non-issue/flush-idle-tryengine
branch
from
3570258 to
b5ea934
Compare
Collaborator
|
Pinging @elastic/es-distributed-indexing (Team:Distributed Indexing) |
kingherc
commented
Sep 5, 2025
server/src/main/java/org/elasticsearch/index/shard/IndexShard.java
Outdated
Show resolved
Hide resolved
kingherc
force-pushed
the
non-issue/flush-idle-tryengine
branch
from
b5ea934 to
c0ad890
Compare
Contributor
|
LGTM |
Contributor
Author
|
@tlrx gentle reminder for reviewing |
mridula-s109
pushed a commit
to mridula-s109/elasticsearch
that referenced
this pull request
Sep 17, 2025
Since it is an optimistic operation, we can let it be skipped if the shard is currently being reset. That way the IndexingMemoryController will not get stuck if a lot of shards are gradually having their engines being reset. Relates ES-12413
gmjehovich
pushed a commit
to gmjehovich/elasticsearch
that referenced
this pull request
Sep 18, 2025
Since it is an optimistic operation, we can let it be skipped if the shard is currently being reset. That way the IndexingMemoryController will not get stuck if a lot of shards are gradually having their engines being reset. Relates ES-12413
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Since it is an optimistic operation, we can let it be skipped if the shard is currently being reset. That way the
IndexingMemoryController will not get stuck if a lot of shards are gradually having their engines being reset.
Relates ES-12413