[Ingest Manager] Fix failing test conflict error#72149
Merged
neptunian merged 6 commits intoelastic:masterfrom Jul 17, 2020
Merged
[Ingest Manager] Fix failing test conflict error#72149neptunian merged 6 commits intoelastic:masterfrom
neptunian merged 6 commits intoelastic:masterfrom
Conversation
Contributor
|
Pinging @elastic/ingest-management (Team:Ingest Management) |
Contributor
Author
|
@elasticmachine merge upstream |
jfsiii
reviewed
Jul 17, 2020
x-pack/plugins/ingest_manager/server/services/epm/packages/install.ts
Outdated
Show resolved
Hide resolved
1b6a29f to
8002ba2
Compare
Contributor
|
@elasticmachine merge upstream |
jen-huang
approved these changes
Jul 17, 2020
Contributor
jen-huang
left a comment
There was a problem hiding this comment.
So far the only flaky CI result is due to an unrelated test. Nice! Kicked off another run for this and the 2 test PRs for backport branches.
👍 pending CI
jen-huang
approved these changes
Jul 17, 2020
Contributor
💚 Build SucceededBuild metrics
History
To update your PR or re-run it, just comment with: |
paul-tavares
approved these changes
Jul 17, 2020
Contributor
paul-tavares
left a comment
There was a problem hiding this comment.
LGTM
Thanks @neptunian for working on this. 😄 🏆
neptunian
added a commit
to neptunian/kibana
that referenced
this pull request
Jul 17, 2020
* save kibana installation references after other updates have completed to avoid conflict error * unskip tests * uncomment out line * add back await to not change things * unskip fleet_unenroll_agent Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
neptunian
added a commit
to neptunian/kibana
that referenced
this pull request
Jul 17, 2020
* save kibana installation references after other updates have completed to avoid conflict error * unskip tests * uncomment out line * add back await to not change things * unskip fleet_unenroll_agent Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
neptunian
added a commit
that referenced
this pull request
Jul 17, 2020
* save kibana installation references after other updates have completed to avoid conflict error * unskip tests * uncomment out line * add back await to not change things * unskip fleet_unenroll_agent Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
neptunian
added a commit
that referenced
this pull request
Jul 17, 2020
* save kibana installation references after other updates have completed to avoid conflict error * unskip tests * uncomment out line * add back await to not change things * unskip fleet_unenroll_agent Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com> Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
gmmorris
added a commit
to gmmorris/kibana
that referenced
this pull request
Jul 17, 2020
* master: [ML] Remove DragSelect event handlers and selectors on the swim lane unmount (elastic#72250) Add a few asciidoc readmes (elastic#72082) re-enable tests. retry on fail (elastic#72061) updates advanced settings text (elastic#72249) [ML] Fix HTML named characters encoding (elastic#72060) Bump @elastic/elasticsearch to v7.9.0-rc1 (elastic#72231) Observability landing page title (elastic#72088) [QA][Code Coverage] Drop flaky integration tests (elastic#72089) [Ingest Manager] Fix failing test conflict error (elastic#72149) [Logs UI] Fix display of dataset values in anomaly and category example rows (elastic#71693) [SECURITY] Bug truncation on timeline (elastic#72221) skip flaky suite (elastic#72146)
gmmorris
added a commit
to gmmorris/kibana
that referenced
this pull request
Jul 17, 2020
…feature-privileges * alerting/consumer-based-rbac: corrected consumer on enable operation [ML] Remove DragSelect event handlers and selectors on the swim lane unmount (elastic#72250) Add a few asciidoc readmes (elastic#72082) re-enable tests. retry on fail (elastic#72061) updates advanced settings text (elastic#72249) [ML] Fix HTML named characters encoding (elastic#72060) Bump @elastic/elasticsearch to v7.9.0-rc1 (elastic#72231) Observability landing page title (elastic#72088) [QA][Code Coverage] Drop flaky integration tests (elastic#72089) [Ingest Manager] Fix failing test conflict error (elastic#72149) [Logs UI] Fix display of dataset values in anomaly and category example rows (elastic#71693) [SECURITY] Bug truncation on timeline (elastic#72221) skip flaky suite (elastic#72146)
This was referenced Jul 20, 2020
This was referenced Jul 20, 2020
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
6 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.
Problem
Sometimes there is a conflict error when updating the installed package saved object async, even though this attribute only gets updated by one request. I am not sure why there should be a conflict error as we don't enforce version. I am only able to reproduce if I restart ES and not kibana during
setup's call to install the defaultsystempackage. However many tests are receiving the error.Fix
Separate out updating of the SO until after other requests are finished.