Watcher - workaround for potential deadlock #47603
Merged
+2
−0
Conversation
This file contains 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
7.3.0 fixes this issue by changing the locking strategy in elastic#41451. However, that change is not part of 6.x and the change here is a minimal workaround to prevent the potential of deadlock. This change will no longer retry failed bulk requests that go through the BulkProcessor for Watcher. Specifically this removes the retry logic when adding Watcher history and Triggered watches when the Bulk request failed. Related elastic#47599
spinscale
approved these changes
Oct 6, 2019
| @@ -395,6 +396,7 @@ public void afterBulk(long executionId, BulkRequest request, Throwable failure) | |||
| .setBulkActions(SETTING_BULK_ACTIONS.get(settings)) | |||
| .setBulkSize(SETTING_BULK_SIZE.get(settings)) | |||
| .setConcurrentRequests(SETTING_BULK_CONCURRENT_REQUESTS.get(settings)) | |||
| .setBackoffPolicy(BackoffPolicy.noBackoff()) | |||
There was a problem hiding this comment.
optionally: add a comment here, why this was added? (OTOH the commit should reveal this as well)
|
Pinging @elastic/es-core-features (:Core/Features/Watcher) |
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.
7.3.0 fixes this issue by changing the locking strategy in #41451.
However, that change is not part of 6.x and the change here is
a minimal workaround to prevent the potential of deadlock.
This change will no longer retry failed bulk requests that go
through the BulkProcessor for Watcher. Specifically this removes
the retry logic when adding Watcher history and Triggered watches
when the Bulk request failed.
Related #47599
Note - this is only for 6.8 since the real fix is in 7.3.0