Skip to content

[9.0] Remove index setting when override value is null (#122267) #122344

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

Closed
wants to merge 1 commit into from
Closed

[9.0] Remove index setting when override value is null (#122267) #122344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...lusterTest/java/org/elasticsearch/xpack/migrate/action/CreateIndexFromSourceActionIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ public void testSettingsNullOverride() throws Exception {
assertTrue(destSettings.getAsBoolean(IndexMetadata.SETTING_BLOCKS_READ, false));

// override null removed
assertNull(destSettings.get(IndexMetadata.SETTING_BLOCKS_WRITE));
assertThat(destSettings.keySet(), not(hasItem(IndexMetadata.SETTING_BLOCKS_WRITE)));
}

public void testRemoveIndexBlocksByDefault() throws Exception {
Expand Down
19 changes: 16 additions & 3 deletions ...ain/java/org/elasticsearch/xpack/migrate/action/CreateIndexFromSourceTransportAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,12 @@ protected void doExecute(Task task, CreateIndexFromSourceAction.Request request,

Settings.Builder settings = Settings.builder()
// first settings from source index
.put(filterSettings(sourceIndex))
// then override with request settings
.put(request.settingsOverride());
.put(filterSettings(sourceIndex));

if (request.settingsOverride().isEmpty() == false) {
applyOverrides(settings, request.settingsOverride());
}

if (request.removeIndexBlocks()) {
// lastly, override with settings to remove index blocks if requested
INDEX_BLOCK_SETTINGS.forEach(settings::remove);
Expand All @@ -114,6 +117,16 @@ protected void doExecute(Task task, CreateIndexFromSourceAction.Request request,
client.admin().indices().create(createIndexRequest, listener.map(response -> response));
}

private void applyOverrides(Settings.Builder settings, Settings overrides) {
overrides.keySet().forEach(key -> {
if (overrides.get(key) != null) {
settings.put(key, overrides.get(key));
} else {
settings.remove(key);
}
});
}

private static Map<String, Object> toMap(@Nullable MappingMetadata sourceMapping) {
return Optional.ofNullable(sourceMapping)
.map(MappingMetadata::source)
Expand Down