[9.1] [Security Solution][AI Assistant] Handle conflicts during the bulk update (#233288)#234867
Merged
e40pud merged 4 commits intoelastic:9.1from Sep 12, 2025
Merged
[9.1] [Security Solution][AI Assistant] Handle conflicts during the bulk update (#233288)#234867e40pud merged 4 commits intoelastic:9.1from
e40pud merged 4 commits intoelastic:9.1from
Conversation
…date (elastic#233288) ## Summary Part of Epic: elastic/security-team#12768 Meta: elastic/security-team#13657 In my [previous PR](elastic#232288), I accidentally removed "retry on conflict" [logic](https://github.com/elastic/kibana/pull/232288/files#r2305375978). These changes add a retry logic on bulk update conflicts. For that we use a `retry_on_conflict` option https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-bulk#operation-bulk-body-application-json-update-retry_on_conflict. The retry count is set to 3 to match previous behaviour. cc @stephmilovic (cherry picked from commit 8170cff) # Conflicts: # x-pack/solutions/security/plugins/elastic_assistant/server/ai_assistant_data_clients/conversations/index.test.ts
Contributor
💔 Build Failed
Failed CI StepsTest Failures
Metrics [docs]Unknown metric groupsESLint disabled line counts
Total ESLint disabled count
History
|
stephmilovic
approved these changes
Sep 12, 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.
Backport
This will backport the following commits from
mainto9.1:Questions ?
Please refer to the Backport tool documentation