Skip to content

Commit e6a8bf9

Browse files
seanzatzdevelasticsearchmachine
andauthored
[9.1] Serverless filtering create from (#137850) (#137989)
* Serverless filtering create from (#137850) * add serverless filtering in _create_from transport action * Moved serverless test to serverless repo * Update docs/changelog/137850.yaml (cherry picked from commit c6cab2e) * [CI] Auto commit changes from spotless --------- Co-authored-by: elasticsearchmachine <[email protected]>
1 parent c569568 commit e6a8bf9

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

docs/changelog/137850.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 137850
2+
summary: Serverless filtering create from
3+
area: Indices APIs
4+
type: bug
5+
issues: []

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.elasticsearch.client.internal.Client;
1717
import org.elasticsearch.cluster.metadata.IndexMetadata;
1818
import org.elasticsearch.cluster.metadata.MappingMetadata;
19+
import org.elasticsearch.cluster.node.DiscoveryNode;
1920
import org.elasticsearch.cluster.service.ClusterService;
2021
import org.elasticsearch.common.compress.CompressedXContent;
2122
import org.elasticsearch.common.settings.IndexScopedSettings;
@@ -154,6 +155,7 @@ private static Map<String, Object> mergeMappings(@Nullable MappingMetadata sourc
154155
private Settings filterSettings(IndexMetadata sourceIndex) {
155156
Settings sourceSettings = sourceIndex.getSettings();
156157
final Settings.Builder builder = Settings.builder();
158+
final boolean isServerless = DiscoveryNode.isStateless(clusterService.getSettings());
157159
for (final String key : sourceSettings.keySet()) {
158160
final Setting<?> setting = indexScopedSettings.get(key);
159161
if (setting == null) {
@@ -169,6 +171,9 @@ private Settings filterSettings(IndexMetadata sourceIndex) {
169171
if (setting.getProperties().contains(Setting.Property.IndexSettingDeprecatedInV7AndRemovedInV8)) {
170172
continue;
171173
}
174+
if (isServerless && setting.isServerlessPublic() == false) {
175+
continue;
176+
}
172177
if (SPECIFIC_SETTINGS_TO_REMOVE.contains(key)) {
173178
continue;
174179
}

0 commit comments

Comments
 (0)