Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[Ingest Manager] Fix failing test conflict error #72149

Merged
merged 6 commits into from
Jul 17, 2020
Merged

[Ingest Manager] Fix failing test conflict error #72149

merged 6 commits into from
Jul 17, 2020

Conversation

neptunian
Copy link
Contributor

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 default system package. However many tests are receiving the error.

Fix

Separate out updating of the SO until after other requests are finished.

@neptunian neptunian added bug Fixes for quality problems that affect the customer experience v8.0.0 v7.10.0 v7.9.0 Team:Fleet Team label for Observability Data Collection Fleet team labels Jul 16, 2020
@neptunian neptunian marked this pull request as ready for review July 16, 2020 22:07
@neptunian neptunian requested a review from a team as a code owner July 16, 2020 22:07
@neptunian neptunian requested a review from a team July 16, 2020 22:07
@neptunian neptunian requested a review from a team as a code owner July 16, 2020 22:07
@elasticmachine
Copy link
Contributor

Pinging @elastic/ingest-management (Team:Ingest Management)

@neptunian neptunian added the release_note:skip Skip the PR/issue when compiling release notes label Jul 16, 2020
@neptunian
Copy link
Contributor Author

@elasticmachine merge upstream

This was referenced Jul 17, 2020
Closed
Closed
@neptunian neptunian force-pushed the fix-failing-test-conflict-error branch from 1b6a29f to 8002ba2 Compare July 17, 2020 02:26
@jen-huang
Copy link
Contributor

@elasticmachine merge upstream

jen-huang
jen-huang approved these changes Jul 17, 2020
View reviewed changes
Copy link
Contributor

@jen-huang jen-huang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
jen-huang approved these changes Jul 17, 2020
View reviewed changes
Copy link
Contributor

@jen-huang jen-huang left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[accidentally duplicated review that I can't seem to delete 🙃]

@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Build metrics

✅ unchanged

History

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

paul-tavares
paul-tavares approved these changes Jul 17, 2020
View reviewed changes
Copy link
Contributor

@paul-tavares paul-tavares left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Thanks @neptunian for working on this. 😄 🏆

@neptunian neptunian merged commit 86629d7 into elastic:master Jul 17, 2020
neptunian added a commit to neptunian/kibana that referenced this pull request Jul 17, 2020
@neptunian @elasticmachine
[Ingest Manager] Fix failing test conflict error (elastic#72149)
d091844 
* 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 neptunian mentioned this pull request Jul 17, 2020
Merged
neptunian added a commit to neptunian/kibana that referenced this pull request Jul 17, 2020
@neptunian @elasticmachine
[Ingest Manager] Fix failing test conflict error (elastic#72149)
3313600 
* 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 neptunian mentioned this pull request Jul 17, 2020
Merged
neptunian added a commit that referenced this pull request Jul 17, 2020
@neptunian @elasticmachine
[Ingest Manager] Fix failing test conflict error (#72149) (#72275)
3f5e207 
* 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
@neptunian @elasticmachine
[Ingest Manager] Fix failing test conflict error (#72149) (#72276)
c634729 
* 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
@gmmorris
Merge branch 'master' into alerting/consumer-based-rbac
16ab6c6 
* 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
@gmmorris
Merge branch 'alerting/consumer-based-rbac' into alerting/management-…
186cbe0 
…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)
chrisronline pushed a commit to chrisronline/kibana that referenced this pull request Jul 17, 2020
@neptunian @elasticmachine @chrisronline
[Ingest Manager] Fix failing test conflict error (elastic#72149)
dcc0c66 
* 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>
This was referenced Jul 20, 2020
Closed
Closed
This was referenced Jul 20, 2020
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jfsiii jfsiii jfsiii left review comments

@jen-huang jen-huang jen-huang approved these changes

@paul-tavares paul-tavares paul-tavares approved these changes

Assignees
No one assigned
Labels
bug Fixes for quality problems that affect the customer experience release_note:skip Skip the PR/issue when compiling release notes Team:Fleet Team label for Observability Data Collection Fleet team v7.9.0 v7.10.0 v8.0.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@neptunian @elasticmachine @jen-huang @kibanamachine @jfsiii @paul-tavares