Skip to content

Commit c6cab2e

Browse files
authored
Serverless filtering create from (#137850)
* add serverless filtering in _create_from transport action * Moved serverless test to serverless repo * Update docs/changelog/137850.yaml
1 parent a53166f commit c6cab2e

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.project.ProjectResolver;
2021
import org.elasticsearch.cluster.service.ClusterService;
2122
import org.elasticsearch.common.compress.CompressedXContent;
@@ -158,6 +159,7 @@ private static Map<String, Object> mergeMappings(@Nullable MappingMetadata sourc
158159
private Settings filterSettings(IndexMetadata sourceIndex) {
159160
Settings sourceSettings = sourceIndex.getSettings();
160161
final Settings.Builder builder = Settings.builder();
162+
final boolean isServerless = DiscoveryNode.isStateless(clusterService.getSettings());
161163
for (final String key : sourceSettings.keySet()) {
162164
final Setting<?> setting = indexScopedSettings.get(key);
163165
if (setting == null) {
@@ -173,6 +175,9 @@ private Settings filterSettings(IndexMetadata sourceIndex) {
173175
if (setting.getProperties().contains(Setting.Property.IndexSettingDeprecatedInV7AndRemovedInV8)) {
174176
continue;
175177
}
178+
if (isServerless && setting.isServerlessPublic() == false) {
179+
continue;
180+
}
176181
if (SPECIFIC_SETTINGS_TO_REMOVE.contains(key)) {
177182
continue;
178183
}

0 commit comments

Comments
 (0)