Skip to content

TransportUnfollowAction should increase settings version #37859

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

Merged
merged 2 commits into from
Jan 25, 2019
Merged

TransportUnfollowAction should increase settings version #37859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e60f959
TransportUnfollowAction should increase settings version
tlrx Jan 25, 2019
ad04923
add missing space
tlrx Jan 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .../plugin/ccr/src/main/java/org/elasticsearch/xpack/ccr/action/TransportUnfollowAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,18 +105,19 @@ static ClusterState unfollow(String followerIndex, ClusterState current) {
}
}

IndexMetaData.Builder newIMD = IndexMetaData.builder(followerIMD);
// Remove index.xpack.ccr.following_index setting
Settings.Builder builder = Settings.builder();
builder.put(followerIMD.getSettings());
builder.remove(CcrSettings.CCR_FOLLOWING_INDEX_SETTING.getKey());

newIMD.settings(builder);
final IndexMetaData.Builder newIndexMetaData = IndexMetaData.builder(followerIMD);
newIndexMetaData.settings(builder);
newIndexMetaData.settingsVersion(followerIMD.getSettingsVersion() + 1);
// Remove ccr custom metadata
newIMD.removeCustom(Ccr.CCR_CUSTOM_METADATA_KEY);
newIndexMetaData.removeCustom(Ccr.CCR_CUSTOM_METADATA_KEY);

MetaData newMetaData = MetaData.builder(current.metaData())
.put(newIMD)
.put(newIndexMetaData)
.build();
return ClusterState.builder(current)
.metaData(newMetaData)
Expand Down
3 changes: 3 additions & 0 deletions ...in/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/TransportUnfollowActionTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@
public class TransportUnfollowActionTests extends ESTestCase {

public void testUnfollow() {
final long settingsVersion = randomNonNegativeLong();
IndexMetaData.Builder followerIndex = IndexMetaData.builder("follow_index")
.settings(settings(Version.CURRENT).put(CcrSettings.CCR_FOLLOWING_INDEX_SETTING.getKey(), true))
.settingsVersion(settingsVersion)
.numberOfShards(1)
.numberOfReplicas(0)
.state(IndexMetaData.State.CLOSE)
Expand All @@ -47,6 +49,7 @@ public void testUnfollow() {
IndexMetaData resultIMD = result.metaData().index("follow_index");
assertThat(resultIMD.getSettings().get(CcrSettings.CCR_FOLLOWING_INDEX_SETTING.getKey()), nullValue());
assertThat(resultIMD.getCustomData(Ccr.CCR_CUSTOM_METADATA_KEY), nullValue());
assertThat(resultIMD.getSettingsVersion(), equalTo(settingsVersion + 1));
}

public void testUnfollowIndexOpen() {
Expand Down