honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adds shrink check that original index is deleted

This commit is contained in:
Colin Goodheart-Smithe 2018-04-12 18:13:57 +01:00
parent 59e0979b92
commit 77be66b8b9
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexlifecycle/ShrunkenIndexCheckStep.java
View File

@ -32,7 +32,8 @@ public class ShrunkenIndexCheckStep extends ClusterStateWaitStep {
if (Strings.isNullOrEmpty(shrunkenIndexSource)) {
throw new IllegalStateException("step[" + NAME + "] is checking an un-shrunken index[" + index.getName() + "]");
}
return index.getName().equals(shrunkIndexPrefix + shrunkenIndexSource);
return index.getName().equals(shrunkIndexPrefix + shrunkenIndexSource) &&
clusterState.metaData().index(shrunkenIndexSource) == null;
}
@Override

26
x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/indexlifecycle/ShrunkenIndexCheckStepTests.java
View File

@ -69,16 +69,36 @@ public class ShrunkenIndexCheckStepTests extends AbstractStepTestCase<ShrunkenIn
public void testConditionNotMetBecauseNotSameShrunkenIndex() {
ShrunkenIndexCheckStep step = createRandomInstance();
String sourceIndex = randomAlphaOfLengthBetween(1, 10);
IndexMetaData indexMetadata = IndexMetaData.builder(sourceIndex + "hello")
IndexMetaData shrinkIndexMetadata = IndexMetaData.builder(sourceIndex + "hello")
.settings(settings(Version.CURRENT).put(IndexMetaData.INDEX_SHRINK_SOURCE_NAME_KEY, sourceIndex))
.numberOfShards(1)
.numberOfReplicas(0).build();
MetaData metaData = MetaData.builder()
.persistentSettings(settings(Version.CURRENT).build())
.put(IndexMetaData.builder(indexMetadata))
.put(IndexMetaData.builder(shrinkIndexMetadata))
.build();
ClusterState clusterState = ClusterState.builder(ClusterName.DEFAULT).metaData(metaData).build();
assertFalse(step.isConditionMet(indexMetadata.getIndex(), clusterState));
assertFalse(step.isConditionMet(shrinkIndexMetadata.getIndex(), clusterState));
}
public void testConditionNotMetBecauseSourceIndexExists() {
ShrunkenIndexCheckStep step = createRandomInstance();
String sourceIndex = randomAlphaOfLengthBetween(1, 10);
IndexMetaData originalIndexMetadata = IndexMetaData.builder(sourceIndex)
.settings(settings(Version.CURRENT))
.numberOfShards(100)
.numberOfReplicas(0).build();
IndexMetaData shrinkIndexMetadata = IndexMetaData.builder(step.getShrunkIndexPrefix() + sourceIndex)
.settings(settings(Version.CURRENT).put(IndexMetaData.INDEX_SHRINK_SOURCE_NAME_KEY, sourceIndex))
.numberOfShards(1)
.numberOfReplicas(0).build();
MetaData metaData = MetaData.builder()
.persistentSettings(settings(Version.CURRENT).build())
.put(IndexMetaData.builder(originalIndexMetadata))
.put(IndexMetaData.builder(shrinkIndexMetadata))
.build();
ClusterState clusterState = ClusterState.builder(ClusterName.DEFAULT).metaData(metaData).build();
assertFalse(step.isConditionMet(shrinkIndexMetadata.getIndex(), clusterState));
}
public void testIllegalState() {