Skip to content

Commit 733e589

Browse files
authored
Remove leftover code from one shard by default (#42374)
We had some logic to determine the number of shards, it was based on the index version created. Now that master would only ever see index versions created >= 7.0.0, this logic is no longer needed. This commit removes this dead code.
1 parent 13dc1cf commit 733e589

File tree

2 files changed

+1
-26
lines changed

2 files changed

+1
-26
lines changed

server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
package org.elasticsearch.cluster.metadata;
2121

2222
import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
23-
2423
import org.apache.logging.log4j.LogManager;
2524
import org.apache.logging.log4j.Logger;
2625
import org.apache.logging.log4j.message.ParameterizedMessage;
@@ -386,8 +385,7 @@ public ClusterState execute(ClusterState currentState) throws Exception {
386385
indexSettingsBuilder.put(IndexMetaData.SETTING_INDEX_VERSION_CREATED.getKey(), createdVersion);
387386
}
388387
if (indexSettingsBuilder.get(SETTING_NUMBER_OF_SHARDS) == null) {
389-
final int numberOfShards = getNumberOfShards(indexSettingsBuilder);
390-
indexSettingsBuilder.put(SETTING_NUMBER_OF_SHARDS, settings.getAsInt(SETTING_NUMBER_OF_SHARDS, numberOfShards));
388+
indexSettingsBuilder.put(SETTING_NUMBER_OF_SHARDS, settings.getAsInt(SETTING_NUMBER_OF_SHARDS, 1));
391389
}
392390
if (indexSettingsBuilder.get(SETTING_NUMBER_OF_REPLICAS) == null) {
393391
indexSettingsBuilder.put(SETTING_NUMBER_OF_REPLICAS, settings.getAsInt(SETTING_NUMBER_OF_REPLICAS, 1));
@@ -589,21 +587,6 @@ public ClusterState execute(ClusterState currentState) throws Exception {
589587
}
590588
}
591589

592-
static int getNumberOfShards(final Settings.Builder indexSettingsBuilder) {
593-
// TODO: this logic can be removed when the current major version is 8
594-
// TODO: https://github.com/elastic/elasticsearch/issues/38556
595-
// assert Version.CURRENT.major == 7;
596-
final int numberOfShards;
597-
final Version indexVersionCreated =
598-
Version.fromId(Integer.parseInt(indexSettingsBuilder.get(IndexMetaData.SETTING_INDEX_VERSION_CREATED.getKey())));
599-
if (indexVersionCreated.before(Version.V_7_0_0)) {
600-
numberOfShards = 5;
601-
} else {
602-
numberOfShards = 1;
603-
}
604-
return numberOfShards;
605-
}
606-
607590
@Override
608591
public void onFailure(String source, Exception e) {
609592
if (e instanceof ResourceAlreadyExistsException) {

server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,6 @@ public static boolean isSplitable(int source, int target) {
9999
return source * x == target;
100100
}
101101

102-
public void testNumberOfShards() {
103-
{
104-
final Version versionCreated = VersionUtils.randomVersionBetween(random(), Version.V_7_0_0, Version.CURRENT);
105-
final Settings.Builder indexSettingsBuilder = Settings.builder().put(SETTING_VERSION_CREATED, versionCreated);
106-
assertThat(MetaDataCreateIndexService.IndexCreationTask.getNumberOfShards(indexSettingsBuilder), equalTo(1));
107-
}
108-
}
109-
110102
public void testValidateShrinkIndex() {
111103
int numShards = randomIntBetween(2, 42);
112104
ClusterState state = createClusterState("source", numShards, randomIntBetween(0, 10),

0 commit comments

Comments
 (0)