Drop integration test and add another unit test

Author: joegallo

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ilm/MigrateActionTests.java

@@ -6,6 +6,11 @@
  */
 package org.elasticsearch.xpack.core.ilm;
 
+import org.elasticsearch.Version;
+import org.elasticsearch.cluster.ClusterName;
+import org.elasticsearch.cluster.ClusterState;
+import org.elasticsearch.cluster.metadata.IndexMetadata;
+import org.elasticsearch.cluster.metadata.Metadata;
 import org.elasticsearch.common.io.stream.Writeable.Reader;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.xpack.cluster.routing.allocation.DataTierAllocationDecider;
@@ -14,6 +19,7 @@
 import java.io.IOException;
 import java.util.List;
 
+import static org.elasticsearch.index.IndexModule.INDEX_STORE_TYPE_SETTING;
 import static org.elasticsearch.xpack.core.DataTier.DATA_COLD;
 import static org.elasticsearch.xpack.core.DataTier.DATA_HOT;
 import static org.elasticsearch.xpack.core.DataTier.DATA_WARM;
@@ -22,6 +28,8 @@
 import static org.elasticsearch.xpack.core.ilm.TimeseriesLifecycleType.DELETE_PHASE;
 import static org.elasticsearch.xpack.core.ilm.TimeseriesLifecycleType.HOT_PHASE;
 import static org.elasticsearch.xpack.core.ilm.TimeseriesLifecycleType.WARM_PHASE;
+import static org.elasticsearch.xpack.searchablesnapshots.SearchableSnapshotsConstants.SNAPSHOT_DIRECTORY_FACTORY_KEY;
+import static org.elasticsearch.xpack.searchablesnapshots.SearchableSnapshotsConstants.SNAPSHOT_PARTIAL_SETTING;
 import static org.hamcrest.CoreMatchers.is;
 
 public class MigrateActionTests extends AbstractActionTestCase<MigrateAction> {
@@ -106,4 +114,51 @@ public void testMigrateActionsConfiguresTierPreference() {
                 is(DATA_COLD + "," + DATA_WARM + "," + DATA_HOT));
         }
     }
+
+    public void testMigrateActionWillSkipAPartiallyMountedIndex() {
+        StepKey nextStepKey = new StepKey(randomAlphaOfLengthBetween(1, 10), randomAlphaOfLengthBetween(1, 10),
+            randomAlphaOfLengthBetween(1, 10));
+        MigrateAction action = new MigrateAction();
+
+        // does not skip an ordinary index
+        {
+            IndexMetadata indexMetadata = IndexMetadata.builder(randomAlphaOfLength(5))
+                .settings(settings(Version.CURRENT))
+                .numberOfShards(1)
+                .numberOfReplicas(2)
+                .build();
+
+            ClusterState clusterState = ClusterState.builder(new ClusterName("_name"))
+                .metadata(Metadata.builder().put(indexMetadata, true).build())
+                .build();
+
+            List<Step> steps = action.toSteps(null, HOT_PHASE, nextStepKey);
+            BranchingStep firstStep = (BranchingStep) steps.get(0);
+            UpdateSettingsStep secondStep = (UpdateSettingsStep) steps.get(1);
+            firstStep.performAction(indexMetadata.getIndex(), clusterState);
+
+            assertEquals(secondStep.getKey(), firstStep.getNextStepKey());
+        }
+
+        // does skip a partially mounted
+        {
+            IndexMetadata indexMetadata = IndexMetadata.builder(randomAlphaOfLength(5))
+                .settings(settings(Version.CURRENT)
+                    .put(INDEX_STORE_TYPE_SETTING.getKey(), SNAPSHOT_DIRECTORY_FACTORY_KEY)
+                    .put(SNAPSHOT_PARTIAL_SETTING.getKey(), true))
+                .numberOfShards(1)
+                .numberOfReplicas(2)
+                .build();
+
+            ClusterState clusterState = ClusterState.builder(new ClusterName("_name"))
+                .metadata(Metadata.builder().put(indexMetadata, true).build())
+                .build();
+
+            List<Step> steps = action.toSteps(null, HOT_PHASE, nextStepKey);
+            BranchingStep firstStep = (BranchingStep) steps.get(0);
+            firstStep.performAction(indexMetadata.getIndex(), clusterState);
+
+            assertEquals(nextStepKey, firstStep.getNextStepKey());
+        }
+    }
 }

x-pack/plugin/ilm/qa/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/ilm/actions/SearchableSnapshotActionIT.java

@@ -28,7 +28,6 @@
 import org.elasticsearch.xpack.core.ilm.LifecycleAction;
 import org.elasticsearch.xpack.core.ilm.LifecyclePolicy;
 import org.elasticsearch.xpack.core.ilm.LifecycleSettings;
-import org.elasticsearch.xpack.core.ilm.MigrateAction;
 import org.elasticsearch.xpack.core.ilm.Phase;
 import org.elasticsearch.xpack.core.ilm.PhaseCompleteStep;
 import org.elasticsearch.xpack.core.ilm.RolloverAction;
@@ -40,7 +39,6 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.time.ZonedDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -516,45 +514,4 @@ snapshotRepo, randomBoolean()))
         assertThat(hotIndexSettings.get(DataTierAllocationDecider.INDEX_ROUTING_PREFER),
             is("data_hot"));
     }
-
-    public void testSearchableSnapshotActionOverridesMigrateAction() throws Exception {
-        createSnapshotRepo(client(), snapshotRepo, randomBoolean());
-        createPolicy(client(), policy,
-            new Phase("hot", TimeValue.ZERO, Map.of(RolloverAction.NAME, new RolloverAction(null, null, null, 1L),
-                SearchableSnapshotAction.NAME, new SearchableSnapshotAction(
-                    snapshotRepo, randomBoolean()))
-            ),
-            new Phase("warm", TimeValue.ZERO, Map.of(MigrateAction.NAME, new MigrateAction(true))),
-            null, null, null
-        );
-
-        createComposableTemplate(client(), randomAlphaOfLengthBetween(5, 10).toLowerCase(), dataStream,
-            new Template(Settings.builder()
-                .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1)
-                .put(LifecycleSettings.LIFECYCLE_NAME, policy)
-                .build(), null, null)
-        );
-
-        indexDocument(client(), dataStream, true);
-        String firstGenIndex = DataStream.getDefaultBackingIndexName(dataStream, 1L);
-        Map<String, Object> indexSettings = getIndexSettingsAsMap(firstGenIndex);
-        // the searchable snapshot is allocated to the hot tier
-        assertThat(indexSettings.get(DataTierAllocationDecider.INDEX_ROUTING_PREFER), is("data_hot"));
-
-        // rollover the data stream so searchable_snapshot can complete
-        rolloverMaxOneDocCondition(client(), dataStream);
-
-        final String restoredIndex = SearchableSnapshotAction.FULL_RESTORED_INDEX_PREFIX + firstGenIndex;
-        assertBusy(() -> {
-            logger.info("--> waiting for [{}] to exist...", restoredIndex);
-            assertTrue(indexExists(restoredIndex));
-        }, 30, TimeUnit.SECONDS);
-        assertBusy(() -> assertThat(getStepKeyForIndex(client(), restoredIndex), is(PhaseCompleteStep.finalStep("warm").getKey())),
-            30, TimeUnit.SECONDS);
-
-        Map<String, Object> warmIndexSettings = getIndexSettingsAsMap(restoredIndex);
-        // the searchable snapshot continues on the to warm tier and onward
-        assertThat(warmIndexSettings.get(DataTierAllocationDecider.INDEX_ROUTING_PREFER), is("data_warm,data_hot"));
-    }
-
 }