Skip to content

Revert "Convert path.data to String setting instead of List (#72282)"#79091

Merged
rjernst merged 4 commits intoelastic:masterfrom
rjernst:mdp/revert15
Oct 14, 2021
Merged

Revert "Convert path.data to String setting instead of List (#72282)"#79091
rjernst merged 4 commits intoelastic:masterfrom
rjernst:mdp/revert15

Conversation

@rjernst
Copy link
Copy Markdown
Member

@rjernst rjernst commented Oct 13, 2021

This reverts commit d933ecd.

The revert had two conflicts. The first was very minor in JoinHelper.
The second was several tests in PersistedClusterStateServiceTests.

relates #78525
relates #71205

…72282)"

This reverts commit d933ecd.

The revert had two conflicts. The first was very minor in JoinHelper.
The second was several tests in PersistedClusterStateServiceTests.

relates elastic#78525
relates elastic#71205
@rjernst rjernst added >non-issue :Core/Infra/Core Core issues without another label v8.0.0 labels Oct 13, 2021
@elasticmachine elasticmachine added the Team:Core/Infra Meta label for core/infra team label Oct 13, 2021
@elasticmachine
Copy link
Copy Markdown
Collaborator

Pinging @elastic/es-core-infra (Team:Core/Infra)

Copy link
Copy Markdown
Contributor

@henningandersen henningandersen left a comment

Choose a reason for hiding this comment

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

LGTM (provided CI is happy).

try (NodeEnvironment nodeEnvironment = newNodeEnvironment(dataPaths2)) {
try (Writer writer = newPersistedClusterStateService(nodeEnvironment).createWriter()) {
final PersistedClusterStateService.OnDiskState onDiskState = newPersistedClusterStateService(nodeEnvironment)
.loadBestOnDiskState();
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Passing in false to loadBestOnDiskState here makes this test succeed.

@rjernst rjernst mentioned this pull request Oct 14, 2021
17 tasks
@rjernst rjernst added auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) and removed auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) labels Oct 14, 2021
@rjernst rjernst merged commit d97d282 into elastic:master Oct 14, 2021
@rjernst rjernst deleted the mdp/revert15 branch October 14, 2021 00:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

:Core/Infra/Core Core issues without another label >non-issue Team:Core/Infra Meta label for core/infra team v8.0.0-beta1

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants