mirrors
/
elasticsearch
mirror of https://mirror.osredm.com/root/elasticsearch.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add existing shards allocator settings to failure store allowed list. (#131056) 

* Add existing shards allocator settings to failure store allowed list.

* Cleanup docstring

* Update docs/changelog/131056.yaml

* Add comment
This commit is contained in:
James Baiera 2025-07-11 16:56:01 -04:00 committed by GitHub
parent 8eb2a1757a
commit 79e2e04a6f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 59 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/changelog/131056.yaml Normal file
View File

@ -0,0 +1,5 @@
pr: 131056
summary: Add existing shards allocator settings to failure store allowed list
area: Data streams
type: bug
issues: []

5
server/src/main/java/org/elasticsearch/cluster/metadata/DataStreamFailureStoreDefinition.java
View File

@ -10,6 +10,7 @@
package org.elasticsearch.cluster.metadata;
import org.elasticsearch.cluster.routing.allocation.DataTier;
import org.elasticsearch.cluster.routing.allocation.ExistingShardsAllocator;
import org.elasticsearch.common.compress.CompressedXContent;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Settings;
@ -40,7 +41,9 @@ public class DataStreamFailureStoreDefinition {
IndexMetadata.SETTING_NUMBER_OF_SHARDS,
IndexMetadata.SETTING_NUMBER_OF_REPLICAS,
IndexMetadata.SETTING_AUTO_EXPAND_REPLICAS,
IndexSettings.INDEX_REFRESH_INTERVAL_SETTING.getKey()
IndexSettings.INDEX_REFRESH_INTERVAL_SETTING.getKey(),
// Different recovery implementations may be provided on the index which need to be preserved.
ExistingShardsAllocator.EXISTING_SHARDS_ALLOCATOR_SETTING.getKey()
);
public static final Set<String> SUPPORTED_USER_SETTINGS_PREFIXES = Set.of(
IndexMetadata.INDEX_ROUTING_REQUIRE_GROUP_PREFIX + ".",

50
server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java
View File

@ -35,6 +35,7 @@ import org.elasticsearch.cluster.routing.GlobalRoutingTableTestHelper;
import org.elasticsearch.cluster.routing.RoutingTable;
import org.elasticsearch.cluster.routing.allocation.AllocationService;
import org.elasticsearch.cluster.routing.allocation.DataTier;
import org.elasticsearch.cluster.routing.allocation.ExistingShardsAllocator;
import org.elasticsearch.cluster.routing.allocation.allocator.BalancedShardsAllocator;
import org.elasticsearch.cluster.routing.allocation.decider.AllocationDeciders;
import org.elasticsearch.cluster.routing.allocation.decider.MaxRetryAllocationDecider;
@ -791,6 +792,55 @@ public class MetadataCreateIndexServiceTests extends ESTestCase {
assertThat(aggregatedIndexSettings.get("other_setting"), equalTo("other_value"));
}
/**
* When a failure store index is created, we must filter out any unsupported settings from the create request or from the template that
* may have been provided by users in the create request or from the original data stream template. An exception to this is any settings
* that have been provided by index setting providers which should be considered default values on indices.
*/
public void testAggregateSettingsProviderIsNotFilteredOnFailureStore() {
IndexTemplateMetadata templateMetadata = addMatchingTemplate(builder -> {
builder.settings(Settings.builder().put("template_setting", "value1"));
});
ProjectMetadata projectMetadata = ProjectMetadata.builder(projectId).templates(Map.of("template_1", templateMetadata)).build();
ClusterState clusterState = ClusterState.builder(ClusterName.DEFAULT).putProjectMetadata(projectMetadata).build();
var request = new CreateIndexClusterStateUpdateRequest("create index", projectId, "test", "test").settings(
Settings.builder().put("request_setting", "value2").build()
).isFailureIndex(true);
Settings aggregatedIndexSettings = aggregateIndexSettings(
clusterState,
request,
templateMetadata.settings(),
null,
null,
Settings.EMPTY,
IndexScopedSettings.DEFAULT_SCOPED_SETTINGS,
randomShardLimitService(),
Set.of(new IndexSettingProvider() {
@Override
public Settings getAdditionalIndexSettings(
String indexName,
String dataStreamName,
IndexMode templateIndexMode,
ProjectMetadata projectMetadata,
Instant resolvedAt,
Settings indexTemplateAndCreateRequestSettings,
List<CompressedXContent> combinedTemplateMappings
) {
return Settings.builder().put(ExistingShardsAllocator.EXISTING_SHARDS_ALLOCATOR_SETTING.getKey(), "override").build();
}
@Override
public boolean overrulesTemplateAndRequestSettings() {
return true;
}
})
);
assertThat(aggregatedIndexSettings.get("template_setting"), nullValue());
assertThat(aggregatedIndexSettings.get(ExistingShardsAllocator.EXISTING_SHARDS_ALLOCATOR_SETTING.getKey()), equalTo("override"));
}
public void testAggregateSettingsProviderOverrulesNullFromRequest() {
IndexTemplateMetadata templateMetadata = addMatchingTemplate(builder -> {
builder.settings(Settings.builder().put("template_setting", "value1"));