Abort pending deletion on IndicesService stop #123569
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
When IndicesService is closed, the pending deletion may still be in progress due to indices removed before IndicesService gets closed. If the deletion stucks for some reason, it can stall the node shutdown. This PR aborts the pending deletion more promptly by not retry after IndicesService is closed. Resolves: elastic#121717, elastic#121716, elastic#122119
ywangd
added
>enhancement
:Distributed Indexing/Store
elasticsearchmachine
added
the
Team:Distributed Indexing
|
Hi @ywangd, I've created a changelog YAML for you. |
|
Pinging @elastic/es-distributed-indexing (Team:Distributed Indexing) |
This was referenced Feb 27, 2025
DaveCTurner
reviewed
Feb 27, 2025
server/src/main/java/org/elasticsearch/indices/IndicesService.java
Outdated
Show resolved
Hide resolved
|
Thanks for the review, David. I pushed 2228f89 based on your suggestion. |
DaveCTurner
reviewed
Feb 27, 2025
| @@ -1436,11 +1438,13 @@ public void processPendingDeletes(Index index, IndexSettings indexSettings, Time | |||
| } | |||
| if (remove.isEmpty() == false) { | |||
| logger.warn("{} still pending deletes present for shards {} - retrying", index, remove.toString()); | |||
| Thread.sleep(sleepTime); | |||
| if (stopLatch.await(sleepTime, TimeUnit.MILLISECONDS)) { | |||
| break; | |||
| sleepTime = Math.min(maxSleepTimeMs, sleepTime * 2); // increase the sleep time gradually | ||
| logger.debug("{} schedule pending delete retry after {} ms", index, sleepTime); | ||
| } | ||
| } while ((System.nanoTime() - startTimeNS) < timeout.nanos()); | ||
| } while ((System.nanoTime() - startTimeNS) < timeout.nanos() && lifecycle.started()); |
There was a problem hiding this comment.
Do we need this change now? Not really massively important, it just means that the logging is a little incorrect if we're stopped exactly between the stopLatch.await() timing out and getting to this check.
There was a problem hiding this comment.
Yes with logging this becomes awkward. I deleted it in 71146a2
It's not really important either way.
ywangd
added
the
auto-merge-without-approval
ywangd
changed the title
💔 Backport failed
You can use sqren/backport to manually backport by running |
This was referenced Feb 28, 2025
💚 All backports created successfully
Questions ?Please refer to the Backport tool documentation |
ywangd
added a commit
to ywangd/elasticsearch
that referenced
this pull request
Feb 28, 2025
When IndicesService is closed, the pending deletion may still be in progress due to indices removed before IndicesService gets closed. If the deletion stucks for some reason, it can stall the node shutdown. This PR aborts the pending deletion more promptly by not retry after IndicesService is stopped. Resolves: elastic#121717 Resolves: elastic#121716 Resolves: elastic#122119 (cherry picked from commit c7e7dbe) # Conflicts: # muted-tests.yml
ywangd
added a commit
to ywangd/elasticsearch
that referenced
this pull request
Feb 28, 2025
When IndicesService is closed, the pending deletion may still be in progress due to indices removed before IndicesService gets closed. If the deletion stucks for some reason, it can stall the node shutdown. This PR aborts the pending deletion more promptly by not retry after IndicesService is stopped. Resolves: elastic#121717 Resolves: elastic#121716 Resolves: elastic#122119 (cherry picked from commit c7e7dbe) # Conflicts: # muted-tests.yml
elasticsearchmachine
pushed a commit
that referenced
this pull request
Feb 28, 2025
When IndicesService is closed, the pending deletion may still be in progress due to indices removed before IndicesService gets closed. If the deletion stucks for some reason, it can stall the node shutdown. This PR aborts the pending deletion more promptly by not retry after IndicesService is stopped. Resolves: #121717 Resolves: #121716 Resolves: #122119 (cherry picked from commit c7e7dbe) # Conflicts: # muted-tests.yml
elasticsearchmachine
pushed a commit
that referenced
this pull request
Feb 28, 2025
When IndicesService is closed, the pending deletion may still be in progress due to indices removed before IndicesService gets closed. If the deletion stucks for some reason, it can stall the node shutdown. This PR aborts the pending deletion more promptly by not retry after IndicesService is stopped. Resolves: #121717 Resolves: #121716 Resolves: #122119 (cherry picked from commit c7e7dbe) # Conflicts: # muted-tests.yml
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.
When IndicesService is closed, the pending deletion may still be in progress due to indices removed before IndicesService gets closed. If the deletion stucks for some reason, it can stall the node shutdown. This PR aborts the pending deletion more promptly by not retry after IndicesService is stopped.
Resolves: #121717
Resolves: #121716
Resolves: #122119