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

Do not write UUID file during optimize process #58899

Merged
merged 6 commits into from
Feb 28, 2020
Merged

Do not write UUID file during optimize process #58899

merged 6 commits into from
Feb 28, 2020

Conversation

joshdover
Copy link
Contributor

@joshdover joshdover commented Feb 28, 2020 •
edited
Loading

Summary

Fixes #57673

Prevents the UUID file from being written during the distributable builds.

  • Add test to build process?
  • Delete existing file if it matches the UUID shipped in 7.6.0

Checklist

Delete any items that are not applicable to this PR.

For maintainers

@joshdover joshdover added blocker Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc release_note:fix Feature:New Platform v7.7.0 v7.6.1 labels Feb 28, 2020
@elasticmachine
Copy link
Contributor

Pinging @elastic/kibana-platform (Team:Platform)

@joshdover joshdover marked this pull request as ready for review February 28, 2020 17:36
@joshdover joshdover requested review from a team as code owners February 28, 2020 17:36
joshdover
joshdover commented Feb 28, 2020
View reviewed changes
src/core/server/uuid/resolve_uuid.test.ts
@@ -160,39 +198,111 @@ describe('resolveInstanceUuid', () => {
});
});

describe('when file is present with 7.6.0 UUID', () => {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think this is the right thing to do to fix the monitoring data for HA Kibana deployments, but to be clear this means all users who install 7.6.0 and then upgrade will get new instance UUIDs for the same instances after upgrading. Seems like an acceptable tradeoff to me?

spalger
spalger approved these changes Feb 28, 2020
View reviewed changes
Copy link
Contributor

@spalger spalger left a comment

Choose a reason for hiding this comment

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

LGTM, but a couple nits in the tests

src/core/server/uuid/resolve_uuid.test.ts Outdated Show resolved Hide resolved
src/core/server/uuid/resolve_uuid.test.ts Outdated Show resolved Hide resolved
@joshdover
Copy link
Contributor Author

Merging since last change was only to a test and I ran it locally.

@joshdover joshdover merged commit 9bdd23a into elastic:master Feb 28, 2020
@joshdover joshdover deleted the np/fix-uuid-on-optimize branch February 28, 2020 20:32
@joshdover joshdover mentioned this pull request Feb 28, 2020
Merged
joshdover added a commit to joshdover/kibana that referenced this pull request Feb 28, 2020
@joshdover
Do not write UUID file during optimize process (elastic#58899)
b701923
@joshdover joshdover mentioned this pull request Feb 28, 2020
Merged
joshdover added a commit to joshdover/kibana that referenced this pull request Feb 28, 2020
@joshdover
Do not write UUID file during optimize process (elastic#58899)
15f6735
joshdover added a commit to joshdover/kibana that referenced this pull request Feb 28, 2020
@joshdover
Do not write UUID file during optimize process (elastic#58899)
6023b1f
joshdover added a commit that referenced this pull request Feb 28, 2020
@joshdover
[7.6] Do not write UUID file during optimize process (#58899) (#58940)
5ddabf8
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

History

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

@kibanamachine kibanamachine added the backport missing Added to PRs automatically when the are determined to be missing a backport. label Feb 29, 2020
@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

1 similar comment
@kibanamachine
Copy link
Contributor

Looks like this PR has backport PRs but they still haven't been merged. Please merge them ASAP to keep the branches relatively in sync.

jloleysens added a commit to jloleysens/kibana that referenced this pull request Mar 2, 2020
@jloleysens
Merge branch 'master' of github.com:elastic/kibana into ua/batch-rein…
17f39e7 
…dex-server-side

* 'master' of github.com:elastic/kibana: (34 commits)
  [Upgrade Assistant] Remove "boom" from reindex service (elastic#58715)
  [data] Clean up QueryStringInput unit tests (elastic#58704)
  [SIEM] Detection Fix typo in Adobe Hijack Persistence rule (elastic#58804)
  Restores [SIEM][CASE] Init Configure Case Page (elastic#58121) (elastic#58924)
  Skips additional failing Ingest Manager integration tests
  Skips failing Ingest Manager integration tests
  Move dev tools styles to NP (elastic#58855)
  change to have kibana --ssl cli option use more recent certs (elastic#57933)
  disable failing suite (elastic#58942)
  Don't start pollEsNodesVersion unless someone subscribes (elastic#56923)
  Do not write UUID file during optimize process (elastic#58899)
  [Endpoint] Task/add nav bar (elastic#58604)
  [Metric Alerts] Add backend support for multiple expressions per alert  (elastic#58672)
  [Metrics Alerts] Fix alerting on a rate aggregation (elastic#58789)
  disable flaky suite (elastic#55953)
  Revert "[SIEM] apollo@3 (elastic#51926)" and "[SIEM][CASE] Init Confi… (elastic#58806)
  [resubmit] Prep agg types for new platform (elastic#58893)
  [Lens] Allow number formatting within Lens (elastic#56253)
  [Autocomplete] Use settings from config rather than UI settings (elastic#58784)
  Improve action and trigger types (elastic#58657)
  ...

# Conflicts:
#	x-pack/plugins/upgrade_assistant/server/routes/reindex_indices/reindex_indices.ts
joshdover added a commit that referenced this pull request Mar 2, 2020
@joshdover @elasticmachine
[7.x] Do not write UUID file during optimize process (#58899) (#58939)
e13b84a 
Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
@kibanamachine kibanamachine removed the backport missing Added to PRs automatically when the are determined to be missing a backport. label Mar 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spalger spalger spalger approved these changes

Assignees
No one assigned
Labels
blocker Feature:New Platform release_note:fix Team:Core Core services & architecture: plugins, logging, config, saved objects, http, ES client, i18n, etc v7.6.1 v7.7.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Kibana data/uuid file exists in the package of 7.6.0
4 participants
@joshdover @elasticmachine @kibanamachine @spalger