Skip to content

Match dot prefix of migrated DS backing index with the source index #120042

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
lukewhiting merged 2 commits into from
Jan 13, 2025
Merged

Match dot prefix of migrated DS backing index with the source index #120042

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
18a6888
Match dot prefix of migrated index with the source index
lukewhiting Jan 13, 2025
efbbe7b
Update docs/changelog/120042.yaml
lukewhiting Jan 13, 2025
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions docs/changelog/120042.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 120042
summary: Match dot prefix of migrated DS backing index with the source index
area: Data streams
type: bug
issues: []
44 changes: 43 additions & 1 deletion .../java/org/elasticsearch/xpack/migrate/action/ReindexDatastreamIndexTransportActionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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());

Expand Down Expand Up @@ -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);
}
}
8 changes: 6 additions & 2 deletions ...in/java/org/elasticsearch/xpack/migrate/action/ReindexDataStreamIndexTransportAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down