Skip to content
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

Fix null value usage for index.number_of_routing_shards setting. #76069

Merged
merged 3 commits into from
Aug 5, 2021
Merged

Fix null value usage for index.number_of_routing_shards setting. #76069

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
9f69776
Fix null value usage for index.number_of_routing_shards setting.
martijnvg Aug 4, 2021
510ab00
Merge remote-tracking branch 'es/master' into fix/75139
martijnvg Aug 5, 2021
7366dc6
adjusted unit testing
martijnvg Aug 5, 2021
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
4 changes: 3 additions & 1 deletion server/src/main/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -819,7 +819,9 @@ static int getIndexNumberOfRoutingShards(Settings indexSettings, @Nullable Index
// in this case we either have no index to recover from or
// we have a source index with 1 shard and without an explicit split factor
// or one that is valid in that case we can split into whatever and auto-generate a new factor.
if (IndexMetadata.INDEX_NUMBER_OF_ROUTING_SHARDS_SETTING.exists(indexSettings)) {
// (Don't use IndexMetadata.INDEX_NUMBER_OF_ROUTING_SHARDS_SETTING.get(indexSettings) here, otherwise
// we get the default value when `null` has been provided as value)
if (indexSettings.get(IndexMetadata.INDEX_NUMBER_OF_ROUTING_SHARDS_SETTING.getKey()) != null) {
routingNumShards = IndexMetadata.INDEX_NUMBER_OF_ROUTING_SHARDS_SETTING.get(indexSettings);
} else {
routingNumShards = calculateNumRoutingShards(numTargetShards, indexVersionCreated);
Expand Down
23 changes: 23 additions & 0 deletions server/src/test/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,6 +900,29 @@ public void testGetIndexNumberOfRoutingShardsWhenExplicitlyConfigured() {
assertThat(targetRoutingNumberOfShards, is(9));
}

public void testGetIndexNumberOfRoutingShardsNullVsNotDefined() {
int numberOfPrimaryShards = randomIntBetween(1, 16);
Settings indexSettings = settings(Version.CURRENT)
.put(INDEX_NUMBER_OF_ROUTING_SHARDS_SETTING.getKey(), (String) null)
.put(INDEX_NUMBER_OF_SHARDS_SETTING.getKey(), numberOfPrimaryShards)
.build();
int targetRoutingNumberOfShardsWithNull = getIndexNumberOfRoutingShards(indexSettings, null);
indexSettings = settings(Version.CURRENT)
.put(INDEX_NUMBER_OF_SHARDS_SETTING.getKey(), numberOfPrimaryShards)
.build();
int targetRoutingNumberOfShardsWithNotDefined = getIndexNumberOfRoutingShards(indexSettings, null);
assertThat(targetRoutingNumberOfShardsWithNull, is(targetRoutingNumberOfShardsWithNotDefined));
}

public void testGetIndexNumberOfRoutingShardsNull() {
Settings indexSettings = settings(Version.CURRENT)
.put(INDEX_NUMBER_OF_ROUTING_SHARDS_SETTING.getKey(), (String) null)
.put(INDEX_NUMBER_OF_SHARDS_SETTING.getKey(), 2)
.build();
int targetRoutingNumberOfShardsWithNull = getIndexNumberOfRoutingShards(indexSettings, null);
assertThat(targetRoutingNumberOfShardsWithNull, is(1024));
}

public void testGetIndexNumberOfRoutingShardsYieldsSourceNumberOfShards() {
Settings indexSettings = Settings.builder()
.put(INDEX_NUMBER_OF_SHARDS_SETTING.getKey(), 3)
Expand Down