|
20 | 20 | package org.elasticsearch.cluster.metadata;
|
21 | 21 |
|
22 | 22 | import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
|
23 |
| - |
24 | 23 | import org.apache.logging.log4j.LogManager;
|
25 | 24 | import org.apache.logging.log4j.Logger;
|
26 | 25 | import org.apache.logging.log4j.message.ParameterizedMessage;
|
@@ -386,8 +385,7 @@ public ClusterState execute(ClusterState currentState) throws Exception {
|
386 | 385 | indexSettingsBuilder.put(IndexMetaData.SETTING_INDEX_VERSION_CREATED.getKey(), createdVersion);
|
387 | 386 | }
|
388 | 387 | 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)); |
391 | 389 | }
|
392 | 390 | if (indexSettingsBuilder.get(SETTING_NUMBER_OF_REPLICAS) == null) {
|
393 | 391 | indexSettingsBuilder.put(SETTING_NUMBER_OF_REPLICAS, settings.getAsInt(SETTING_NUMBER_OF_REPLICAS, 1));
|
@@ -589,21 +587,6 @@ public ClusterState execute(ClusterState currentState) throws Exception {
|
589 | 587 | }
|
590 | 588 | }
|
591 | 589 |
|
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 |
| - |
607 | 590 | @Override
|
608 | 591 | public void onFailure(String source, Exception e) {
|
609 | 592 | if (e instanceof ResourceAlreadyExistsException) {
|
|
0 commit comments