[EDR Workflows] Unskip tests that failed on version conflict in after all#251271
Merged
gergoabraham merged 2 commits intoelastic:mainfrom Feb 3, 2026
Merged
Conversation
gergoabraham
added
release_note:skip
Contributor
|
Pinging @elastic/security-defend-workflows (Team:Defend Workflows) |
pzl
approved these changes
Feb 3, 2026
Contributor
|
Starting backport for target branches: 8.19, 9.1, 9.2, 9.3 https://github.com/elastic/kibana/actions/runs/21635610444 |
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Feb 3, 2026
… all (elastic#251271) ## Summary Lot of our tests (cypress, FTRs) use in their `afterAll` hook the function `deleteIndexedEndpointHosts()`, which tries to delete Fleet agents in function `deleteIndexedFleetAgents()`. There's some flakyness around this, which is most probably caused by a race condition, in which - the `agent-status-change-task` updates the Agents' status every 60 second, - we call the `deleteByQuery` ([docs](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-delete-by-query)), which first queries the documents, then deletes them - and if any of the docs' version changes between these 2 steps, we got the conflict error. So, as a simple fix, I'm trying to add the `conflict: 'proceed'` option to the `deleteByQuery()` function call, let's see if it really helps. Also, relevant tests are unskipped and the following issues can be closed: closes elastic#237393 closes elastic#239216 closes elastic#242204 closes elastic#242863 closes elastic#238454 closes elastic#236842 closes elastic#236061 closes elastic#236344 closes elastic#236687 closes elastic#236165 closes elastic#236198 closes elastic#236619 closes elastic#236164 closes elastic#239731 closes elastic#246101 closes elastic#238720 closes elastic#236862 closes elastic#239558 closes elastic#236075 closes elastic#240968 closes elastic#245458 ### Checklist Check the PR satisfies following conditions. Reviewers should verify this PR satisfies this list as well. - [ ] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-i18n/README.md) - [ ] [Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html) was added for features that require explanation or tutorials - [ ] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios - [ ] If a plugin configuration key changed, check if it needs to be allowlisted in the cloud and added to the [docker list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker) - [ ] This was checked for breaking HTTP API changes, and any breaking changes have been approved by the breaking-change committee. The `release_note:breaking` label should be applied in these situations. - [ ] [Flaky Test Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was used on any tests changed - [ ] The PR description includes the appropriate Release Notes section, and the correct `release_note:*` label is applied per the [guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process) - [ ] Review the [backport guidelines](https://docs.google.com/document/d/1VyN5k91e5OVumlc0Gb9RPa3h1ewuPE705nRtioPiTvY/edit?usp=sharing) and apply applicable `backport:*` labels. ### Identify risks Does this PR introduce any risks? For example, consider risks like hard to test bugs, performance regression, potential of data loss. Describe the risk, its severity, and mitigation for each identified risk. Invite stakeholders and evaluate how to proceed before merging. - [ ] [See some risk examples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx) - [ ] ... (cherry picked from commit 247cc12)
kibanamachine
pushed a commit
to kibanamachine/kibana
that referenced
this pull request
Feb 3, 2026
… all (elastic#251271) ## Summary Lot of our tests (cypress, FTRs) use in their `afterAll` hook the function `deleteIndexedEndpointHosts()`, which tries to delete Fleet agents in function `deleteIndexedFleetAgents()`. There's some flakyness around this, which is most probably caused by a race condition, in which - the `agent-status-change-task` updates the Agents' status every 60 second, - we call the `deleteByQuery` ([docs](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-delete-by-query)), which first queries the documents, then deletes them - and if any of the docs' version changes between these 2 steps, we got the conflict error. So, as a simple fix, I'm trying to add the `conflict: 'proceed'` option to the `deleteByQuery()` function call, let's see if it really helps. Also, relevant tests are unskipped and the following issues can be closed: closes elastic#237393 closes elastic#239216 closes elastic#242204 closes elastic#242863 closes elastic#238454 closes elastic#236842 closes elastic#236061 closes elastic#236344 closes elastic#236687 closes elastic#236165 closes elastic#236198 closes elastic#236619 closes elastic#236164 closes elastic#239731 closes elastic#246101 closes elastic#238720 closes elastic#236862 closes elastic#239558 closes elastic#236075 closes elastic#240968 closes elastic#245458 ### Checklist Check the PR satisfies following conditions. Reviewers should verify this PR satisfies this list as well. - [ ] Any text added follows [EUI's writing guidelines](https://elastic.github.io/eui/#/guidelines/writing), uses sentence case text and includes [i18n support](https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-i18n/README.md) - [ ] [Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html) was added for features that require explanation or tutorials - [ ] [Unit or functional tests](https://www.elastic.co/guide/en/kibana/master/development-tests.html) were updated or added to match the most common scenarios - [ ] If a plugin configuration key changed, check if it needs to be allowlisted in the cloud and added to the [docker list](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker) - [ ] This was checked for breaking HTTP API changes, and any breaking changes have been approved by the breaking-change committee. The `release_note:breaking` label should be applied in these situations. - [ ] [Flaky Test Runner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was used on any tests changed - [ ] The PR description includes the appropriate Release Notes section, and the correct `release_note:*` label is applied per the [guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process) - [ ] Review the [backport guidelines](https://docs.google.com/document/d/1VyN5k91e5OVumlc0Gb9RPa3h1ewuPE705nRtioPiTvY/edit?usp=sharing) and apply applicable `backport:*` labels. ### Identify risks Does this PR introduce any risks? For example, consider risks like hard to test bugs, performance regression, potential of data loss. Describe the risk, its severity, and mitigation for each identified risk. Invite stakeholders and evaluate how to proceed before merging. - [ ] [See some risk examples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx) - [ ] ... (cherry picked from commit 247cc12)
Contributor
💔 Some backports could not be created
Note: Successful backport PRs will be merged automatically after passing CI. Manual backportTo create the backport manually run: Questions ?Please refer to the Backport tool documentation |
kibanamachine
added a commit
that referenced
this pull request
Feb 3, 2026
… after all (#251271) (#251486) # Backport This will backport the following commits from `main` to `9.3`: - [[EDR Workflows] Unskip tests that failed on version conflict in after all (#251271)](#251271) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Gergő Ábrahám","email":"gergo.abraham@elastic.co"},"sourceCommit":{"committedDate":"2026-02-03T15:09:55Z","message":"[EDR Workflows] Unskip tests that failed on version conflict in after all (#251271)\n\n## Summary\n\nLot of our tests (cypress, FTRs) use in their `afterAll` hook the\nfunction `deleteIndexedEndpointHosts()`, which tries to delete Fleet\nagents in function `deleteIndexedFleetAgents()`.\n\nThere's some flakyness around this, which is most probably caused by a\nrace condition, in which\n- the `agent-status-change-task` updates the Agents' status every 60\nsecond,\n- we call the `deleteByQuery`\n([docs](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-delete-by-query)),\nwhich first queries the documents, then deletes them - and if any of the\ndocs' version changes between these 2 steps, we got the conflict error.\n\nSo, as a simple fix, I'm trying to add the `conflict: 'proceed'` option\nto the `deleteByQuery()` function call, let's see if it really helps.\n\nAlso, relevant tests are unskipped and the following issues can be\nclosed:\ncloses #237393\ncloses #239216\ncloses #242204\ncloses #242863\ncloses #238454\ncloses #236842\ncloses #236061\ncloses #236344\ncloses #236687\ncloses #236165\ncloses #236198\ncloses #236619\ncloses #236164\ncloses #239731\ncloses #246101\ncloses #238720\ncloses #236862\ncloses #239558\ncloses #236075\ncloses #240968\ncloses #245458\n\n### Checklist\n\nCheck the PR satisfies following conditions. \n\nReviewers should verify this PR satisfies this list as well.\n\n- [ ] Any text added follows [EUI's writing\nguidelines](https://elastic.github.io/eui/#/guidelines/writing), uses\nsentence case text and includes [i18n\nsupport](https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-i18n/README.md)\n- [ ]\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\nwas added for features that require explanation or tutorials\n- [ ] [Unit or functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere updated or added to match the most common scenarios\n- [ ] If a plugin configuration key changed, check if it needs to be\nallowlisted in the cloud and added to the [docker\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\n- [ ] This was checked for breaking HTTP API changes, and any breaking\nchanges have been approved by the breaking-change committee. The\n`release_note:breaking` label should be applied in these situations.\n- [ ] [Flaky Test\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was\nused on any tests changed\n- [ ] The PR description includes the appropriate Release Notes section,\nand the correct `release_note:*` label is applied per the\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\n- [ ] Review the [backport\nguidelines](https://docs.google.com/document/d/1VyN5k91e5OVumlc0Gb9RPa3h1ewuPE705nRtioPiTvY/edit?usp=sharing)\nand apply applicable `backport:*` labels.\n\n### Identify risks\n\nDoes this PR introduce any risks? For example, consider risks like hard\nto test bugs, performance regression, potential of data loss.\n\nDescribe the risk, its severity, and mitigation for each identified\nrisk. Invite stakeholders and evaluate how to proceed before merging.\n\n- [ ] [See some risk\nexamples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx)\n- [ ] ...","sha":"247cc12e4444c5ac1c9a7e62e3d17ed5eec9fe9d","branchLabelMapping":{"^v9.4.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Defend Workflows","backport:all-open","v9.4.0"],"title":"[EDR Workflows] Unskip tests that failed on version conflict in after all","number":251271,"url":"https://github.com/elastic/kibana/pull/251271","mergeCommit":{"message":"[EDR Workflows] Unskip tests that failed on version conflict in after all (#251271)\n\n## Summary\n\nLot of our tests (cypress, FTRs) use in their `afterAll` hook the\nfunction `deleteIndexedEndpointHosts()`, which tries to delete Fleet\nagents in function `deleteIndexedFleetAgents()`.\n\nThere's some flakyness around this, which is most probably caused by a\nrace condition, in which\n- the `agent-status-change-task` updates the Agents' status every 60\nsecond,\n- we call the `deleteByQuery`\n([docs](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-delete-by-query)),\nwhich first queries the documents, then deletes them - and if any of the\ndocs' version changes between these 2 steps, we got the conflict error.\n\nSo, as a simple fix, I'm trying to add the `conflict: 'proceed'` option\nto the `deleteByQuery()` function call, let's see if it really helps.\n\nAlso, relevant tests are unskipped and the following issues can be\nclosed:\ncloses #237393\ncloses #239216\ncloses #242204\ncloses #242863\ncloses #238454\ncloses #236842\ncloses #236061\ncloses #236344\ncloses #236687\ncloses #236165\ncloses #236198\ncloses #236619\ncloses #236164\ncloses #239731\ncloses #246101\ncloses #238720\ncloses #236862\ncloses #239558\ncloses #236075\ncloses #240968\ncloses #245458\n\n### Checklist\n\nCheck the PR satisfies following conditions. \n\nReviewers should verify this PR satisfies this list as well.\n\n- [ ] Any text added follows [EUI's writing\nguidelines](https://elastic.github.io/eui/#/guidelines/writing), uses\nsentence case text and includes [i18n\nsupport](https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-i18n/README.md)\n- [ ]\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\nwas added for features that require explanation or tutorials\n- [ ] [Unit or functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere updated or added to match the most common scenarios\n- [ ] If a plugin configuration key changed, check if it needs to be\nallowlisted in the cloud and added to the [docker\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\n- [ ] This was checked for breaking HTTP API changes, and any breaking\nchanges have been approved by the breaking-change committee. The\n`release_note:breaking` label should be applied in these situations.\n- [ ] [Flaky Test\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was\nused on any tests changed\n- [ ] The PR description includes the appropriate Release Notes section,\nand the correct `release_note:*` label is applied per the\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\n- [ ] Review the [backport\nguidelines](https://docs.google.com/document/d/1VyN5k91e5OVumlc0Gb9RPa3h1ewuPE705nRtioPiTvY/edit?usp=sharing)\nand apply applicable `backport:*` labels.\n\n### Identify risks\n\nDoes this PR introduce any risks? For example, consider risks like hard\nto test bugs, performance regression, potential of data loss.\n\nDescribe the risk, its severity, and mitigation for each identified\nrisk. Invite stakeholders and evaluate how to proceed before merging.\n\n- [ ] [See some risk\nexamples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx)\n- [ ] ...","sha":"247cc12e4444c5ac1c9a7e62e3d17ed5eec9fe9d"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.4.0","branchLabelMappingKey":"^v9.4.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/251271","number":251271,"mergeCommit":{"message":"[EDR Workflows] Unskip tests that failed on version conflict in after all (#251271)\n\n## Summary\n\nLot of our tests (cypress, FTRs) use in their `afterAll` hook the\nfunction `deleteIndexedEndpointHosts()`, which tries to delete Fleet\nagents in function `deleteIndexedFleetAgents()`.\n\nThere's some flakyness around this, which is most probably caused by a\nrace condition, in which\n- the `agent-status-change-task` updates the Agents' status every 60\nsecond,\n- we call the `deleteByQuery`\n([docs](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-delete-by-query)),\nwhich first queries the documents, then deletes them - and if any of the\ndocs' version changes between these 2 steps, we got the conflict error.\n\nSo, as a simple fix, I'm trying to add the `conflict: 'proceed'` option\nto the `deleteByQuery()` function call, let's see if it really helps.\n\nAlso, relevant tests are unskipped and the following issues can be\nclosed:\ncloses #237393\ncloses #239216\ncloses #242204\ncloses #242863\ncloses #238454\ncloses #236842\ncloses #236061\ncloses #236344\ncloses #236687\ncloses #236165\ncloses #236198\ncloses #236619\ncloses #236164\ncloses #239731\ncloses #246101\ncloses #238720\ncloses #236862\ncloses #239558\ncloses #236075\ncloses #240968\ncloses #245458\n\n### Checklist\n\nCheck the PR satisfies following conditions. \n\nReviewers should verify this PR satisfies this list as well.\n\n- [ ] Any text added follows [EUI's writing\nguidelines](https://elastic.github.io/eui/#/guidelines/writing), uses\nsentence case text and includes [i18n\nsupport](https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-i18n/README.md)\n- [ ]\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\nwas added for features that require explanation or tutorials\n- [ ] [Unit or functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere updated or added to match the most common scenarios\n- [ ] If a plugin configuration key changed, check if it needs to be\nallowlisted in the cloud and added to the [docker\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\n- [ ] This was checked for breaking HTTP API changes, and any breaking\nchanges have been approved by the breaking-change committee. The\n`release_note:breaking` label should be applied in these situations.\n- [ ] [Flaky Test\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was\nused on any tests changed\n- [ ] The PR description includes the appropriate Release Notes section,\nand the correct `release_note:*` label is applied per the\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\n- [ ] Review the [backport\nguidelines](https://docs.google.com/document/d/1VyN5k91e5OVumlc0Gb9RPa3h1ewuPE705nRtioPiTvY/edit?usp=sharing)\nand apply applicable `backport:*` labels.\n\n### Identify risks\n\nDoes this PR introduce any risks? For example, consider risks like hard\nto test bugs, performance regression, potential of data loss.\n\nDescribe the risk, its severity, and mitigation for each identified\nrisk. Invite stakeholders and evaluate how to proceed before merging.\n\n- [ ] [See some risk\nexamples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx)\n- [ ] ...","sha":"247cc12e4444c5ac1c9a7e62e3d17ed5eec9fe9d"}}]}] BACKPORT--> Co-authored-by: Gergő Ábrahám <gergo.abraham@elastic.co>
kibanamachine
added a commit
that referenced
this pull request
Feb 3, 2026
… after all (#251271) (#251485) # Backport This will backport the following commits from `main` to `9.2`: - [[EDR Workflows] Unskip tests that failed on version conflict in after all (#251271)](#251271) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Gergő Ábrahám","email":"gergo.abraham@elastic.co"},"sourceCommit":{"committedDate":"2026-02-03T15:09:55Z","message":"[EDR Workflows] Unskip tests that failed on version conflict in after all (#251271)\n\n## Summary\n\nLot of our tests (cypress, FTRs) use in their `afterAll` hook the\nfunction `deleteIndexedEndpointHosts()`, which tries to delete Fleet\nagents in function `deleteIndexedFleetAgents()`.\n\nThere's some flakyness around this, which is most probably caused by a\nrace condition, in which\n- the `agent-status-change-task` updates the Agents' status every 60\nsecond,\n- we call the `deleteByQuery`\n([docs](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-delete-by-query)),\nwhich first queries the documents, then deletes them - and if any of the\ndocs' version changes between these 2 steps, we got the conflict error.\n\nSo, as a simple fix, I'm trying to add the `conflict: 'proceed'` option\nto the `deleteByQuery()` function call, let's see if it really helps.\n\nAlso, relevant tests are unskipped and the following issues can be\nclosed:\ncloses #237393\ncloses #239216\ncloses #242204\ncloses #242863\ncloses #238454\ncloses #236842\ncloses #236061\ncloses #236344\ncloses #236687\ncloses #236165\ncloses #236198\ncloses #236619\ncloses #236164\ncloses #239731\ncloses #246101\ncloses #238720\ncloses #236862\ncloses #239558\ncloses #236075\ncloses #240968\ncloses #245458\n\n### Checklist\n\nCheck the PR satisfies following conditions. \n\nReviewers should verify this PR satisfies this list as well.\n\n- [ ] Any text added follows [EUI's writing\nguidelines](https://elastic.github.io/eui/#/guidelines/writing), uses\nsentence case text and includes [i18n\nsupport](https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-i18n/README.md)\n- [ ]\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\nwas added for features that require explanation or tutorials\n- [ ] [Unit or functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere updated or added to match the most common scenarios\n- [ ] If a plugin configuration key changed, check if it needs to be\nallowlisted in the cloud and added to the [docker\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\n- [ ] This was checked for breaking HTTP API changes, and any breaking\nchanges have been approved by the breaking-change committee. The\n`release_note:breaking` label should be applied in these situations.\n- [ ] [Flaky Test\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was\nused on any tests changed\n- [ ] The PR description includes the appropriate Release Notes section,\nand the correct `release_note:*` label is applied per the\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\n- [ ] Review the [backport\nguidelines](https://docs.google.com/document/d/1VyN5k91e5OVumlc0Gb9RPa3h1ewuPE705nRtioPiTvY/edit?usp=sharing)\nand apply applicable `backport:*` labels.\n\n### Identify risks\n\nDoes this PR introduce any risks? For example, consider risks like hard\nto test bugs, performance regression, potential of data loss.\n\nDescribe the risk, its severity, and mitigation for each identified\nrisk. Invite stakeholders and evaluate how to proceed before merging.\n\n- [ ] [See some risk\nexamples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx)\n- [ ] ...","sha":"247cc12e4444c5ac1c9a7e62e3d17ed5eec9fe9d","branchLabelMapping":{"^v9.4.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:Defend Workflows","backport:all-open","v9.4.0"],"title":"[EDR Workflows] Unskip tests that failed on version conflict in after all","number":251271,"url":"https://github.com/elastic/kibana/pull/251271","mergeCommit":{"message":"[EDR Workflows] Unskip tests that failed on version conflict in after all (#251271)\n\n## Summary\n\nLot of our tests (cypress, FTRs) use in their `afterAll` hook the\nfunction `deleteIndexedEndpointHosts()`, which tries to delete Fleet\nagents in function `deleteIndexedFleetAgents()`.\n\nThere's some flakyness around this, which is most probably caused by a\nrace condition, in which\n- the `agent-status-change-task` updates the Agents' status every 60\nsecond,\n- we call the `deleteByQuery`\n([docs](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-delete-by-query)),\nwhich first queries the documents, then deletes them - and if any of the\ndocs' version changes between these 2 steps, we got the conflict error.\n\nSo, as a simple fix, I'm trying to add the `conflict: 'proceed'` option\nto the `deleteByQuery()` function call, let's see if it really helps.\n\nAlso, relevant tests are unskipped and the following issues can be\nclosed:\ncloses #237393\ncloses #239216\ncloses #242204\ncloses #242863\ncloses #238454\ncloses #236842\ncloses #236061\ncloses #236344\ncloses #236687\ncloses #236165\ncloses #236198\ncloses #236619\ncloses #236164\ncloses #239731\ncloses #246101\ncloses #238720\ncloses #236862\ncloses #239558\ncloses #236075\ncloses #240968\ncloses #245458\n\n### Checklist\n\nCheck the PR satisfies following conditions. \n\nReviewers should verify this PR satisfies this list as well.\n\n- [ ] Any text added follows [EUI's writing\nguidelines](https://elastic.github.io/eui/#/guidelines/writing), uses\nsentence case text and includes [i18n\nsupport](https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-i18n/README.md)\n- [ ]\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\nwas added for features that require explanation or tutorials\n- [ ] [Unit or functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere updated or added to match the most common scenarios\n- [ ] If a plugin configuration key changed, check if it needs to be\nallowlisted in the cloud and added to the [docker\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\n- [ ] This was checked for breaking HTTP API changes, and any breaking\nchanges have been approved by the breaking-change committee. The\n`release_note:breaking` label should be applied in these situations.\n- [ ] [Flaky Test\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was\nused on any tests changed\n- [ ] The PR description includes the appropriate Release Notes section,\nand the correct `release_note:*` label is applied per the\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\n- [ ] Review the [backport\nguidelines](https://docs.google.com/document/d/1VyN5k91e5OVumlc0Gb9RPa3h1ewuPE705nRtioPiTvY/edit?usp=sharing)\nand apply applicable `backport:*` labels.\n\n### Identify risks\n\nDoes this PR introduce any risks? For example, consider risks like hard\nto test bugs, performance regression, potential of data loss.\n\nDescribe the risk, its severity, and mitigation for each identified\nrisk. Invite stakeholders and evaluate how to proceed before merging.\n\n- [ ] [See some risk\nexamples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx)\n- [ ] ...","sha":"247cc12e4444c5ac1c9a7e62e3d17ed5eec9fe9d"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.4.0","branchLabelMappingKey":"^v9.4.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/251271","number":251271,"mergeCommit":{"message":"[EDR Workflows] Unskip tests that failed on version conflict in after all (#251271)\n\n## Summary\n\nLot of our tests (cypress, FTRs) use in their `afterAll` hook the\nfunction `deleteIndexedEndpointHosts()`, which tries to delete Fleet\nagents in function `deleteIndexedFleetAgents()`.\n\nThere's some flakyness around this, which is most probably caused by a\nrace condition, in which\n- the `agent-status-change-task` updates the Agents' status every 60\nsecond,\n- we call the `deleteByQuery`\n([docs](https://www.elastic.co/docs/api/doc/elasticsearch/operation/operation-delete-by-query)),\nwhich first queries the documents, then deletes them - and if any of the\ndocs' version changes between these 2 steps, we got the conflict error.\n\nSo, as a simple fix, I'm trying to add the `conflict: 'proceed'` option\nto the `deleteByQuery()` function call, let's see if it really helps.\n\nAlso, relevant tests are unskipped and the following issues can be\nclosed:\ncloses #237393\ncloses #239216\ncloses #242204\ncloses #242863\ncloses #238454\ncloses #236842\ncloses #236061\ncloses #236344\ncloses #236687\ncloses #236165\ncloses #236198\ncloses #236619\ncloses #236164\ncloses #239731\ncloses #246101\ncloses #238720\ncloses #236862\ncloses #239558\ncloses #236075\ncloses #240968\ncloses #245458\n\n### Checklist\n\nCheck the PR satisfies following conditions. \n\nReviewers should verify this PR satisfies this list as well.\n\n- [ ] Any text added follows [EUI's writing\nguidelines](https://elastic.github.io/eui/#/guidelines/writing), uses\nsentence case text and includes [i18n\nsupport](https://github.com/elastic/kibana/blob/main/src/platform/packages/shared/kbn-i18n/README.md)\n- [ ]\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\nwas added for features that require explanation or tutorials\n- [ ] [Unit or functional\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\nwere updated or added to match the most common scenarios\n- [ ] If a plugin configuration key changed, check if it needs to be\nallowlisted in the cloud and added to the [docker\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\n- [ ] This was checked for breaking HTTP API changes, and any breaking\nchanges have been approved by the breaking-change committee. The\n`release_note:breaking` label should be applied in these situations.\n- [ ] [Flaky Test\nRunner](https://ci-stats.kibana.dev/trigger_flaky_test_runner/1) was\nused on any tests changed\n- [ ] The PR description includes the appropriate Release Notes section,\nand the correct `release_note:*` label is applied per the\n[guidelines](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)\n- [ ] Review the [backport\nguidelines](https://docs.google.com/document/d/1VyN5k91e5OVumlc0Gb9RPa3h1ewuPE705nRtioPiTvY/edit?usp=sharing)\nand apply applicable `backport:*` labels.\n\n### Identify risks\n\nDoes this PR introduce any risks? For example, consider risks like hard\nto test bugs, performance regression, potential of data loss.\n\nDescribe the risk, its severity, and mitigation for each identified\nrisk. Invite stakeholders and evaluate how to proceed before merging.\n\n- [ ] [See some risk\nexamples](https://github.com/elastic/kibana/blob/main/RISK_MATRIX.mdx)\n- [ ] ...","sha":"247cc12e4444c5ac1c9a7e62e3d17ed5eec9fe9d"}}]}] BACKPORT--> Co-authored-by: Gergő Ábrahám <gergo.abraham@elastic.co>
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
5 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.
Summary
Lot of our tests (cypress, FTRs) use in their
afterAllhook the functiondeleteIndexedEndpointHosts(), which tries to delete Fleet agents in functiondeleteIndexedFleetAgents().There's some flakyness around this, which is most probably caused by a race condition, in which
agent-status-change-taskupdates the Agents' status every 60 second,deleteByQuery(docs), which first queries the documents, then deletes them - and if any of the docs' version changes between these 2 steps, we got the conflict error.So, as a simple fix, I'm trying to add the
conflict: 'proceed'option to thedeleteByQuery()function call, let's see if it really helps.Also, relevant tests are unskipped and the following issues can be closed:
closes #237393
closes #239216
closes #242204
closes #242863
closes #238454
closes #236842
closes #236061
closes #236344
closes #236687
closes #236165
closes #236198
closes #236619
closes #236164
closes #239731
closes #246101
closes #238720
closes #236862
closes #239558
closes #236075
closes #240968
closes #245458
Checklist
Check the PR satisfies following conditions.
Reviewers should verify this PR satisfies this list as well.
release_note:breakinglabel should be applied in these situations.release_note:*label is applied per the guidelinesbackport:*labels.Identify risks
Does this PR introduce any risks? For example, consider risks like hard to test bugs, performance regression, potential of data loss.
Describe the risk, its severity, and mitigation for each identified risk. Invite stakeholders and evaluate how to proceed before merging.