Skip to content

[9.1] Serverless filtering create from (#137850) #137989

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 3 commits into from
Nov 13, 2025
Merged

[9.1] Serverless filtering create from (#137850) #137989

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
622a31a
Serverless filtering create from (#137850)
seanzatzdev Nov 12, 2025
83d9bde
[CI] Auto commit changes from spotless
Nov 12, 2025
e8e5ae9
Merge branch '9.1' into backport/9.1/pr-137850
seanzatzdev Nov 13, 2025
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/137850.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pr: 137850
summary: Serverless filtering create from
area: Indices APIs
type: bug
issues: []
5 changes: 5 additions & 0 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 @@ -16,6 +16,7 @@
import org.elasticsearch.client.internal.Client;
import org.elasticsearch.cluster.metadata.IndexMetadata;
import org.elasticsearch.cluster.metadata.MappingMetadata;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.compress.CompressedXContent;
import org.elasticsearch.common.settings.IndexScopedSettings;
Expand Down Expand Up @@ -154,6 +155,7 @@ private static Map<String, Object> mergeMappings(@Nullable MappingMetadata sourc
private Settings filterSettings(IndexMetadata sourceIndex) {
Settings sourceSettings = sourceIndex.getSettings();
final Settings.Builder builder = Settings.builder();
final boolean isServerless = DiscoveryNode.isStateless(clusterService.getSettings());
for (final String key : sourceSettings.keySet()) {
final Setting<?> setting = indexScopedSettings.get(key);
if (setting == null) {
Expand All @@ -169,6 +171,9 @@ private Settings filterSettings(IndexMetadata sourceIndex) {
if (setting.getProperties().contains(Setting.Property.IndexSettingDeprecatedInV7AndRemovedInV8)) {
continue;
}
if (isServerless && setting.isServerlessPublic() == false) {
continue;
}
if (SPECIFIC_SETTINGS_TO_REMOVE.contains(key)) {
continue;
}
Expand Down
Loading