Match dot prefix of migrated index with the source index

Author: lukewhiting

x-pack/plugin/migrate/src/internalClusterTest/java/org/elasticsearch/xpack/migrate/action/ReindexDatastreamIndexTransportActionIT.java

@@ -96,7 +96,7 @@ public void testDestIndexDeletedIfExists() throws Exception {
  assertHitCount(prepareSearch(destIndex).setSize(0), 0);
  }
 
- public void testDestIndexNameSet() throws Exception {
+ public void testDestIndexNameSet_noDotPrefix() throws Exception {
  assumeTrue("requires the migration reindex feature flag", REINDEX_DATA_STREAM_FEATURE_FLAG.isEnabled());
 
  var sourceIndex = randomAlphaOfLength(20).toLowerCase(Locale.ROOT);
@@ -110,6 +110,20 @@ public void testDestIndexNameSet() throws Exception {
  assertEquals(expectedDestIndexName, response.getDestIndex());
  }
 
+ public void testDestIndexNameSet_withDotPrefix() throws Exception {
+ assumeTrue("requires the migration reindex feature flag", REINDEX_DATA_STREAM_FEATURE_FLAG.isEnabled());
+
+ var sourceIndex = "." + randomAlphaOfLength(20).toLowerCase(Locale.ROOT);
+ indicesAdmin().create(new CreateIndexRequest(sourceIndex)).get();
+
+ // call reindex
+ var response = client().execute(ReindexDataStreamIndexAction.INSTANCE, new ReindexDataStreamIndexAction.Request(sourceIndex))
+ .actionGet();
+
+ var expectedDestIndexName = ReindexDataStreamIndexTransportAction.generateDestIndexName(sourceIndex);
+ assertEquals(expectedDestIndexName, response.getDestIndex());
+ }
+
  public void testDestIndexContainsDocs() throws Exception {
  assumeTrue("requires the migration reindex feature flag", REINDEX_DATA_STREAM_FEATURE_FLAG.isEnabled());
 
@@ -446,4 +460,32 @@ private static String getIndexUUID(String index) {
  .get(index)
  .get(IndexMetadata.SETTING_INDEX_UUID);
  }
+
+ public void testGenerateDestIndexName_noDotPrefix() {
+ String sourceIndex = "sourceindex";
+ String expectedDestIndex = "migrated-sourceindex";
+ String actualDestIndex = ReindexDataStreamIndexTransportAction.generateDestIndexName(sourceIndex);
+ assertEquals(expectedDestIndex, actualDestIndex);
+ }
+
+ public void testGenerateDestIndexName_withDotPrefix() {
+ String sourceIndex = ".sourceindex";
+ String expectedDestIndex = ".migrated-sourceindex";
+ String actualDestIndex = ReindexDataStreamIndexTransportAction.generateDestIndexName(sourceIndex);
+ assertEquals(expectedDestIndex, actualDestIndex);
+ }
+
+ public void testGenerateDestIndexName_withHyphen() {
+ String sourceIndex = "source-index";
+ String expectedDestIndex = "migrated-source-index";
+ String actualDestIndex = ReindexDataStreamIndexTransportAction.generateDestIndexName(sourceIndex);
+ assertEquals(expectedDestIndex, actualDestIndex);
+ }
+
+ public void testGenerateDestIndexName_withUnderscore() {
+ String sourceIndex = "source_index";
+ String expectedDestIndex = "migrated-source_index";
+ String actualDestIndex = ReindexDataStreamIndexTransportAction.generateDestIndexName(sourceIndex);
+ assertEquals(expectedDestIndex, actualDestIndex);
+ }
 }

x-pack/plugin/migrate/src/main/java/org/elasticsearch/xpack/migrate/action/ReindexDataStreamIndexTransportAction.java

@@ -221,8 +221,12 @@ private static void copySettingOrUnset(Settings settingsBefore, Settings.Builder
  }
  }
 
- public static String generateDestIndexName(String sourceIndex) {
- return "migrated-" + sourceIndex;
+ static String generateDestIndexName(String sourceIndex) {
+ String prefix = "migrated-";
+ if (sourceIndex.startsWith(".")) {
+ return "." + prefix + sourceIndex.substring(1);
+ }
+ return prefix + sourceIndex;
  }
 
  private static <U extends AcknowledgedResponse> ActionListener<U> failIfNotAcknowledged(