Skip to content

Remove handling of index.mapper.dynamic in AutoCreateIndex #13067

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
reta merged 3 commits into from
Apr 5, 2024
Merged

Remove handling of index.mapper.dynamic in AutoCreateIndex #13067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ba2fb1
Remove reference to INDEX_MAPPER_DYNAMIC_SETTING in AutoCreateIndex
cwperks Apr 3, 2024
d7999d5
Add to CHANGELOG
cwperks Apr 3, 2024
c06fa46
Merge branch 'main' into index-mapper-dynamic
cwperks Apr 4, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Deprecated

### Removed
- Remove handling of index.mapper.dynamic in AutoCreateIndex([#13067](https://github.com/opensearch-project/OpenSearch/pull/13067))

### Fixed
- Fix bulk API ignores ingest pipeline for upsert ([#12883](https://github.com/opensearch-project/OpenSearch/pull/12883))
Expand Down
7 changes: 0 additions & 7 deletions server/src/main/java/org/opensearch/action/support/AutoCreateIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
import org.opensearch.common.settings.Settings;
import org.opensearch.core.common.Strings;
import org.opensearch.index.IndexNotFoundException;
import org.opensearch.index.mapper.MapperService;
import org.opensearch.indices.SystemIndices;

import java.util.ArrayList;
Expand All @@ -64,8 +63,6 @@ public final class AutoCreateIndex {
Property.NodeScope,
Setting.Property.Dynamic
);

private final boolean dynamicMappingDisabled;
private final IndexNameExpressionResolver resolver;
private final SystemIndices systemIndices;
private volatile AutoCreate autoCreate;
Expand All @@ -77,7 +74,6 @@ public AutoCreateIndex(
SystemIndices systemIndices
) {
this.resolver = resolver;
dynamicMappingDisabled = !MapperService.INDEX_MAPPER_DYNAMIC_SETTING.get(settings);
this.systemIndices = systemIndices;
this.autoCreate = AUTO_CREATE_INDEX_SETTING.get(settings);
clusterSettings.addSettingsUpdateConsumer(AUTO_CREATE_INDEX_SETTING, this::setAutoCreate);
Expand Down Expand Up @@ -109,9 +105,6 @@ public boolean shouldAutoCreate(String index, ClusterState state) {
if (autoCreate.autoCreateIndex == false) {
throw new IndexNotFoundException("[" + AUTO_CREATE_INDEX_SETTING.getKey() + "] is [false]", index);
}
if (dynamicMappingDisabled) {
Comment thread
reta marked this conversation as resolved.
throw new IndexNotFoundException("[" + MapperService.INDEX_MAPPER_DYNAMIC_SETTING.getKey() + "] is [false]", index);
}
// matches not set, default value of "true"
if (autoCreate.expressions.isEmpty()) {
return true;
Expand Down