Skip to content

Revert "Remove MDP from PersistedClusterStateService (#72278)"#78495

Merged
rjernst merged 6 commits intoelastic:masterfrom
rjernst:mdp/revert4
Oct 4, 2021
Merged

Revert "Remove MDP from PersistedClusterStateService (#72278)"#78495
rjernst merged 6 commits intoelastic:masterfrom
rjernst:mdp/revert4

Conversation

@rjernst
Copy link
Copy Markdown
Member

@rjernst rjernst commented Sep 30, 2021

This reverts commit 2dfaf7a.

The revert was not clean, it required merging with a few changes to
loadOnDiskState since the initial removal of MDP support.

relates #71205

This reverts commit 2dfaf7a.

The revert was not clean, it required merging with a few changes to
loadOnDiskState since the initial removal of MDP support.

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

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

@rjernst rjernst mentioned this pull request Sep 30, 2021
17 tasks
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.

Comment on lines +383 to +388
|| acceptedTerm > maxAcceptedTerm
|| (acceptedTerm == maxAcceptedTerm
&& (onDiskState.lastAcceptedVersion > bestOnDiskState.lastAcceptedVersion
|| (onDiskState.lastAcceptedVersion == bestOnDiskState.lastAcceptedVersion)
&& onDiskState.currentTerm > bestOnDiskState.currentTerm))) {
bestOnDiskState = onDiskState;
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.

The formatting looks off here compared to original, I wonder if we can indent it according to parenthesis for readability?

@rjernst rjernst merged commit 1aa5454 into elastic:master Oct 4, 2021
@rjernst rjernst deleted the mdp/revert4 branch October 4, 2021 18:39
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