Skip to content

[9.0] Ensure removal of index blocks does not leave key with null value (#122246) #122264

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
elasticsearchmachine merged 1 commit into from
Feb 11, 2025
Merged

[9.0] Ensure removal of index blocks does not leave key with null value (#122246) #122264

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
5 changes: 5 additions & 0 deletions docs/changelog/122246.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 122246
summary: Ensure removal of index blocks does not leave key with null value
area: Data streams
type: bug
issues: []
8 changes: 5 additions & 3 deletions ...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 @@ -32,6 +32,8 @@
import java.util.Map;

import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
import static org.hamcrest.Matchers.hasItem;
import static org.hamcrest.Matchers.not;

public class CreateIndexFromSourceActionIT extends ESIntegTestCase {

Expand Down Expand Up @@ -236,9 +238,9 @@ public void testRemoveIndexBlocksByDefault() throws Exception {
var destSettings = settingsResponse.getIndexToSettings().get(destIndex);

// remove block settings override both source settings and override settings
assertNull(destSettings.get(IndexMetadata.SETTING_BLOCKS_WRITE));
assertNull(destSettings.get(IndexMetadata.SETTING_READ_ONLY_ALLOW_DELETE));
assertNull(destSettings.get(IndexMetadata.SETTING_BLOCKS_READ));
assertThat(destSettings.keySet(), not(hasItem(IndexMetadata.SETTING_BLOCKS_WRITE)));
assertThat(destSettings.keySet(), not(hasItem(IndexMetadata.SETTING_READ_ONLY_ALLOW_DELETE)));
assertThat(destSettings.keySet(), not(hasItem(IndexMetadata.SETTING_BLOCKS_READ)));
}

public void testMappingsOverridden() {
Expand Down
16 changes: 8 additions & 8 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 @@ -46,13 +46,13 @@ public class CreateIndexFromSourceTransportAction extends HandledTransportAction
private final ClusterService clusterService;
private final Client client;
private final IndexScopedSettings indexScopedSettings;
private static final Settings REMOVE_INDEX_BLOCKS_SETTING_OVERRIDE = Settings.builder()
.putNull(IndexMetadata.SETTING_READ_ONLY)
.putNull(IndexMetadata.SETTING_READ_ONLY_ALLOW_DELETE)
.putNull(IndexMetadata.SETTING_BLOCKS_WRITE)
.putNull(IndexMetadata.SETTING_BLOCKS_METADATA)
.putNull(IndexMetadata.SETTING_BLOCKS_READ)
.build();
private static final Set<String> INDEX_BLOCK_SETTINGS = Set.of(
IndexMetadata.SETTING_READ_ONLY,
IndexMetadata.SETTING_READ_ONLY_ALLOW_DELETE,
IndexMetadata.SETTING_BLOCKS_WRITE,
IndexMetadata.SETTING_BLOCKS_METADATA,
IndexMetadata.SETTING_BLOCKS_READ
);

@Inject
public CreateIndexFromSourceTransportAction(
Expand Down Expand Up @@ -94,7 +94,7 @@ protected void doExecute(Task task, CreateIndexFromSourceAction.Request request,
.put(request.settingsOverride());
if (request.removeIndexBlocks()) {
// lastly, override with settings to remove index blocks if requested
settings.put(REMOVE_INDEX_BLOCKS_SETTING_OVERRIDE);
INDEX_BLOCK_SETTINGS.forEach(settings::remove);
}

Map<String, Object> mergeMappings;
Expand Down