Stop auto-followers when resetting metadata #81290
Merged
Conversation
This file contains 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
idegtiarenko
added
>bug
:Distributed Indexing/CCR
|
Pinging @elastic/es-distributed (Team:Distributed) |
henningandersen
approved these changes
Dec 3, 2021
| return; | ||
| } | ||
| final AutoFollowMetadata autoFollowMetadata = followerClusterState.getMetadata() | ||
| .custom(AutoFollowMetadata.TYPE, AutoFollowMetadata.EMPTY); | ||
|
|
There was a problem hiding this comment.
Can we bail out early here if autoFollowMetadata.getPatterns().isEmpty() && this.autoFollowers.isEmpty()? Since this runs on every cluster change it would be nice to have a bail out.
|
|
||
| // then auto-followers are removed | ||
| assertThat(newAutoFollowers.entrySet(), empty()); | ||
| // and remotes are stopped |
There was a problem hiding this comment.
Suggested change
| // and remotes are stopped | |
| // and auto-followers are stopped |
| ClusterState clusterState = ClusterState.builder(new ClusterName("remote")).build(); | ||
| autoFollowCoordinator.updateAutoFollowers(clusterState); | ||
| var autoFollowCoordinator = createAutoFollowCoordinator(); | ||
| autoFollowCoordinator.updateAutoFollowers(createClusterStateWith(null)); |
There was a problem hiding this comment.
Perhaps randomly choose null or Map.of()?
There was a problem hiding this comment.
There is already another test case that checks transition from non empty to empty map.
|
@elasticmachine run elasticsearch-ci/bwc |
idegtiarenko
added a commit
to idegtiarenko/elasticsearch
that referenced
this pull request
Dec 7, 2021
💔 Backport failed
You can use sqren/backport to manually backport by running |
elasticsearchmachine
pushed a commit
that referenced
this pull request
Dec 7, 2021
idegtiarenko
added a commit
to idegtiarenko/elasticsearch
that referenced
this pull request
Dec 7, 2021
(cherry picked from commit bdc1b73)
elasticsearchmachine
pushed a commit
that referenced
this pull request
Dec 7, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This change ensures auto-followers are stopped if auto-follow metadata is reverted back to null after some non-empty state.
Fixes #81242 (though will not happen until #81247 is fixed)