Commit 5ce6331
authored
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
1 parent 5583d73 commit 5ce6331
File tree
2 files changed
+16
-1
lines changed- docs/changelog
- server/src/main/java/org/elasticsearch/indices
2 files changed
+16
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
Lines changed: 11 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
251 | 251 | | |
252 | 252 | | |
253 | 253 | | |
| 254 | + | |
254 | 255 | | |
255 | 256 | | |
256 | 257 | | |
| |||
397 | 398 | | |
398 | 399 | | |
399 | 400 | | |
| 401 | + | |
400 | 402 | | |
401 | 403 | | |
402 | 404 | | |
| |||
1414 | 1416 | | |
1415 | 1417 | | |
1416 | 1418 | | |
1417 | | - | |
| 1419 | + | |
| 1420 | + | |
| 1421 | + | |
| 1422 | + | |
| 1423 | + | |
| 1424 | + | |
| 1425 | + | |
| 1426 | + | |
| 1427 | + | |
1418 | 1428 | | |
1419 | 1429 | | |
1420 | 1430 | | |
| |||
0 commit comments