feat(sink/opensearch): Retry DELETE operations on 404 status#5674
Merged
dlvenable merged 2 commits intoAug 11, 2025
Merged
Conversation
Makes the BulkRetryStrategy retry DELETE operations that initially fail with a 404 (Not Found) status. This handles race conditions where a delete might be processed before its corresponding create in the same bulk request due to eventual consistency.
- Modified canRetry and createBulkRequestForRetry to identify and allow retries specifically for DELETE + 404.
- Added unit tests verifying the new retry behavior for DELETE + 404 and ensuring other 404s are retried.
Signed-off-by: Pallempati Saketh <pallempati.saketh@fmr.com>
saketh-pallempati
requested review from
KarstenSchnitter,
chenqi0805,
dinujoh,
dlvenable,
engechas,
graytaylor0,
kkondaka,
oeyh,
san81,
sb2k16 and
srikanthjg
as code owners
dlvenable
reviewed
May 6, 2025
Member
dlvenable
left a comment
dlvenable
left a comment
There was a problem hiding this comment.
Thank you @saketh-pallempati for this contribution!
| return true; | ||
| if (isItemInError(bulkItemResponse)) { | ||
| boolean isGenerallyRetryable = !NON_RETRY_STATUS.contains(bulkItemResponse.status()); | ||
| boolean isDeleteNotFound = bulkItemResponse.status() == RestStatus.NOT_FOUND.getStatus() && |
Member
There was a problem hiding this comment.
The variable name isDeleteNotFound makes it sound like a delete was not found. Perhaps isDeleteResultingInNotFound would be clearer.
Also, this code is mostly replicated below. Let's have a common method to consolidate this logic. Something like canRetryItem(final BulkItemResponse bulkItemResponse).
Contributor
Author
There was a problem hiding this comment.
Thanks for the refactor suggestoins. Will implement them.
| boolean isDeleteNotFound = bulkItemResponse.status() == RestStatus.NOT_FOUND.getStatus() && | ||
| bulkItemResponse.operationType() == OperationType.Delete; | ||
|
|
||
| if (isGenerallyRetryable || isDeleteNotFound) { |
Member
There was a problem hiding this comment.
Related to the question of max retries from the original issue (see comment):
What if the delete operation is for a document that never existed? This would keep retrying because there is not a create operation in the bulk request. What would it take to see if a create/index operation exists in the current request?
- Add DELETE_404_MAX_RETRIES constant (3 attempts max) to prevent infinite retry loops - Refactor canRetryItem into focused methods: isDeleteOperationWithNotFoundError, canRetryDeleteNotFoundOperation, isGenerallyRetryableOperation - Add comprehensive test coverage for DELETE+404 edge cases and mixed operations This prevents infinite retries when DELETE operations encounter 404 errors due to race conditions in bulk operations, while maintaining backward compatibility and not affecting other operation types. Signed-off-by: Pallempati Saketh <pallempati.saketh@fmr.com>
graytaylor0
approved these changes
Jun 18, 2025
shenkw1
approved these changes
Aug 8, 2025
dlvenable
approved these changes
Aug 11, 2025
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
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.
Description
feat(sink/opensearch): Retry DELETE operations on 404 status
Enhances the
BulkRetryStrategyto retry DELETE operations that initially fail with a 404 (Not Found) status. This addresses race conditions where a delete might be processed before its corresponding create in the same bulk request due to eventual consistency.canRetryandcreateBulkRequestForRetryto identify and allow retries specifically forDELETE + 404.DELETE + 404and ensuring other 404s are retried.Issues Resolved
Resolves #5521
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.