-
Notifications
You must be signed in to change notification settings - Fork 8.5k
[Security Solution][AI Assistant] Handle conflicts during the bulk update #233288
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Security Solution][AI Assistant] Handle conflicts during the bulk update #233288
Conversation
|
Pinging @elastic/security-solution (Team: SecuritySolution) |
💚 Build Succeeded
Metrics [docs]Saved Objects .kibana field count
History
cc @e40pud |
…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
…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
|
Friendly reminder: Looks like this PR hasn’t been backported yet. |
…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
💚 All backports created successfully
Note: Successful backport PRs will be merged automatically after passing CI. Questions ?Please refer to the Backport tool documentation |
…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
…ulk update (#233288) (#234867) # Backport This will backport the following commits from `main` to `9.1`: - [[Security Solution][AI Assistant] Handle conflicts during the bulk update (#233288)](#233288) <!--- Backport version: 10.0.2 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Ievgen Sorokopud","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-08-29T15:04:39Z","message":"[Security Solution][AI Assistant] Handle conflicts during the bulk update (#233288)\n\n## Summary\n\nPart of\nEpic: https://github.com/elastic/security-team/issues/12768\nMeta: https://github.com/elastic/security-team/issues/13657\n\nIn my [previous PR](#232288), I\naccidentally removed \"retry on conflict\"\n[logic](https://github.com/elastic/kibana/pull/232288/files#r2305375978).\n\nThese changes add a retry logic on bulk update conflicts. For that we\nuse a `retry_on_conflict` option\nhttps://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-bulk#operation-bulk-body-application-json-update-retry_on_conflict.\nThe retry count is set to 3 to match previous behaviour.\n\ncc @stephmilovic","sha":"8170cff4f95f5dad24f3d40f0b2a84ab083af93e","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","backport:skip","Team: SecuritySolution","Team:Security Generative AI","v9.2.0"],"title":"[Security Solution][AI Assistant] Handle conflicts during the bulk update","number":233288,"url":"https://github.com/elastic/kibana/pull/233288","mergeCommit":{"message":"[Security Solution][AI Assistant] Handle conflicts during the bulk update (#233288)\n\n## Summary\n\nPart of\nEpic: https://github.com/elastic/security-team/issues/12768\nMeta: https://github.com/elastic/security-team/issues/13657\n\nIn my [previous PR](#232288), I\naccidentally removed \"retry on conflict\"\n[logic](https://github.com/elastic/kibana/pull/232288/files#r2305375978).\n\nThese changes add a retry logic on bulk update conflicts. For that we\nuse a `retry_on_conflict` option\nhttps://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-bulk#operation-bulk-body-application-json-update-retry_on_conflict.\nThe retry count is set to 3 to match previous behaviour.\n\ncc @stephmilovic","sha":"8170cff4f95f5dad24f3d40f0b2a84ab083af93e"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/233288","number":233288,"mergeCommit":{"message":"[Security Solution][AI Assistant] Handle conflicts during the bulk update (#233288)\n\n## Summary\n\nPart of\nEpic: https://github.com/elastic/security-team/issues/12768\nMeta: https://github.com/elastic/security-team/issues/13657\n\nIn my [previous PR](#232288), I\naccidentally removed \"retry on conflict\"\n[logic](https://github.com/elastic/kibana/pull/232288/files#r2305375978).\n\nThese changes add a retry logic on bulk update conflicts. For that we\nuse a `retry_on_conflict` option\nhttps://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-bulk#operation-bulk-body-application-json-update-retry_on_conflict.\nThe retry count is set to 3 to match previous behaviour.\n\ncc @stephmilovic","sha":"8170cff4f95f5dad24f3d40f0b2a84ab083af93e"}}]}] BACKPORT--> --------- Co-authored-by: kibanamachine <[email protected]>
…bulk update (#233288) (#234869) # Backport This will backport the following commits from `main` to `8.19`: - [[Security Solution][AI Assistant] Handle conflicts during the bulk update (#233288)](#233288) <!--- Backport version: 10.0.2 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Ievgen Sorokopud","email":"[email protected]"},"sourceCommit":{"committedDate":"2025-08-29T15:04:39Z","message":"[Security Solution][AI Assistant] Handle conflicts during the bulk update (#233288)\n\n## Summary\n\nPart of\nEpic: https://github.com/elastic/security-team/issues/12768\nMeta: https://github.com/elastic/security-team/issues/13657\n\nIn my [previous PR](#232288), I\naccidentally removed \"retry on conflict\"\n[logic](https://github.com/elastic/kibana/pull/232288/files#r2305375978).\n\nThese changes add a retry logic on bulk update conflicts. For that we\nuse a `retry_on_conflict` option\nhttps://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-bulk#operation-bulk-body-application-json-update-retry_on_conflict.\nThe retry count is set to 3 to match previous behaviour.\n\ncc @stephmilovic","sha":"8170cff4f95f5dad24f3d40f0b2a84ab083af93e","branchLabelMapping":{"^v9.2.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","backport:skip","Team: SecuritySolution","Team:Security Generative AI","v9.2.0"],"title":"[Security Solution][AI Assistant] Handle conflicts during the bulk update","number":233288,"url":"https://github.com/elastic/kibana/pull/233288","mergeCommit":{"message":"[Security Solution][AI Assistant] Handle conflicts during the bulk update (#233288)\n\n## Summary\n\nPart of\nEpic: https://github.com/elastic/security-team/issues/12768\nMeta: https://github.com/elastic/security-team/issues/13657\n\nIn my [previous PR](#232288), I\naccidentally removed \"retry on conflict\"\n[logic](https://github.com/elastic/kibana/pull/232288/files#r2305375978).\n\nThese changes add a retry logic on bulk update conflicts. For that we\nuse a `retry_on_conflict` option\nhttps://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-bulk#operation-bulk-body-application-json-update-retry_on_conflict.\nThe retry count is set to 3 to match previous behaviour.\n\ncc @stephmilovic","sha":"8170cff4f95f5dad24f3d40f0b2a84ab083af93e"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.2.0","branchLabelMappingKey":"^v9.2.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/233288","number":233288,"mergeCommit":{"message":"[Security Solution][AI Assistant] Handle conflicts during the bulk update (#233288)\n\n## Summary\n\nPart of\nEpic: https://github.com/elastic/security-team/issues/12768\nMeta: https://github.com/elastic/security-team/issues/13657\n\nIn my [previous PR](#232288), I\naccidentally removed \"retry on conflict\"\n[logic](https://github.com/elastic/kibana/pull/232288/files#r2305375978).\n\nThese changes add a retry logic on bulk update conflicts. For that we\nuse a `retry_on_conflict` option\nhttps://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-bulk#operation-bulk-body-application-json-update-retry_on_conflict.\nThe retry count is set to 3 to match previous behaviour.\n\ncc @stephmilovic","sha":"8170cff4f95f5dad24f3d40f0b2a84ab083af93e"}}]}] BACKPORT--> --------- Co-authored-by: kibanamachine <[email protected]>
Summary
Part of
Epic: https://github.com/elastic/security-team/issues/12768
Meta: https://github.com/elastic/security-team/issues/13657
In my previous PR, I accidentally removed "retry on conflict" logic.
These changes add a retry logic on bulk update conflicts. For that we use a
retry_on_conflictoption 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