From 4e69fa102ffe583a224b11c3649c82784dd91a3e Mon Sep 17 00:00:00 2001 From: Armin Braun Date: Thu, 27 Apr 2023 17:11:48 +0200 Subject: [PATCH] Dry up more of index setting creation in tests (#95602) Quick follow-up to #95569 of spots that I could automatically identify and refactor, saving another 1.5k LoC in tests. --- .../geoip/DatabaseNodeServiceTests.java | 8 +- .../AbstractFeatureMigrationIntegTest.java | 7 +- .../ReindexSourceTargetValidationTests.java | 8 +- .../org/elasticsearch/reindex/RetryTests.java | 6 +- .../org/elasticsearch/search/CCSDuelIT.java | 2 +- .../ClusterAllocationExplainIT.java | 7 +- .../admin/indices/create/ShrinkIndexIT.java | 52 +++--------- .../admin/indices/create/SplitIndexIT.java | 43 ++-------- .../support/WaitActiveShardCountIT.java | 7 +- .../elasticsearch/aliases/IndexAliasesIT.java | 11 +-- .../cluster/PrevalidateNodeRemovalIT.java | 18 +--- .../cluster/allocation/ClusterRerouteIT.java | 5 +- .../coordination/RareClusterStateIT.java | 20 +---- .../cluster/routing/DelayedAllocationIT.java | 29 ++----- .../cluster/routing/PrimaryAllocationIT.java | 37 ++------ .../routing/RemoveReplicaPriorityIT.java | 5 +- .../cluster/routing/ShardRoutingRoleIT.java | 5 +- .../allocation/DiskThresholdMonitorIT.java | 10 +-- .../routing/allocation/ShardStateIT.java | 5 +- .../decider/DiskThresholdDeciderIT.java | 19 +---- .../UpdateShardAllocationSettingsIT.java | 13 +-- .../cluster/shards/ClusterSearchShardsIT.java | 14 +--- .../cluster/shards/ClusterShardLimitIT.java | 11 +-- .../discovery/ClusterDisruptionIT.java | 12 +-- .../discovery/MasterDisruptionIT.java | 15 +--- .../elasticsearch/document/ShardInfoIT.java | 10 +-- .../gateway/RecoveryFromGatewayIT.java | 16 +--- .../gateway/ReplicaShardAllocatorIT.java | 37 +++----- .../ReplicaShardAllocatorSyncIdIT.java | 16 ++-- ...hardsCapacityHealthIndicatorServiceIT.java | 4 +- .../index/IndexingPressureIT.java | 29 +------ .../index/engine/InternalEngineMergeIT.java | 11 +-- .../index/shard/IndexShardIT.java | 9 +- .../RemoveCorruptedShardDataCommandIT.java | 24 +----- .../index/store/CorruptedFileIT.java | 14 +--- .../index/store/CorruptedTranslogIT.java | 5 +- .../index/suggest/stats/SuggestStatsIT.java | 15 +--- .../indices/IndicesRequestCacheIT.java | 44 ++-------- .../elasticsearch/indices/flush/FlushIT.java | 6 +- .../breaker/CircuitBreakerServiceIT.java | 6 +- .../indices/recovery/IndexRecoveryIT.java | 49 ++--------- .../indices/recovery/TaskRecoveryIT.java | 7 +- .../indices/state/CloseIndexIT.java | 27 +----- .../recovery/FullRollingRestartIT.java | 6 +- .../recovery/RecoveryWhileUnderLoadIT.java | 27 ++---- .../elasticsearch/recovery/RelocationIT.java | 5 +- .../recovery/TruncatedRecoveryIT.java | 5 +- .../SignificantTermsSignificanceScoreIT.java | 5 +- .../bucket/TermsShardMinDocCountIT.java | 13 +-- .../search/fieldcaps/FieldCapabilitiesIT.java | 19 ++--- .../search/functionscore/QueryRescorerIT.java | 6 +- .../search/morelikethis/MoreLikeThisIT.java | 3 +- .../routing/SearchReplicaSelectionIT.java | 8 +- .../search/scroll/SearchScrollIT.java | 22 +---- .../search/simple/SimpleSearchIT.java | 8 +- .../search/stats/FieldUsageStatsIT.java | 9 +- .../search/stats/SearchStatsIT.java | 15 +--- .../suggest/CompletionSuggestSearchIT.java | 7 +- .../search/suggest/SuggestSearchIT.java | 8 +- .../snapshots/BlobStoreIncrementalityIT.java | 9 +- .../snapshots/RestoreSnapshotIT.java | 9 +- .../SharedClusterSnapshotRestoreIT.java | 8 +- .../reroute/ClusterRerouteResponseTests.java | 6 +- .../cluster/stats/AnalysisStatsTests.java | 19 +---- .../cluster/stats/MappingStatsTests.java | 26 ++---- .../cluster/stats/VersionStatsTests.java | 9 +- .../MetadataRolloverServiceTests.java | 26 +----- .../TransportRolloverActionTests.java | 26 ++---- .../TransportUpdateSettingsActionTests.java | 14 +--- .../ResizeNumberOfShardsCalculatorTests.java | 22 ++--- .../bulk/TransportShardBulkActionTests.java | 6 +- .../fieldcaps/RequestDispatcherTests.java | 48 +++++------ .../get/TransportMultiGetActionTests.java | 12 +-- ...ReplicationAllPermitsAcquisitionTests.java | 9 +- .../TransportMultiTermVectorsActionTests.java | 12 +-- .../metadata/ComponentTemplateTests.java | 5 +- .../ComposableIndexTemplateTests.java | 5 +- .../metadata/IndexMetadataStatsTests.java | 11 +-- .../cluster/metadata/IndexMetadataTests.java | 65 ++------------ .../metadata/IndexMetadataVerifierTests.java | 12 +-- .../MetadataIndexTemplateServiceTests.java | 48 ++--------- .../cluster/metadata/MetadataTests.java | 84 ++----------------- ...ystemIndexMetadataUpgradeServiceTests.java | 5 +- .../allocation/FailedNodeRoutingTests.java | 8 +- .../routing/allocation/IndexBalanceTests.java | 9 +- .../ResizeAllocationDeciderTests.java | 14 +--- .../ClusterAllocationSimulationTests.java | 9 +- .../allocator/ClusterInfoSimulatorTests.java | 7 +- .../DesiredBalanceComputerTests.java | 27 +----- .../decider/FilterAllocationDeciderTests.java | 6 +- ...NodeReplacementAllocationDeciderTests.java | 9 +- .../NodeShutdownAllocationDeciderTests.java | 9 +- .../common/settings/ScopedSettingsTests.java | 9 +- .../gateway/ClusterStateUpdatersTests.java | 9 +- .../gateway/DanglingIndicesStateTests.java | 6 +- .../GatewayMetaStatePersistedStateTests.java | 11 +-- .../gateway/MetaStateServiceTests.java | 9 +- .../gateway/PriorityComparatorTests.java | 6 +- .../index/IndexSettingsTests.java | 38 +-------- .../index/IndexingSlowLogTests.java | 9 +- .../index/MergeSchedulerSettingsTests.java | 18 ++-- .../index/SearchSlowLogTests.java | 9 +- .../FieldStatsProviderRefreshTests.java | 9 +- .../index/mapper/DateFieldTypeTests.java | 19 +---- .../index/mapper/IdFieldTypeTests.java | 9 +- .../index/mapper/MapperServiceTests.java | 14 +--- .../index/mapper/NumberFieldTypeTests.java | 8 +- .../index/mapper/ReloadableAnalyzerTests.java | 6 +- .../query/SearchExecutionContextTests.java | 15 +--- .../ScoreFunctionBuilderTests.java | 20 ++--- .../seqno/RetentionLeaseActionsTests.java | 54 ++---------- .../index/seqno/RetentionLeaseStatsTests.java | 6 +- .../index/shard/IndexShardTests.java | 79 +++-------------- .../RemoveCorruptedShardDataCommandTests.java | 6 +- .../index/shard/ShardGetServiceTests.java | 22 +---- .../indices/IndicesServiceCloseTests.java | 16 +--- .../indices/SystemIndexManagerTests.java | 7 +- .../recovery/RecoverySourceHandlerTests.java | 17 ++-- .../ShardSnapshotTaskRunnerTests.java | 7 +- .../search/DefaultSearchContextTests.java | 6 +- .../fetch/subphase/FieldFetcherTests.java | 7 +- .../search/slice/SliceBuilderTests.java | 7 +- .../index/mapper/MapperServiceTestCase.java | 7 +- .../xpack/ccr/FollowIndexSecurityIT.java | 9 +- .../ccr/action/ShardChangesActionTests.java | 9 +- .../xpack/ccr/action/ShardChangesTests.java | 5 +- .../index/engine/FollowingEngineTests.java | 68 +++------------ .../DataTierAllocationDeciderIT.java | 32 +------ .../rest/action/ReloadSynonymAnalyzerIT.java | 5 +- .../core/action/ReloadAnalyzerTests.java | 26 ++---- .../action/GetGlobalCheckpointsActionIT.java | 61 +++----------- .../index/engine/frozen/FrozenIndexTests.java | 11 +-- .../xpack/ilm/CCRIndexLifecycleIT.java | 36 +++----- .../xpack/ilm/IndexLifecycleRunnerTests.java | 7 +- .../xpack/ilm/PolicyStepsRegistryTests.java | 46 ++-------- .../DownsampleActionSingleNodeTests.java | 14 +--- .../ShrinkIndexWithSecurityTests.java | 7 +- .../accesscontrol/OptOutQueryCacheTests.java | 12 +-- .../xpack/shutdown/NodeShutdownShardsIT.java | 18 +--- .../checkpoint/TransformGetCheckpointIT.java | 7 +- 140 files changed, 406 insertions(+), 1890 deletions(-) diff --git a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/DatabaseNodeServiceTests.java b/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/DatabaseNodeServiceTests.java index f2f6bb343f87..2881c4ee5440 100644 --- a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/DatabaseNodeServiceTests.java +++ b/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/DatabaseNodeServiceTests.java @@ -369,13 +369,7 @@ public class DatabaseNodeServiceTests extends ESTestCase { : GeoIpDownloader.DATABASES_INDEX; Index index = new Index(indexName, UUID.randomUUID().toString()); IndexMetadata.Builder idxMeta = IndexMetadata.builder(index.getName()) - .settings( - Settings.builder() - .put("index.version.created", Version.CURRENT) - .put("index.uuid", index.getUUID()) - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - ); + .settings(indexSettings(Version.CURRENT, 1, 0).put("index.uuid", index.getUUID())); if (aliasGeoipDatabase) { idxMeta.putAlias(AliasMetadata.builder(GeoIpDownloader.DATABASES_INDEX)); } diff --git a/modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/AbstractFeatureMigrationIntegTest.java b/modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/AbstractFeatureMigrationIntegTest.java index 8eaef68e4ba6..08397611f728 100644 --- a/modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/AbstractFeatureMigrationIntegTest.java +++ b/modules/reindex/src/internalClusterTest/java/org/elasticsearch/migration/AbstractFeatureMigrationIntegTest.java @@ -195,12 +195,7 @@ public abstract class AbstractFeatureMigrationIntegTest extends ESIntegTestCase } static Settings createSettings(Version creationVersion, int flagSettingValue) { - return Settings.builder() - .put(IndexMetadata.INDEX_NUMBER_OF_SHARDS_SETTING.getKey(), 1) - .put(IndexMetadata.INDEX_NUMBER_OF_REPLICAS_SETTING.getKey(), 0) - .put(FlAG_SETTING_KEY, flagSettingValue) - .put("index.version.created", creationVersion) - .build(); + return indexSettings(creationVersion, 1, 0).put(FlAG_SETTING_KEY, flagSettingValue).build(); } static String createMapping(boolean descriptorManaged, boolean descriptorInternal) { diff --git a/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexSourceTargetValidationTests.java b/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexSourceTargetValidationTests.java index 7e861ccbc9c5..a6d2194e6458 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexSourceTargetValidationTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/ReindexSourceTargetValidationTests.java @@ -179,13 +179,7 @@ public class ReindexSourceTargetValidationTests extends ESTestCase { } private static IndexMetadata index(String name, @Nullable Boolean writeIndex, String... aliases) { - IndexMetadata.Builder builder = IndexMetadata.builder(name) - .settings( - Settings.builder() - .put("index.version.created", Version.CURRENT.id) - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 1) - ); + IndexMetadata.Builder builder = IndexMetadata.builder(name).settings(indexSettings(Version.CURRENT, 1, 1)); for (String alias : aliases) { builder.putAlias(AliasMetadata.builder(alias).writeIndex(writeIndex).build()); } diff --git a/modules/reindex/src/test/java/org/elasticsearch/reindex/RetryTests.java b/modules/reindex/src/test/java/org/elasticsearch/reindex/RetryTests.java index 83ec316dc1aa..a7bf78f66661 100644 --- a/modules/reindex/src/test/java/org/elasticsearch/reindex/RetryTests.java +++ b/modules/reindex/src/test/java/org/elasticsearch/reindex/RetryTests.java @@ -171,11 +171,7 @@ public class RetryTests extends ESIntegTestCase { .put("node.attr.color", "blue") .build(); final String node = internalCluster().startDataOnlyNode(nodeSettings); - final Settings indexSettings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.routing.allocation.include.color", "blue") - .build(); + final Settings indexSettings = indexSettings(1, 0).put("index.routing.allocation.include.color", "blue").build(); // Create the source index on the node with small thread pools so we can block them. client().admin().indices().prepareCreate("source").setSettings(indexSettings).execute().actionGet(); diff --git a/qa/multi-cluster-search/src/test/java/org/elasticsearch/search/CCSDuelIT.java b/qa/multi-cluster-search/src/test/java/org/elasticsearch/search/CCSDuelIT.java index af0246dada05..a198a5e72694 100644 --- a/qa/multi-cluster-search/src/test/java/org/elasticsearch/search/CCSDuelIT.java +++ b/qa/multi-cluster-search/src/test/java/org/elasticsearch/search/CCSDuelIT.java @@ -174,7 +174,7 @@ public class CCSDuelIT extends ESRestTestCase { assertTrue(response.isAcknowledged()); int numShards = randomIntBetween(1, 5); - Settings settings = Settings.builder().put("index.number_of_shards", numShards).put("index.number_of_replicas", 0).build(); + Settings settings = indexSettings(numShards, 0).build(); String mapping = """ { "properties": { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java index ba4f53f35593..1142ae16300c 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplainIT.java @@ -1213,12 +1213,7 @@ public final class ClusterAllocationExplainIT extends ESIntegTestCase { client().admin() .indices() .prepareCreate("idx") - .setSettings( - Settings.builder() - .put("index.number_of_shards", numPrimaries) - .put("index.number_of_replicas", numReplicas) - .put(settings) - ) + .setSettings(indexSettings(numPrimaries, numReplicas).put(settings)) .setWaitForActiveShards(activeShardCount) .get() ); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java index 9fa04b4b3511..dd05fa72a9ab 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/ShrinkIndexIT.java @@ -105,13 +105,7 @@ public class ShrinkIndexIT extends ESIntegTestCase { client().admin() .indices() .prepareResizeIndex("source", "first_shrink") - .setSettings( - Settings.builder() - .put("index.number_of_replicas", 0) - .put("index.number_of_shards", shardSplits[1]) - .putNull("index.blocks.write") - .build() - ) + .setSettings(indexSettings(shardSplits[1], 0).putNull("index.blocks.write").build()) .get() ); ensureGreen(); @@ -139,12 +133,7 @@ public class ShrinkIndexIT extends ESIntegTestCase { .indices() .prepareResizeIndex("first_shrink", "second_shrink") .setSettings( - Settings.builder() - .put("index.number_of_replicas", 0) - .put("index.number_of_shards", shardSplits[2]) - .putNull("index.blocks.write") - .putNull("index.routing.allocation.require._name") - .build() + indexSettings(shardSplits[2], 0).putNull("index.blocks.write").putNull("index.routing.allocation.require._name").build() ) .get() ); @@ -230,10 +219,7 @@ public class ShrinkIndexIT extends ESIntegTestCase { final long beforeShrinkPrimaryTerm = IntStream.range(0, numberOfShards).mapToLong(indexMetadata::primaryTerm).max().getAsLong(); // now merge source into target - final Settings shrinkSettings = Settings.builder() - .put("index.number_of_replicas", 0) - .put("index.number_of_shards", numberOfTargetShards) - .build(); + final Settings shrinkSettings = indexSettings(numberOfTargetShards, 0).build(); assertAcked(client().admin().indices().prepareResizeIndex("source", "target").setSettings(shrinkSettings).get()); ensureGreen(TimeValue.timeValueSeconds(120)); @@ -476,13 +462,7 @@ public class ShrinkIndexIT extends ESIntegTestCase { () -> client().admin() .indices() .prepareResizeIndex("source", "target") - .setSettings( - Settings.builder() - .put("index.number_of_replicas", 0) - .put("index.number_of_shards", "2") - .put("index.sort.field", "foo") - .build() - ) + .setSettings(indexSettings(2, 0).put("index.sort.field", "foo").build()) .get() ); assertThat(exc.getMessage(), containsString("can't override index sort when resizing an index")); @@ -492,13 +472,7 @@ public class ShrinkIndexIT extends ESIntegTestCase { client().admin() .indices() .prepareResizeIndex("source", "target") - .setSettings( - Settings.builder() - .put("index.number_of_replicas", 0) - .put("index.number_of_shards", "2") - .putNull("index.blocks.write") - .build() - ) + .setSettings(indexSettings(2, 0).putNull("index.blocks.write").build()) .get() ); ensureGreen(); @@ -620,11 +594,9 @@ public class ShrinkIndexIT extends ESIntegTestCase { .indices() .prepareResizeIndex("original", "shrunk") .setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .putNull(IndexMetadata.INDEX_ROUTING_REQUIRE_GROUP_SETTING.getConcreteSettingForNamespace("_name").getKey()) - .build() + indexSettings(1, 1).putNull( + IndexMetadata.INDEX_ROUTING_REQUIRE_GROUP_SETTING.getConcreteSettingForNamespace("_name").getKey() + ).build() ) .setResizeType(ResizeType.SHRINK) .get() @@ -644,11 +616,9 @@ public class ShrinkIndexIT extends ESIntegTestCase { .indices() .prepareResizeIndex("shrunk", "splitagain") .setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, shardCount) - .putNull(IndexMetadata.INDEX_ROUTING_REQUIRE_GROUP_SETTING.getConcreteSettingForNamespace("_name").getKey()) - .build() + indexSettings(shardCount, 0).putNull( + IndexMetadata.INDEX_ROUTING_REQUIRE_GROUP_SETTING.getConcreteSettingForNamespace("_name").getKey() + ).build() ) .setResizeType(ResizeType.SPLIT) ); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java index 722f05661b2f..e7d4476138fb 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/admin/indices/create/SplitIndexIT.java @@ -178,10 +178,7 @@ public class SplitIndexIT extends ESIntegTestCase { ensureYellow(); updateIndexSettings(Settings.builder().put("index.blocks.write", true), "source"); ensureGreen(); - Settings.Builder firstSplitSettingsBuilder = Settings.builder() - .put("index.number_of_replicas", 0) - .put("index.number_of_shards", firstSplitShards) - .putNull("index.blocks.write"); + Settings.Builder firstSplitSettingsBuilder = indexSettings(firstSplitShards, 0).putNull("index.blocks.write"); if (sourceShards == 1 && useRoutingPartition == false && randomBoolean()) { // try to set it if we have a source index with 1 shard firstSplitSettingsBuilder.put("index.number_of_routing_shards", secondSplitShards); } @@ -220,13 +217,7 @@ public class SplitIndexIT extends ESIntegTestCase { .indices() .prepareResizeIndex("first_split", "second_split") .setResizeType(ResizeType.SPLIT) - .setSettings( - Settings.builder() - .put("index.number_of_replicas", 0) - .put("index.number_of_shards", secondSplitShards) - .putNull("index.blocks.write") - .build() - ) + .setSettings(indexSettings(secondSplitShards, 0).putNull("index.blocks.write").build()) .get() ); ensureGreen(); @@ -339,11 +330,7 @@ public class SplitIndexIT extends ESIntegTestCase { final long beforeSplitPrimaryTerm = IntStream.range(0, numberOfShards).mapToLong(indexMetadata::primaryTerm).max().getAsLong(); // now split source into target - final Settings splitSettings = Settings.builder() - .put("index.number_of_replicas", 0) - .put("index.number_of_shards", numberOfTargetShards) - .putNull("index.blocks.write") - .build(); + final Settings splitSettings = indexSettings(numberOfTargetShards, 0).putNull("index.blocks.write").build(); assertAcked( client().admin() .indices() @@ -398,13 +385,7 @@ public class SplitIndexIT extends ESIntegTestCase { .indices() .prepareResizeIndex("source", "target") .setResizeType(ResizeType.SPLIT) - .setSettings( - Settings.builder() - .put("index.number_of_replicas", createWithReplicas ? 1 : 0) - .put("index.number_of_shards", 2) - .putNull("index.blocks.write") - .build() - ) + .setSettings(indexSettings(2, createWithReplicas ? 1 : 0).putNull("index.blocks.write").build()) .get() ); ensureGreen(); @@ -508,13 +489,7 @@ public class SplitIndexIT extends ESIntegTestCase { .indices() .prepareResizeIndex("source", "target") .setResizeType(ResizeType.SPLIT) - .setSettings( - Settings.builder() - .put("index.number_of_replicas", 0) - .put("index.number_of_shards", 4) - .put("index.sort.field", "foo") - .build() - ) + .setSettings(indexSettings(4, 0).put("index.sort.field", "foo").build()) .get() ); assertThat(exc.getMessage(), containsString("can't override index sort when resizing an index")); @@ -525,13 +500,7 @@ public class SplitIndexIT extends ESIntegTestCase { .indices() .prepareResizeIndex("source", "target") .setResizeType(ResizeType.SPLIT) - .setSettings( - Settings.builder() - .put("index.number_of_replicas", 0) - .put("index.number_of_shards", 4) - .putNull("index.blocks.write") - .build() - ) + .setSettings(indexSettings(4, 0).putNull("index.blocks.write").build()) .get() ); ensureGreen(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java b/server/src/internalClusterTest/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java index 38cf9d57dba3..950345d17639 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/action/support/WaitActiveShardCountIT.java @@ -13,7 +13,6 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.indices.create.CreateIndexResponse; import org.elasticsearch.cluster.health.ClusterHealthStatus; import org.elasticsearch.common.Priority; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.core.Strings; import org.elasticsearch.rest.RestStatus; import org.elasticsearch.test.ESIntegTestCase; @@ -30,11 +29,7 @@ import static org.hamcrest.Matchers.startsWith; */ public class WaitActiveShardCountIT extends ESIntegTestCase { public void testReplicationWaitsForActiveShardCount() throws Exception { - CreateIndexResponse createIndexResponse = prepareCreate( - "test", - 1, - Settings.builder().put("index.number_of_shards", 1).put("index.number_of_replicas", 2) - ).get(); + CreateIndexResponse createIndexResponse = prepareCreate("test", 1, indexSettings(1, 2)).get(); assertAcked(createIndexResponse); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/aliases/IndexAliasesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/aliases/IndexAliasesIT.java index 98b3878fb5e7..b830e9c645ca 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/aliases/IndexAliasesIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/aliases/IndexAliasesIT.java @@ -27,7 +27,6 @@ import org.elasticsearch.cluster.metadata.IndexAbstraction; import org.elasticsearch.cluster.metadata.IndexMetadata; import org.elasticsearch.cluster.metadata.Metadata; import org.elasticsearch.common.StopWatch; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.core.TimeValue; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryBuilders; @@ -704,15 +703,7 @@ public class IndexAliasesIT extends ESIntegTestCase { public void testWaitForAliasCreationSingleShard() throws Exception { logger.info("--> creating index [test]"); - assertAcked( - admin().indices() - .create( - new CreateIndexRequest("test").settings( - Settings.builder().put("index.number_of_replicas", 0).put("index.number_of_shards", 1) - ) - ) - .get() - ); + assertAcked(admin().indices().create(new CreateIndexRequest("test").settings(indexSettings(1, 0))).get()); ensureGreen(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/PrevalidateNodeRemovalIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/PrevalidateNodeRemovalIT.java index 4d6c9d47be1f..afb706abf9a9 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/PrevalidateNodeRemovalIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/PrevalidateNodeRemovalIT.java @@ -125,14 +125,7 @@ public class PrevalidateNodeRemovalIT extends ESIntegTestCase { String node1 = internalCluster().startDataOnlyNode(); String node2 = internalCluster().startDataOnlyNode(); String indexName = "test-idx"; - createIndex( - indexName, - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put("index.routing.allocation.require._name", node1) - .build() - ); + createIndex(indexName, indexSettings(1, 0).put("index.routing.allocation.require._name", node1).build()); ensureGreen(indexName); // Prevent node1 from removing its local index shard copies upon removal, by blocking // its ACTION_SHARD_EXISTS requests since after a relocation, the source first waits @@ -181,14 +174,7 @@ public class PrevalidateNodeRemovalIT extends ESIntegTestCase { String node1 = internalCluster().startDataOnlyNode(); String node2 = internalCluster().startDataOnlyNode(); String indexName = "test-index"; - createIndex( - indexName, - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put("index.routing.allocation.require._name", node1) - .build() - ); + createIndex(indexName, indexSettings(1, 0).put("index.routing.allocation.require._name", node1).build()); ensureGreen(indexName); // make it red! internalCluster().stopNode(node1); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java index 7c48eb42f1ca..cf9a91453012 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/allocation/ClusterRerouteIT.java @@ -231,10 +231,7 @@ public class ClusterRerouteIT extends ESIntegTestCase { final String indexName = "test" + i; createIndex( indexName, - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 5) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), randomIntBetween(250, 1000) + "ms") + indexSettings(5, 1).put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), randomIntBetween(250, 1000) + "ms") .build() ); if (randomBoolean()) { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RareClusterStateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RareClusterStateIT.java index 8d4ca4437e97..a514ff38b032 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RareClusterStateIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/coordination/RareClusterStateIT.java @@ -73,9 +73,7 @@ public class RareClusterStateIT extends ESIntegTestCase { public void testAssignmentWithJustAddedNodes() { internalCluster().startNode(Settings.builder().put(TransportSettings.CONNECT_TIMEOUT.getKey(), "1s")); final String index = "index"; - prepareCreate(index).setSettings( - Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - ).get(); + prepareCreate(index).setSettings(indexSettings(1, 0)).get(); ensureGreen(index); // close to have some unassigned started shards shards.. @@ -243,14 +241,7 @@ public class RareClusterStateIT extends ESIntegTestCase { assertNotNull(otherNode); // Don't allocate the shard on the master node - assertAcked( - prepareCreate("index").setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put("index.routing.allocation.exclude._name", master) - ).get() - ); + assertAcked(prepareCreate("index").setSettings(indexSettings(1, 0).put("index.routing.allocation.exclude._name", master)).get()); ensureGreen(); // Check routing tables @@ -333,12 +324,7 @@ public class RareClusterStateIT extends ESIntegTestCase { // Force allocation of the primary on the master node by first only allocating on the master // and then allowing all nodes so that the replica gets allocated on the other node - prepareCreate("index").setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put("index.routing.allocation.include._name", master) - ).get(); + prepareCreate("index").setSettings(indexSettings(1, 1).put("index.routing.allocation.include._name", master)).get(); updateIndexSettings(Settings.builder().put("index.routing.allocation.include._name", ""), "index"); ensureGreen(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java index 9deb0aea52a5..1ad6486738a0 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/DelayedAllocationIT.java @@ -10,7 +10,6 @@ package org.elasticsearch.cluster.routing; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.cluster.ClusterState; -import org.elasticsearch.cluster.metadata.IndexMetadata; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.core.TimeValue; import org.elasticsearch.test.ESIntegTestCase; @@ -29,12 +28,8 @@ public class DelayedAllocationIT extends ESIntegTestCase { */ public void testNoDelayedTimeout() throws Exception { internalCluster().startNodes(3); - prepareCreate("test").setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), 0) - ).get(); + prepareCreate("test").setSettings(indexSettings(1, 1).put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), 0)) + .get(); ensureGreen("test"); indexRandomData(); internalCluster().stopNode(findNodeWithShard()); @@ -51,10 +46,7 @@ public class DelayedAllocationIT extends ESIntegTestCase { public void testDelayedAllocationNodeLeavesAndComesBack() throws Exception { internalCluster().startNodes(3); prepareCreate("test").setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), TimeValue.timeValueHours(1)) + indexSettings(1, 1).put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), TimeValue.timeValueHours(1)) ).get(); ensureGreen("test"); indexRandomData(); @@ -79,10 +71,7 @@ public class DelayedAllocationIT extends ESIntegTestCase { public void testDelayedAllocationTimesOut() throws Exception { internalCluster().startNodes(3); prepareCreate("test").setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), TimeValue.timeValueMillis(100)) + indexSettings(1, 1).put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), TimeValue.timeValueMillis(100)) ).get(); ensureGreen("test"); indexRandomData(); @@ -110,10 +99,7 @@ public class DelayedAllocationIT extends ESIntegTestCase { public void testDelayedAllocationChangeWithSettingTo100ms() throws Exception { internalCluster().startNodes(3); prepareCreate("test").setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), TimeValue.timeValueHours(1)) + indexSettings(1, 1).put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), TimeValue.timeValueHours(1)) ).get(); ensureGreen("test"); indexRandomData(); @@ -142,10 +128,7 @@ public class DelayedAllocationIT extends ESIntegTestCase { public void testDelayedAllocationChangeWithSettingTo0() throws Exception { internalCluster().startNodes(3); prepareCreate("test").setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), TimeValue.timeValueHours(1)) + indexSettings(1, 1).put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), TimeValue.timeValueHours(1)) ).get(); ensureGreen("test"); indexRandomData(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java index 73a2d8b63096..d75bbb57fca6 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/PrimaryAllocationIT.java @@ -55,8 +55,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import java.util.stream.Stream; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; @@ -92,12 +90,7 @@ public class PrimaryAllocationIT extends ESIntegTestCase { client().admin() .indices() .prepareCreate("test") - .setSettings( - Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 1) - .put("index.global_checkpoint_sync.interval", "1s") - ) + .setSettings(indexSettings(1, 1).put("index.global_checkpoint_sync.interval", "1s")) .get() ); ensureGreen(); @@ -422,12 +415,7 @@ public class PrimaryAllocationIT extends ESIntegTestCase { .indices() .prepareCreate("test") .setWaitForActiveShards(ActiveShardCount.NONE) - .setSettings( - Settings.builder() - .put("index.routing.allocation.exclude._name", node) - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - ) + .setSettings(indexSettings(1, 0).put("index.routing.allocation.exclude._name", node)) .get(); assertThat( @@ -446,12 +434,7 @@ public class PrimaryAllocationIT extends ESIntegTestCase { client().admin() .indices() .prepareCreate("test") - .setSettings( - Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 1) - .put("index.unassigned.node_left.delayed_timeout", "0ms") - ) + .setSettings(indexSettings(1, 1).put("index.unassigned.node_left.delayed_timeout", "0ms")) .get() ); String replicaNode = internalCluster().startDataOnlyNode(Settings.EMPTY); @@ -486,12 +469,7 @@ public class PrimaryAllocationIT extends ESIntegTestCase { client().admin() .indices() .prepareCreate("test") - .setSettings( - Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 1) - .put("index.unassigned.node_left.delayed_timeout", "0ms") - ) + .setSettings(indexSettings(1, 1).put("index.unassigned.node_left.delayed_timeout", "0ms")) .get() ); String replicaNode = internalCluster().startDataOnlyNode(Settings.EMPTY); @@ -580,12 +558,7 @@ public class PrimaryAllocationIT extends ESIntegTestCase { String master = internalCluster().startMasterOnlyNode(Settings.EMPTY); final int numberOfReplicas = between(2, 3); final String oldPrimary = internalCluster().startDataOnlyNode(); - assertAcked( - prepareCreate( - "test", - Settings.builder().put(indexSettings()).put(SETTING_NUMBER_OF_SHARDS, 1).put(SETTING_NUMBER_OF_REPLICAS, numberOfReplicas) - ) - ); + assertAcked(prepareCreate("test", indexSettings(1, numberOfReplicas))); final ShardId shardId = new ShardId(clusterService().state().metadata().index("test").getIndex(), 0); final Set replicaNodes = new HashSet<>(internalCluster().startDataOnlyNodes(numberOfReplicas)); ensureGreen(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/RemoveReplicaPriorityIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/RemoveReplicaPriorityIT.java index e6406834de65..bc5e24668b58 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/RemoveReplicaPriorityIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/RemoveReplicaPriorityIT.java @@ -70,10 +70,7 @@ public class RemoveReplicaPriorityIT extends ESIntegTestCase { createIndex( INDEX_NAME, - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 3) - .put(IndexMetadata.INDEX_ROUTING_INCLUDE_GROUP_PREFIX + "._id", dataNodeIdFilter) + indexSettings(1, 3).put(IndexMetadata.INDEX_ROUTING_INCLUDE_GROUP_PREFIX + "._id", dataNodeIdFilter) .put(IndexMetadata.INDEX_ROUTING_EXCLUDE_GROUP_PREFIX + "._id", excludedDataNodeId) .build() ); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/ShardRoutingRoleIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/ShardRoutingRoleIT.java index 8835d44115be..c5a32743c054 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/ShardRoutingRoleIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/ShardRoutingRoleIT.java @@ -235,10 +235,7 @@ public class ShardRoutingRoleIT extends ESIntegTestCase { Settings getIndexSettings() { logger.info("--> numShards={}, numReplicas={}", numShards, numReplicas); - return Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, numShards) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, numReplicas) - .build(); + return indexSettings(numShards, numReplicas).build(); } } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorIT.java index 67f664e52891..1fd0f3417690 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/DiskThresholdMonitorIT.java @@ -50,10 +50,7 @@ public class DiskThresholdMonitorIT extends DiskUsageIntegTestCase { final String indexName = randomAlphaOfLength(10).toLowerCase(Locale.ROOT); createIndex( indexName, - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(INDEX_STORE_STATS_REFRESH_INTERVAL_SETTING.getKey(), "0ms") + indexSettings(1, 0).put(INDEX_STORE_STATS_REFRESH_INTERVAL_SETTING.getKey(), "0ms") .put(INDEX_ROUTING_REQUIRE_GROUP_SETTING.getConcreteSettingForNamespace("_name").getKey(), dataNodeName) .build() ); @@ -110,10 +107,7 @@ public class DiskThresholdMonitorIT extends DiskUsageIntegTestCase { final String indexName = randomAlphaOfLength(10).toLowerCase(Locale.ROOT); createIndex( indexName, - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(INDEX_STORE_STATS_REFRESH_INTERVAL_SETTING.getKey(), "0ms") + indexSettings(1, 0).put(INDEX_STORE_STATS_REFRESH_INTERVAL_SETTING.getKey(), "0ms") .put(INDEX_ROUTING_REQUIRE_GROUP_SETTING.getConcreteSettingForNamespace("_name").getKey(), dataNodeName) .build() ); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/ShardStateIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/ShardStateIT.java index 03267a6cd08b..a6c27fba26e3 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/ShardStateIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/ShardStateIT.java @@ -10,7 +10,6 @@ package org.elasticsearch.cluster.routing.allocation; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.health.ClusterHealthStatus; import org.elasticsearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.IndexService; import org.elasticsearch.index.shard.IndexShard; import org.elasticsearch.indices.IndicesService; @@ -22,9 +21,7 @@ public class ShardStateIT extends ESIntegTestCase { public void testPrimaryFailureIncreasesTerm() throws Exception { internalCluster().ensureAtLeastNumDataNodes(2); - prepareCreate("test").setSettings( - Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 2).put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - ).get(); + prepareCreate("test").setSettings(indexSettings(2, 1)).get(); ensureGreen(); assertPrimaryTerms(1, 1); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderIT.java index 025a3bf7b819..ccc3a8d952c4 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/DiskThresholdDeciderIT.java @@ -16,7 +16,6 @@ import org.elasticsearch.cluster.ClusterInfoService; import org.elasticsearch.cluster.ClusterInfoServiceUtils; import org.elasticsearch.cluster.DiskUsageIntegTestCase; import org.elasticsearch.cluster.InternalClusterInfoService; -import org.elasticsearch.cluster.metadata.IndexMetadata; import org.elasticsearch.cluster.routing.IndexRoutingTable; import org.elasticsearch.cluster.routing.IndexShardRoutingTable; import org.elasticsearch.cluster.routing.ShardRouting; @@ -84,14 +83,7 @@ public class DiskThresholdDeciderIT extends DiskUsageIntegTestCase { final String dataNode0Id = internalCluster().getInstance(NodeEnvironment.class, dataNodeName).nodeId(); final String indexName = randomAlphaOfLength(10).toLowerCase(Locale.ROOT); - createIndex( - indexName, - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 6) - .put(INDEX_STORE_STATS_REFRESH_INTERVAL_SETTING.getKey(), "0ms") - .build() - ); + createIndex(indexName, indexSettings(6, 0).put(INDEX_STORE_STATS_REFRESH_INTERVAL_SETTING.getKey(), "0ms").build()); var smallestShard = createReasonableSizedShards(indexName); // reduce disk size of node 0 so that no shards fit below the high watermark, forcing all shards onto the other data node @@ -127,14 +119,7 @@ public class DiskThresholdDeciderIT extends DiskUsageIntegTestCase { final String dataNode0Id = internalCluster().getInstance(NodeEnvironment.class, dataNodeName).nodeId(); final String indexName = randomAlphaOfLength(10).toLowerCase(Locale.ROOT); - createIndex( - indexName, - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 6) - .put(INDEX_STORE_STATS_REFRESH_INTERVAL_SETTING.getKey(), "0ms") - .build() - ); + createIndex(indexName, indexSettings(6, 0).put(INDEX_STORE_STATS_REFRESH_INTERVAL_SETTING.getKey(), "0ms").build()); var smallestShard = createReasonableSizedShards(indexName); final CreateSnapshotResponse createSnapshotResponse = client().admin() diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/UpdateShardAllocationSettingsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/UpdateShardAllocationSettingsIT.java index e7522bdcd664..acbb71aa57d6 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/UpdateShardAllocationSettingsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/routing/allocation/decider/UpdateShardAllocationSettingsIT.java @@ -8,7 +8,6 @@ package org.elasticsearch.cluster.routing.allocation.decider; import org.elasticsearch.cluster.ClusterState; -import org.elasticsearch.cluster.metadata.IndexMetadata; import org.elasticsearch.cluster.routing.ShardRoutingState; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.test.ESIntegTestCase; @@ -38,16 +37,8 @@ public class UpdateShardAllocationSettingsIT extends ESIntegTestCase { // we test with 2 shards since otherwise it's pretty fragile if there are difference in the num or shards such that // all shards are relocated to the second node which is not what we want here. It's solely a test for the settings to take effect final int numShards = 2; - assertAcked( - prepareCreate("test").setSettings( - Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0).put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, numShards) - ) - ); - assertAcked( - prepareCreate("test_1").setSettings( - Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0).put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, numShards) - ) - ); + assertAcked(prepareCreate("test").setSettings(indexSettings(numShards, 0))); + assertAcked(prepareCreate("test_1").setSettings(indexSettings(numShards, 0))); ensureGreen(); assertAllShardsOnNodes("test", firstNode); assertAllShardsOnNodes("test_1", firstNode); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java index 3c59cb4020a0..718e966f9dba 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/shards/ClusterSearchShardsIT.java @@ -42,12 +42,7 @@ public class ClusterSearchShardsIT extends ESIntegTestCase { client().admin() .indices() .prepareCreate("test") - .setSettings( - Settings.builder() - .put("index.number_of_shards", "1") - .put("index.number_of_replicas", 0) - .put("index.routing.allocation.include.tag", "A") - ) + .setSettings(indexSettings(1, 0).put("index.routing.allocation.include.tag", "A")) .execute() .actionGet(); ensureGreen(); @@ -73,12 +68,7 @@ public class ClusterSearchShardsIT extends ESIntegTestCase { client().admin() .indices() .prepareCreate("test") - .setSettings( - Settings.builder() - .put("index.number_of_shards", "4") - .put("index.number_of_replicas", 0) - .put("index.routing.allocation.include.tag", "A") - ) + .setSettings(indexSettings(4, 0).put("index.routing.allocation.include.tag", "A")) .execute() .actionGet(); ensureGreen(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/shards/ClusterShardLimitIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/shards/ClusterShardLimitIT.java index fd4bf7521860..91f55d0465c3 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/cluster/shards/ClusterShardLimitIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/cluster/shards/ClusterShardLimitIT.java @@ -126,11 +126,7 @@ public class ClusterShardLimitIT extends ESIntegTestCase { .preparePutTemplate("should-fail") .setPatterns(Collections.singletonList("should-fail")) .setOrder(1) - .setSettings( - Settings.builder() - .put(SETTING_NUMBER_OF_SHARDS, counts.getFailingIndexShards()) - .put(SETTING_NUMBER_OF_REPLICAS, counts.getFailingIndexReplicas()) - ) + .setSettings(indexSettings(counts.getFailingIndexShards(), counts.getFailingIndexReplicas())) .get() ); @@ -152,10 +148,7 @@ public class ClusterShardLimitIT extends ESIntegTestCase { int shardsPerNode = firstShardCount - 1; setShardsPerNode(shardsPerNode); - prepareCreate( - "growing-should-fail", - Settings.builder().put(indexSettings()).put(SETTING_NUMBER_OF_SHARDS, firstShardCount).put(SETTING_NUMBER_OF_REPLICAS, 0) - ).get(); + prepareCreate("growing-should-fail", indexSettings(firstShardCount, 0)).get(); try { client().admin() diff --git a/server/src/internalClusterTest/java/org/elasticsearch/discovery/ClusterDisruptionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/discovery/ClusterDisruptionIT.java index 6ad674f0386a..17f8e80ae0fa 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/discovery/ClusterDisruptionIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/discovery/ClusterDisruptionIT.java @@ -279,11 +279,7 @@ public class ClusterDisruptionIT extends AbstractDisruptionTestCase { public void testRejoinDocumentExistsInAllShardCopies() throws Exception { List nodes = startCluster(3); - assertAcked( - prepareCreate("test").setSettings( - Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 2) - ).get() - ); + assertAcked(prepareCreate("test").setSettings(indexSettings(1, 2)).get()); ensureGreen("test"); nodes = new ArrayList<>(nodes); @@ -329,11 +325,7 @@ public class ClusterDisruptionIT extends AbstractDisruptionTestCase { String masterNode = internalCluster().getMasterName(); List nonMasterNodes = nodes.stream().filter(node -> node.equals(masterNode) == false).toList(); String nonMasterNode = randomFrom(nonMasterNodes); - assertAcked( - prepareCreate("test").setSettings( - Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 3).put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 2) - ) - ); + assertAcked(prepareCreate("test").setSettings(indexSettings(3, 2))); ensureGreen(); String nonMasterNodeId = internalCluster().clusterService(nonMasterNode).localNode().getId(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/discovery/MasterDisruptionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/discovery/MasterDisruptionIT.java index e440ff012c32..1f22a933ffa0 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/discovery/MasterDisruptionIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/discovery/MasterDisruptionIT.java @@ -14,7 +14,6 @@ import org.elasticsearch.action.bulk.BulkRequestBuilder; import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.coordination.NoMasterBlockService; -import org.elasticsearch.cluster.metadata.IndexMetadata; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.core.Strings; import org.elasticsearch.core.TimeValue; @@ -87,13 +86,7 @@ public class MasterDisruptionIT extends AbstractDisruptionTestCase { public void testIsolateMasterAndVerifyClusterStateConsensus() throws Exception { final List nodes = startCluster(3); - assertAcked( - prepareCreate("test").setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1 + randomInt(2)) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, randomInt(2)) - ) - ); + assertAcked(prepareCreate("test").setSettings(indexSettings(1 + randomInt(2), randomInt(2)))); ensureGreen(); String isolatedNode = internalCluster().getMasterName(); @@ -164,11 +157,7 @@ public class MasterDisruptionIT extends AbstractDisruptionTestCase { internalCluster().startNodes(3, Settings.builder().putNull(NoMasterBlockService.NO_MASTER_BLOCK_SETTING.getKey()).build()); // Makes sure that the get request can be executed on each node locally: - assertAcked( - prepareCreate("test").setSettings( - Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 2) - ) - ); + assertAcked(prepareCreate("test").setSettings(indexSettings(1, 2))); // Everything is stable now, it is now time to simulate evil... // but first make sure we have no initializing shards and all is green diff --git a/server/src/internalClusterTest/java/org/elasticsearch/document/ShardInfoIT.java b/server/src/internalClusterTest/java/org/elasticsearch/document/ShardInfoIT.java index 6b356a79af56..315f7b5b9aab 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/document/ShardInfoIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/document/ShardInfoIT.java @@ -18,8 +18,6 @@ import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.action.support.replication.ReplicationResponse; import org.elasticsearch.action.update.UpdateResponse; import org.elasticsearch.cluster.ClusterState; -import org.elasticsearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.xcontent.XContentType; @@ -96,11 +94,9 @@ public class ShardInfoIT extends ESIntegTestCase { logger.info("Number of copies: {}", numCopies); assertAcked( - prepareCreate("idx").setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, numberOfPrimaryShards) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, numCopies - 1) - ).setMapping("_routing", "required=" + routingRequired).get() + prepareCreate("idx").setSettings(indexSettings(numberOfPrimaryShards, numCopies - 1)) + .setMapping("_routing", "required=" + routingRequired) + .get() ); for (int i = 0; i < numberOfPrimaryShards; i++) { ensureActiveShardCopies(i, numNodes); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java b/server/src/internalClusterTest/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java index 33c313eb4cf3..14c5aecc217f 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/gateway/RecoveryFromGatewayIT.java @@ -58,7 +58,6 @@ import java.util.Set; import java.util.stream.IntStream; import static org.elasticsearch.cluster.coordination.ClusterBootstrapService.INITIAL_MASTER_NODES_SETTING; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.gateway.GatewayService.RECOVER_AFTER_DATA_NODES_SETTING; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; @@ -194,11 +193,7 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase { ); // note: default replica settings are tied to #data nodes-1 which is 0 here. We can do with 1 in this test. int numberOfShards = numberOfShards(); - assertAcked( - prepareCreate("test").setSettings( - Settings.builder().put(SETTING_NUMBER_OF_SHARDS, numberOfShards()).put(SETTING_NUMBER_OF_REPLICAS, randomIntBetween(0, 1)) - ).setMapping(mapping) - ); + assertAcked(prepareCreate("test").setSettings(indexSettings(numberOfShards(), randomIntBetween(0, 1))).setMapping(mapping)); int value1Docs; int value2Docs; @@ -698,14 +693,7 @@ public class RecoveryFromGatewayIT extends ESIntegTestCase { 3, Settings.builder().put(ElectionSchedulerFactory.ELECTION_INITIAL_TIMEOUT_SETTING.getKey(), "2ms").build() ); - createIndex( - "test", - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), "100ms") - .build() - ); + createIndex("test", indexSettings(1, 0).put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), "100ms").build()); ensureGreen("test"); internalCluster().fullRestart(); ensureGreen("test"); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/gateway/ReplicaShardAllocatorIT.java b/server/src/internalClusterTest/java/org/elasticsearch/gateway/ReplicaShardAllocatorIT.java index 0601d11a5453..4e412ce495be 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/gateway/ReplicaShardAllocatorIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/gateway/ReplicaShardAllocatorIT.java @@ -9,7 +9,6 @@ package org.elasticsearch.gateway; import org.elasticsearch.action.admin.indices.stats.ShardStats; -import org.elasticsearch.cluster.metadata.IndexMetadata; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.routing.RoutingNodesHelper; import org.elasticsearch.cluster.routing.UnassignedInfo; @@ -80,10 +79,7 @@ public class ReplicaShardAllocatorIT extends ESIntegTestCase { .indices() .prepareCreate(indexName) .setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexSettings.FILE_BASED_RECOVERY_THRESHOLD_SETTING.getKey(), 1.0f) + indexSettings(1, 1).put(IndexSettings.FILE_BASED_RECOVERY_THRESHOLD_SETTING.getKey(), 1.0f) .put(IndexService.RETENTION_LEASE_SYNC_INTERVAL_SETTING.getKey(), "100ms") .put(IndexService.GLOBAL_CHECKPOINT_SYNC_INTERVAL_SETTING.getKey(), "100ms") .put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), "1ms") @@ -154,10 +150,7 @@ public class ReplicaShardAllocatorIT extends ESIntegTestCase { .indices() .prepareCreate(indexName) .setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexSettings.FILE_BASED_RECOVERY_THRESHOLD_SETTING.getKey(), 0.1f) + indexSettings(1, 1).put(IndexSettings.FILE_BASED_RECOVERY_THRESHOLD_SETTING.getKey(), 0.1f) .put(IndexService.GLOBAL_CHECKPOINT_SYNC_INTERVAL_SETTING.getKey(), "100ms") .put(IndexService.RETENTION_LEASE_SYNC_INTERVAL_SETTING.getKey(), "100ms") .put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), "1ms") @@ -248,10 +241,10 @@ public class ReplicaShardAllocatorIT extends ESIntegTestCase { .indices() .prepareCreate(indexName) .setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey(), randomIntBetween(10, 100) + "kb") - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, numOfReplicas) + indexSettings(1, numOfReplicas).put( + IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey(), + randomIntBetween(10, 100) + "kb" + ) .put(IndexSettings.FILE_BASED_RECOVERY_THRESHOLD_SETTING.getKey(), 0.5) .put(IndexService.GLOBAL_CHECKPOINT_SYNC_INTERVAL_SETTING.getKey(), "100ms") .put(IndexService.RETENTION_LEASE_SYNC_INTERVAL_SETTING.getKey(), "100ms") @@ -295,10 +288,10 @@ public class ReplicaShardAllocatorIT extends ESIntegTestCase { .indices() .prepareCreate(indexName) .setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey(), randomIntBetween(10, 100) + "kb") - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) + indexSettings(1, 1).put( + IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey(), + randomIntBetween(10, 100) + "kb" + ) .put(IndexSettings.FILE_BASED_RECOVERY_THRESHOLD_SETTING.getKey(), 3.0) .put(IndexService.GLOBAL_CHECKPOINT_SYNC_INTERVAL_SETTING.getKey(), "100ms") .put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), "0ms") @@ -361,10 +354,7 @@ public class ReplicaShardAllocatorIT extends ESIntegTestCase { .indices() .prepareCreate(indexName) .setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexService.GLOBAL_CHECKPOINT_SYNC_INTERVAL_SETTING.getKey(), "100ms") + indexSettings(1, 0).put(IndexService.GLOBAL_CHECKPOINT_SYNC_INTERVAL_SETTING.getKey(), "100ms") .put(IndexService.RETENTION_LEASE_SYNC_INTERVAL_SETTING.getKey(), "100ms") ) ); @@ -417,10 +407,7 @@ public class ReplicaShardAllocatorIT extends ESIntegTestCase { internalCluster().ensureAtLeastNumDataNodes(1); createIndex( indexName, - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexService.GLOBAL_CHECKPOINT_SYNC_INTERVAL_SETTING.getKey(), "100ms") + indexSettings(1, 0).put(IndexService.GLOBAL_CHECKPOINT_SYNC_INTERVAL_SETTING.getKey(), "100ms") .put(IndexService.RETENTION_LEASE_SYNC_INTERVAL_SETTING.getKey(), "100ms") .build() ); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/gateway/ReplicaShardAllocatorSyncIdIT.java b/server/src/internalClusterTest/java/org/elasticsearch/gateway/ReplicaShardAllocatorSyncIdIT.java index 70e4cb728b24..59b393cb571a 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/gateway/ReplicaShardAllocatorSyncIdIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/gateway/ReplicaShardAllocatorSyncIdIT.java @@ -10,7 +10,6 @@ package org.elasticsearch.gateway; import org.apache.lucene.index.IndexWriter; import org.elasticsearch.action.admin.indices.stats.ShardStats; -import org.elasticsearch.cluster.metadata.IndexMetadata; import org.elasticsearch.cluster.routing.UnassignedInfo; import org.elasticsearch.cluster.routing.allocation.decider.EnableAllocationDecider; import org.elasticsearch.common.UUIDs; @@ -159,10 +158,9 @@ public class ReplicaShardAllocatorSyncIdIT extends ESIntegTestCase { .indices() .prepareCreate(indexName) .setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexSettings.INDEX_SOFT_DELETES_RETENTION_LEASE_PERIOD_SETTING.getKey(), "1ms") // expire PRRLs quickly + indexSettings(1, 1) + // expire PRRLs quickly + .put(IndexSettings.INDEX_SOFT_DELETES_RETENTION_LEASE_PERIOD_SETTING.getKey(), "1ms") .put(IndexService.RETENTION_LEASE_SYNC_INTERVAL_SETTING.getKey(), "100ms") .put(IndexService.GLOBAL_CHECKPOINT_SYNC_INTERVAL_SETTING.getKey(), "100ms") .put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), "1ms") @@ -228,10 +226,10 @@ public class ReplicaShardAllocatorSyncIdIT extends ESIntegTestCase { .indices() .prepareCreate(indexName) .setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, numOfReplicas) - .put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey(), randomIntBetween(10, 100) + "kb") + indexSettings(1, numOfReplicas).put( + IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey(), + randomIntBetween(10, 100) + "kb" + ) .put(IndexSettings.INDEX_SOFT_DELETES_RETENTION_LEASE_PERIOD_SETTING.getKey(), "1ms") // expire PRRLs quickly .put(IndexService.GLOBAL_CHECKPOINT_SYNC_INTERVAL_SETTING.getKey(), "100ms") .put(IndexService.RETENTION_LEASE_SYNC_INTERVAL_SETTING.getKey(), "100ms") diff --git a/server/src/internalClusterTest/java/org/elasticsearch/health/node/ShardsCapacityHealthIndicatorServiceIT.java b/server/src/internalClusterTest/java/org/elasticsearch/health/node/ShardsCapacityHealthIndicatorServiceIT.java index aab65ca135ae..dc0fd839b125 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/health/node/ShardsCapacityHealthIndicatorServiceIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/health/node/ShardsCapacityHealthIndicatorServiceIT.java @@ -23,8 +23,6 @@ import org.junit.Before; import java.util.List; import java.util.concurrent.atomic.AtomicReference; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.cluster.node.DiscoveryNodeRole.DATA_FROZEN_NODE_ROLE; import static org.elasticsearch.indices.ShardLimitValidator.SETTING_CLUSTER_MAX_SHARDS_PER_NODE; import static org.hamcrest.Matchers.empty; @@ -86,7 +84,7 @@ public class ShardsCapacityHealthIndicatorServiceIT extends ESIntegTestCase { } private void createIndex(int shards, int replicas) { - createIndex(INDEX_NAME, Settings.builder().put(SETTING_NUMBER_OF_SHARDS, shards).put(SETTING_NUMBER_OF_REPLICAS, replicas).build()); + createIndex(INDEX_NAME, indexSettings(shards, replicas).build()); } private HealthIndicatorResult fetchShardsCapacityIndicatorResult(InternalTestCluster internalCluster) throws Exception { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/IndexingPressureIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/IndexingPressureIT.java index dad327ef8b0b..b4b18351c086 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/IndexingPressureIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/IndexingPressureIT.java @@ -15,7 +15,6 @@ import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.bulk.TransportShardBulkAction; import org.elasticsearch.action.index.IndexRequest; import org.elasticsearch.action.index.IndexResponse; -import org.elasticsearch.cluster.metadata.IndexMetadata; import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.common.UUIDs; @@ -72,12 +71,7 @@ public class IndexingPressureIT extends ESIntegTestCase { } public void testWriteIndexingPressureMetricsAreIncremented() throws Exception { - assertAcked( - prepareCreate( - INDEX_NAME, - Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - ) - ); + assertAcked(prepareCreate(INDEX_NAME, indexSettings(1, 1))); ensureGreen(INDEX_NAME); Tuple primaryReplicaNodeNames = getPrimaryReplicaNodeNames(); @@ -256,12 +250,7 @@ public class IndexingPressureIT extends ESIntegTestCase { Settings.builder().put(IndexingPressure.MAX_INDEXING_BYTES.getKey(), (long) (bulkShardRequestSize * 1.5) + "B").build() ); - assertAcked( - prepareCreate( - INDEX_NAME, - Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - ) - ); + assertAcked(prepareCreate(INDEX_NAME, indexSettings(1, 1))); ensureGreen(INDEX_NAME); Tuple primaryReplicaNodeNames = getPrimaryReplicaNodeNames(); @@ -324,12 +313,7 @@ public class IndexingPressureIT extends ESIntegTestCase { Settings.builder().put(IndexingPressure.MAX_INDEXING_BYTES.getKey(), (long) (bulkShardRequestSize * 1.5) + "B").build() ); - assertAcked( - prepareCreate( - INDEX_NAME, - Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - ) - ); + assertAcked(prepareCreate(INDEX_NAME, indexSettings(1, 1))); ensureGreen(INDEX_NAME); Tuple primaryReplicaNodeNames = getPrimaryReplicaNodeNames(); @@ -373,12 +357,7 @@ public class IndexingPressureIT extends ESIntegTestCase { public void testWritesWillSucceedIfBelowThreshold() throws Exception { restartNodesWithSettings(Settings.builder().put(IndexingPressure.MAX_INDEXING_BYTES.getKey(), "1MB").build()); - assertAcked( - prepareCreate( - INDEX_NAME, - Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - ) - ); + assertAcked(prepareCreate(INDEX_NAME, indexSettings(1, 1))); ensureGreen(INDEX_NAME); Tuple primaryReplicaNodeNames = getPrimaryReplicaNodeNames(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/engine/InternalEngineMergeIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/engine/InternalEngineMergeIT.java index 7d0a16e93d8f..ac1e7daf0485 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/engine/InternalEngineMergeIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/engine/InternalEngineMergeIT.java @@ -11,8 +11,6 @@ import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse; import org.elasticsearch.action.bulk.BulkRequestBuilder; import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.index.IndexRequest; -import org.elasticsearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.test.ESIntegTestCase; import org.elasticsearch.test.ESIntegTestCase.ClusterScope; import org.elasticsearch.test.ESIntegTestCase.Scope; @@ -30,14 +28,7 @@ public class InternalEngineMergeIT extends ESIntegTestCase { public void testMergesHappening() throws Exception { final int numOfShards = randomIntBetween(1, 5); // some settings to keep num segments low - assertAcked( - prepareCreate("test").setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, numOfShards) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .build() - ) - ); + assertAcked(prepareCreate("test").setSettings(indexSettings(numOfShards, 0).build())); long id = 0; final int rounds = scaledRandomIntBetween(50, 300); logger.info("Starting rounds [{}] ", rounds); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/IndexShardIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/IndexShardIT.java index 39f21ab6ad3f..65bb53787ce1 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/IndexShardIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/IndexShardIT.java @@ -95,8 +95,6 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; import static org.elasticsearch.action.support.WriteRequest.RefreshPolicy.IMMEDIATE; import static org.elasticsearch.action.support.WriteRequest.RefreshPolicy.NONE; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.cluster.routing.TestShardRouting.newShardRouting; import static org.elasticsearch.index.shard.IndexShardTestCase.getTranslog; import static org.elasticsearch.index.shard.IndexShardTestCase.recoverFromStore; @@ -239,12 +237,7 @@ public class IndexShardIT extends ESSingleNodeTestCase { } public void testExpectedShardSizeIsPresent() throws InterruptedException { - assertAcked( - client().admin() - .indices() - .prepareCreate("test") - .setSettings(Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 1).put(SETTING_NUMBER_OF_REPLICAS, 0)) - ); + assertAcked(client().admin().indices().prepareCreate("test").setSettings(indexSettings(1, 0))); for (int i = 0; i < 50; i++) { client().prepareIndex("test").setSource("{}", XContentType.JSON).get(); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandIT.java index 6e7b1e10f5b4..25b16f1b9984 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandIT.java @@ -29,7 +29,6 @@ import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.cli.MockTerminal; import org.elasticsearch.cli.ProcessInfo; import org.elasticsearch.cluster.ClusterState; -import org.elasticsearch.cluster.metadata.IndexMetadata; import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.cluster.routing.GroupShardsIterator; @@ -107,10 +106,7 @@ public class RemoveCorruptedShardDataCommandIT extends ESIntegTestCase { final String indexName = "index42"; assertAcked( prepareCreate(indexName).setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(MergePolicyConfig.INDEX_MERGE_ENABLED, false) + indexSettings(1, 0).put(MergePolicyConfig.INDEX_MERGE_ENABLED, false) .put(IndexSettings.INDEX_REFRESH_INTERVAL_SETTING.getKey(), "-1") .put(MockEngineSupport.DISABLE_FLUSH_ON_CLOSE.getKey(), true) .put(IndexSettings.INDEX_CHECK_ON_STARTUP.getKey(), "checksum") @@ -277,10 +273,7 @@ public class RemoveCorruptedShardDataCommandIT extends ESIntegTestCase { final String indexName = "test"; assertAcked( prepareCreate(indexName).setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexSettings.INDEX_REFRESH_INTERVAL_SETTING.getKey(), "-1") + indexSettings(1, 1).put(IndexSettings.INDEX_REFRESH_INTERVAL_SETTING.getKey(), "-1") .put(MockEngineSupport.DISABLE_FLUSH_ON_CLOSE.getKey(), true) // never flush - always recover from translog .put("index.routing.allocation.exclude._name", node2) ) @@ -476,10 +469,7 @@ public class RemoveCorruptedShardDataCommandIT extends ESIntegTestCase { final String indexName = "test"; assertAcked( prepareCreate(indexName).setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexSettings.INDEX_REFRESH_INTERVAL_SETTING.getKey(), "-1") + indexSettings(1, 1).put(IndexSettings.INDEX_REFRESH_INTERVAL_SETTING.getKey(), "-1") .put(MockEngineSupport.DISABLE_FLUSH_ON_CLOSE.getKey(), true) // never flush - always recover from translog .put("index.routing.allocation.exclude._name", node2) ) @@ -582,13 +572,7 @@ public class RemoveCorruptedShardDataCommandIT extends ESIntegTestCase { final List nodeNames = internalCluster().startNodes(numOfNodes, Settings.EMPTY); final String indexName = "test" + randomInt(100); - assertAcked( - prepareCreate(indexName).setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, numOfNodes - 1) - ) - ); + assertAcked(prepareCreate(indexName).setSettings(indexSettings(1, numOfNodes - 1))); flush(indexName); ensureGreen(indexName); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedFileIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedFileIT.java index aca3ccd8185e..6d375cde8ccd 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedFileIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedFileIT.java @@ -147,10 +147,7 @@ public class CorruptedFileIT extends ESIntegTestCase { assertAcked( prepareCreate("test").setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, "1") - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, "1") - .put(MergePolicyConfig.INDEX_MERGE_ENABLED, false) + indexSettings(1, 1).put(MergePolicyConfig.INDEX_MERGE_ENABLED, false) // no checkindex - we corrupt shards on purpose .put(MockFSIndexStore.INDEX_CHECK_INDEX_ON_CLOSE_SETTING.getKey(), false) // no translog based flush - it might change the .liv / segments.N files @@ -347,10 +344,7 @@ public class CorruptedFileIT extends ESIntegTestCase { var unluckyNode = dataNodes.get(1); assertAcked( prepareCreate("test").setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, "0") - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put("index.routing.allocation.include._name", primariesNode.getName()) + indexSettings(1, 0).put("index.routing.allocation.include._name", primariesNode.getName()) .put(EnableAllocationDecider.INDEX_ROUTING_REBALANCE_ENABLE_SETTING.getKey(), EnableAllocationDecider.Rebalance.NONE) .put("index.allocation.max_retries", Integer.MAX_VALUE) // keep on retrying ) @@ -404,9 +398,7 @@ public class CorruptedFileIT extends ESIntegTestCase { assertAcked( prepareCreate("test").setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, "0") - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, between(1, 4)) // don't go crazy here it must recovery fast + indexSettings(between(1, 4), 0) // don't go crazy here it must recovery fast // This does corrupt files on the replica, so we can't check: .put(MockFSIndexStore.INDEX_CHECK_INDEX_ON_CLOSE_SETTING.getKey(), false) .put("index.routing.allocation.include._name", primariesNode.getName()) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedTranslogIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedTranslogIT.java index a43442b2df29..fecdf306e5f1 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedTranslogIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/store/CorruptedTranslogIT.java @@ -51,10 +51,7 @@ public class CorruptedTranslogIT extends ESIntegTestCase { assertAcked( prepareCreate("test").setSettings( - Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.refresh_interval", "-1") + indexSettings(1, 0).put("index.refresh_interval", "-1") .put(MockEngineSupport.DISABLE_FLUSH_ON_CLOSE.getKey(), true) // never flush - always recover from translog .put(IndexSettings.INDEX_TRANSLOG_FLUSH_THRESHOLD_SIZE_SETTING.getKey(), new ByteSizeValue(1, ByteSizeUnit.PB)) ) diff --git a/server/src/internalClusterTest/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java index 1ef9c26900e1..af3747317228 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/index/suggest/stats/SuggestStatsIT.java @@ -17,7 +17,6 @@ import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.routing.GroupShardsIterator; import org.elasticsearch.cluster.routing.ShardIterator; import org.elasticsearch.cluster.routing.ShardRouting; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.search.stats.SearchStats; import org.elasticsearch.search.suggest.SuggestBuilder; import org.elasticsearch.search.suggest.phrase.PhraseSuggestionBuilder; @@ -27,8 +26,6 @@ import org.elasticsearch.test.ESIntegTestCase; import java.util.HashSet; import java.util.Set; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAllSuccessful; import static org.hamcrest.Matchers.equalTo; @@ -52,16 +49,8 @@ public class SuggestStatsIT extends ESIntegTestCase { final int shardsIdx2 = Math.max(numNodes - shardsIdx1, randomIntBetween(1, 10)); final int totalShards = shardsIdx1 + shardsIdx2; assertThat(numNodes, lessThanOrEqualTo(totalShards)); - assertAcked( - prepareCreate("test1").setSettings( - Settings.builder().put(SETTING_NUMBER_OF_SHARDS, shardsIdx1).put(SETTING_NUMBER_OF_REPLICAS, 0) - ).setMapping("f", "type=text") - ); - assertAcked( - prepareCreate("test2").setSettings( - Settings.builder().put(SETTING_NUMBER_OF_SHARDS, shardsIdx2).put(SETTING_NUMBER_OF_REPLICAS, 0) - ).setMapping("f", "type=text") - ); + assertAcked(prepareCreate("test1").setSettings(indexSettings(shardsIdx1, 0)).setMapping("f", "type=text")); + assertAcked(prepareCreate("test2").setSettings(indexSettings(shardsIdx2, 0)).setMapping("f", "type=text")); assertThat(shardsIdx1 + shardsIdx2, equalTo(numAssignedShards("test1", "test2"))); assertThat(numAssignedShards("test1", "test2"), greaterThanOrEqualTo(2)); ensureGreen(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/IndicesRequestCacheIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/IndicesRequestCacheIT.java index 5bffa2106dd1..dcdf6d001ce2 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/IndicesRequestCacheIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/IndicesRequestCacheIT.java @@ -13,7 +13,6 @@ import org.elasticsearch.action.admin.indices.forcemerge.ForceMergeResponse; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.client.internal.Client; -import org.elasticsearch.cluster.metadata.IndexMetadata; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.time.DateFormatter; import org.elasticsearch.index.cache.request.RequestCacheStats; @@ -112,11 +111,8 @@ public class IndicesRequestCacheIT extends ESIntegTestCase { .prepareCreate("index") .setMapping("s", "type=date") .setSettings( - Settings.builder() - .put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 5) + indexSettings(5, 0).put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true) .put("index.number_of_routing_shards", 5) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) ) .get() ); @@ -182,12 +178,7 @@ public class IndicesRequestCacheIT extends ESIntegTestCase { .indices() .prepareCreate("index") .setMapping("s", "type=date") - .setSettings( - Settings.builder() - .put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - ) + .setSettings(indexSettings(1, 0).put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true)) .get() ); indexRandom( @@ -248,12 +239,7 @@ public class IndicesRequestCacheIT extends ESIntegTestCase { .indices() .prepareCreate("index") .setMapping("d", "type=date") - .setSettings( - Settings.builder() - .put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - ) + .setSettings(indexSettings(1, 0).put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true)) .get() ); indexRandom( @@ -313,11 +299,7 @@ public class IndicesRequestCacheIT extends ESIntegTestCase { public void testQueryRewriteDatesWithNow() throws Exception { Client client = client(); - Settings settings = Settings.builder() - .put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .build(); + Settings settings = indexSettings(1, 0).put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true).build(); assertAcked(client.admin().indices().prepareCreate("index-1").setMapping("d", "type=date").setSettings(settings).get()); assertAcked(client.admin().indices().prepareCreate("index-2").setMapping("d", "type=date").setSettings(settings).get()); assertAcked(client.admin().indices().prepareCreate("index-3").setMapping("d", "type=date").setSettings(settings).get()); @@ -393,11 +375,8 @@ public class IndicesRequestCacheIT extends ESIntegTestCase { public void testCanCache() throws Exception { Client client = client(); - Settings settings = Settings.builder() - .put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 2) + Settings settings = indexSettings(2, 0).put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true) .put("index.number_of_routing_shards", 2) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) .build(); assertAcked(client.admin().indices().prepareCreate("index").setMapping("s", "type=date").setSettings(settings).get()); indexRandom( @@ -493,11 +472,7 @@ public class IndicesRequestCacheIT extends ESIntegTestCase { public void testCacheWithFilteredAlias() { Client client = client(); - Settings settings = Settings.builder() - .put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .build(); + Settings settings = indexSettings(1, 0).put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true).build(); assertAcked( client.admin() .indices() @@ -552,12 +527,7 @@ public class IndicesRequestCacheIT extends ESIntegTestCase { .indices() .prepareCreate("index") .setMapping("k", "type=keyword") - .setSettings( - Settings.builder() - .put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - ) + .setSettings(indexSettings(1, 0).put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true)) .get() ); indexRandom(true, client.prepareIndex("index").setSource("k", "hello")); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/flush/FlushIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/flush/FlushIT.java index b671142bf5f8..bf8f41f90a76 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/flush/FlushIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/flush/FlushIT.java @@ -11,7 +11,6 @@ import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.admin.indices.flush.FlushRequest; import org.elasticsearch.action.admin.indices.flush.FlushResponse; import org.elasticsearch.action.admin.indices.stats.ShardStats; -import org.elasticsearch.cluster.metadata.IndexMetadata; import org.elasticsearch.common.ValidationException; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.IndexService; @@ -122,10 +121,7 @@ public class FlushIT extends ESIntegTestCase { .indices() .prepareCreate(indexName) .setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexSettings.INDEX_TRANSLOG_SYNC_INTERVAL_SETTING.getKey(), randomTimeValue(200, 500, "ms")) + indexSettings(1, 1).put(IndexSettings.INDEX_TRANSLOG_SYNC_INTERVAL_SETTING.getKey(), randomTimeValue(200, 500, "ms")) .put(IndexService.GLOBAL_CHECKPOINT_SYNC_INTERVAL_SETTING.getKey(), randomTimeValue(50, 200, "ms")) .put("index.routing.allocation.include._name", String.join(",", dataNodes)) .build() diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java index a4e8b56cc69c..ef58b5ee4936 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/memory/breaker/CircuitBreakerServiceIT.java @@ -20,7 +20,6 @@ import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.client.internal.Client; import org.elasticsearch.client.internal.Requests; -import org.elasticsearch.cluster.metadata.IndexMetadata; import org.elasticsearch.cluster.routing.allocation.decider.EnableAllocationDecider; import org.elasticsearch.common.breaker.CircuitBreaker; import org.elasticsearch.common.breaker.CircuitBreakingException; @@ -365,10 +364,7 @@ public class CircuitBreakerServiceIT extends ESIntegTestCase { assertAcked( prepareCreate("index").setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put("index.routing.allocation.include._name", targetNode.getNode().getName()) + indexSettings(1, 0).put("index.routing.allocation.include._name", targetNode.getNode().getName()) .put(EnableAllocationDecider.INDEX_ROUTING_REBALANCE_ENABLE_SETTING.getKey(), EnableAllocationDecider.Rebalance.NONE) ) ); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java index bb341dc12b7a..fba99709a040 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/IndexRecoveryIT.java @@ -347,10 +347,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { logger.info("--> create index on node: {}", nodeA); createIndex( INDEX_NAME, - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexService.RETENTION_LEASE_SYNC_INTERVAL_SETTING.getKey(), "100ms") + indexSettings(1, 1).put(IndexService.RETENTION_LEASE_SYNC_INTERVAL_SETTING.getKey(), "100ms") .put(IndexService.GLOBAL_CHECKPOINT_SYNC_INTERVAL_SETTING.getKey(), "100ms") .build() ); @@ -801,12 +798,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { client().admin() .indices() .prepareCreate(indexName) - .setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 2) - .put(IndexSettings.FILE_BASED_RECOVERY_THRESHOLD_SETTING.getKey(), 1.0) - ) + .setSettings(indexSettings(1, 2).put(IndexSettings.FILE_BASED_RECOVERY_THRESHOLD_SETTING.getKey(), 1.0)) .get(); ensureGreen(indexName); @@ -920,12 +912,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { client().admin() .indices() .prepareCreate(indexName) - .setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put("index.routing.allocation.include._name", nodeWithPrimary) - ) + .setSettings(indexSettings(1, 0).put("index.routing.allocation.include._name", nodeWithPrimary)) ); MockTransportService transport = (MockTransportService) internalCluster().getInstance(TransportService.class, nodeWithPrimary); CountDownLatch phase1ReadyBlocked = new CountDownLatch(1); @@ -1079,10 +1066,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { String indexName = "test-index"; createIndex( indexName, - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true) + indexSettings(1, 1).put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true) .put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), "12h") .build() ); @@ -1150,10 +1134,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { String indexName = "test-index"; createIndex( indexName, - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true) + indexSettings(1, 1).put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true) .put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), "12h") .build() ); @@ -1233,10 +1214,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { internalCluster().ensureAtLeastNumDataNodes(2); String indexName = "test-index"; - final Settings.Builder settings = Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true) + final Settings.Builder settings = indexSettings(1, 1).put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true) .put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), "12h") .put(IndexService.RETENTION_LEASE_SYNC_INTERVAL_SETTING.getKey(), "100ms"); @@ -1378,14 +1356,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { internalCluster().ensureAtLeastNumDataNodes(2); String indexName = "test-index"; - createIndex( - indexName, - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true) - .build() - ); + createIndex(indexName, indexSettings(1, 0).put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true).build()); indexRandom( randomBoolean(), randomBoolean(), @@ -1462,11 +1433,7 @@ public class IndexRecoveryIT extends AbstractIndexRecoveryIntegTestCase { final String indexName = "test-index"; createIndex( indexName, - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, randomIntBetween(1, 6)) - .put(IndexService.RETENTION_LEASE_SYNC_INTERVAL_SETTING.getKey(), "200ms") - .build() + indexSettings(randomIntBetween(1, 6), 1).put(IndexService.RETENTION_LEASE_SYNC_INTERVAL_SETTING.getKey(), "200ms").build() ); indexRandom( randomBoolean(), diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/TaskRecoveryIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/TaskRecoveryIT.java index ad4615fda441..50440dea391a 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/TaskRecoveryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/recovery/TaskRecoveryIT.java @@ -55,12 +55,7 @@ public class TaskRecoveryIT extends ESIntegTestCase { client().admin() .indices() .prepareCreate(indexName) - .setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put("index.routing.allocation.include._name", nodeWithPrimary) - ) + .setSettings(indexSettings(1, 0).put("index.routing.allocation.include._name", nodeWithPrimary)) ); try { String nodeWithReplica = internalCluster().startDataOnlyNode(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseIndexIT.java b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseIndexIT.java index 46b22c7979d0..aa52c69331b0 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseIndexIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/indices/state/CloseIndexIT.java @@ -405,14 +405,7 @@ public class CloseIndexIT extends ESIntegTestCase { final String indexName = "noop-peer-recovery-test"; int numberOfReplicas = between(1, 2); internalCluster().ensureAtLeastNumDataNodes(numberOfReplicas + between(1, 2)); - createIndex( - indexName, - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, numberOfReplicas) - .put("index.routing.rebalance.enable", "none") - .build() - ); + createIndex(indexName, indexSettings(1, numberOfReplicas).put("index.routing.rebalance.enable", "none").build()); int iterations = between(1, 3); for (int iter = 0; iter < iterations; iter++) { indexRandom( @@ -451,14 +444,7 @@ public class CloseIndexIT extends ESIntegTestCase { 2, clusterService().state().nodes().getDataNodes().values().stream().map(DiscoveryNode::getName).collect(Collectors.toSet()) ); - createIndex( - indexName, - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put("index.routing.allocation.include._name", String.join(",", dataNodes)) - .build() - ); + createIndex(indexName, indexSettings(1, 1).put("index.routing.allocation.include._name", String.join(",", dataNodes)).build()); indexRandom( randomBoolean(), randomBoolean(), @@ -501,14 +487,7 @@ public class CloseIndexIT extends ESIntegTestCase { final String indexName = "closed-index"; final List dataNodes = internalCluster().startDataOnlyNodes(2); // allocate shard to first data node - createIndex( - indexName, - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put("index.routing.allocation.include._name", dataNodes.get(0)) - .build() - ); + createIndex(indexName, indexSettings(1, 0).put("index.routing.allocation.include._name", dataNodes.get(0)).build()); indexRandom( randomBoolean(), randomBoolean(), diff --git a/server/src/internalClusterTest/java/org/elasticsearch/recovery/FullRollingRestartIT.java b/server/src/internalClusterTest/java/org/elasticsearch/recovery/FullRollingRestartIT.java index 0a351f84af88..19f70dd01bf1 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/recovery/FullRollingRestartIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/recovery/FullRollingRestartIT.java @@ -12,7 +12,6 @@ import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequestBuilder import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.indices.recovery.RecoveryResponse; import org.elasticsearch.cluster.ClusterState; -import org.elasticsearch.cluster.metadata.IndexMetadata; import org.elasticsearch.cluster.routing.RecoverySource; import org.elasticsearch.cluster.routing.UnassignedInfo; import org.elasticsearch.common.Priority; @@ -182,10 +181,7 @@ public class FullRollingRestartIT extends ESIntegTestCase { * We have a fix for this to wait until we have allocated unallocated shards now so this shouldn't happen. */ prepareCreate("test").setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, "6") - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, "0") - .put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), TimeValue.timeValueMinutes(1)) + indexSettings(6, 0).put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), TimeValue.timeValueMinutes(1)) ).get(); for (int i = 0; i < 100; i++) { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java b/server/src/internalClusterTest/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java index c0833ac6e99f..f015b8c8a4ef 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/recovery/RecoveryWhileUnderLoadIT.java @@ -21,7 +21,6 @@ import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.cluster.service.ClusterService; import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.Setting; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.util.CollectionUtils; import org.elasticsearch.core.TimeValue; import org.elasticsearch.index.IndexService; @@ -41,8 +40,6 @@ import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAllSuccessful; @@ -73,10 +70,7 @@ public class RecoveryWhileUnderLoadIT extends ESIntegTestCase { prepareCreate( "test", 1, - Settings.builder() - .put(SETTING_NUMBER_OF_SHARDS, numberOfShards) - .put(SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.ASYNC) + indexSettings(numberOfShards, 1).put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.ASYNC) ) ); @@ -137,10 +131,7 @@ public class RecoveryWhileUnderLoadIT extends ESIntegTestCase { prepareCreate( "test", 1, - Settings.builder() - .put(SETTING_NUMBER_OF_SHARDS, numberOfShards) - .put(SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.ASYNC) + indexSettings(numberOfShards, 1).put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.ASYNC) ) ); @@ -198,10 +189,7 @@ public class RecoveryWhileUnderLoadIT extends ESIntegTestCase { prepareCreate( "test", 2, - Settings.builder() - .put(SETTING_NUMBER_OF_SHARDS, numberOfShards) - .put(SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.ASYNC) + indexSettings(numberOfShards, 1).put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.ASYNC) ) ); @@ -314,11 +302,10 @@ public class RecoveryWhileUnderLoadIT extends ESIntegTestCase { prepareCreate( "test", 3, - Settings.builder() - .put(SETTING_NUMBER_OF_SHARDS, numShards) - .put(SETTING_NUMBER_OF_REPLICAS, numReplicas) - .put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.ASYNC) - .put(IndexService.RETENTION_LEASE_SYNC_INTERVAL_SETTING.getKey(), randomFrom("100ms", "1s", "5s", "30s", "60s")) + indexSettings(numShards, numReplicas).put( + IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), + Translog.Durability.ASYNC + ).put(IndexService.RETENTION_LEASE_SYNC_INTERVAL_SETTING.getKey(), randomFrom("100ms", "1s", "5s", "30s", "60s")) ) ); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/recovery/RelocationIT.java b/server/src/internalClusterTest/java/org/elasticsearch/recovery/RelocationIT.java index a7bd1447b6a8..e1b02f4e93d5 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/recovery/RelocationIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/recovery/RelocationIT.java @@ -401,10 +401,7 @@ public class RelocationIT extends ESIntegTestCase { final String p_node = internalCluster().startNode(); - prepareCreate( - indexName, - Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - ).get(); + prepareCreate(indexName, indexSettings(1, 0)).get(); internalCluster().startNode(); internalCluster().startNode(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java b/server/src/internalClusterTest/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java index 5f6877f6956e..7da9e85de140 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/recovery/TruncatedRecoveryIT.java @@ -79,10 +79,7 @@ public class TruncatedRecoveryIT extends ESIntegTestCase { assertAcked( prepareCreate("test").setMapping("field1", "type=text", "the_id", "type=text") .setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, numberOfShards()) - .put("index.routing.allocation.include._name", primariesNode.getNode().getName()) + indexSettings(numberOfShards(), 0).put("index.routing.allocation.include._name", primariesNode.getNode().getName()) ) ); // only allocate on the lucky node diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java index b03991c0af5e..99084943b4c3 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/SignificantTermsSignificanceScoreIT.java @@ -52,8 +52,6 @@ import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.function.Function; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.search.aggregations.AggregationBuilders.filter; import static org.elasticsearch.search.aggregations.AggregationBuilders.significantTerms; import static org.elasticsearch.search.aggregations.AggregationBuilders.significantText; @@ -438,8 +436,7 @@ public class SignificantTermsSignificanceScoreIT extends ESIntegTestCase { private void indexEqualTestData() throws ExecutionException, InterruptedException { assertAcked( - prepareCreate("test").setSettings(Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 1).put(SETTING_NUMBER_OF_REPLICAS, 0)) - .setMapping("text", "type=text,fielddata=true", "class", "type=keyword") + prepareCreate("test").setSettings(indexSettings(1, 0)).setMapping("text", "type=text,fielddata=true", "class", "type=keyword") ); createIndex("idx_unmapped"); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java index 4e5e118340c0..575a8269a87e 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/aggregations/bucket/TermsShardMinDocCountIT.java @@ -9,7 +9,6 @@ package org.elasticsearch.search.aggregations.bucket; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.search.SearchResponse; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.aggregations.BucketOrder; import org.elasticsearch.search.aggregations.bucket.filter.InternalFilter; @@ -22,8 +21,6 @@ import org.elasticsearch.xcontent.XContentType; import java.util.ArrayList; import java.util.List; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.search.aggregations.AggregationBuilders.filter; import static org.elasticsearch.search.aggregations.AggregationBuilders.significantTerms; import static org.elasticsearch.search.aggregations.AggregationBuilders.terms; @@ -46,10 +43,7 @@ public class TermsShardMinDocCountIT extends ESIntegTestCase { } else { textMappings = "type=text,fielddata=true"; } - assertAcked( - prepareCreate(index).setSettings(Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 1).put(SETTING_NUMBER_OF_REPLICAS, 0)) - .setMapping("text", textMappings) - ); + assertAcked(prepareCreate(index).setSettings(indexSettings(1, 0)).setMapping("text", textMappings)); List indexBuilders = new ArrayList<>(); addTermsDocs("1", 1, 0, indexBuilders);// high score but low doc freq @@ -115,10 +109,7 @@ public class TermsShardMinDocCountIT extends ESIntegTestCase { if (termtype.equals("text")) { termMappings += ",fielddata=true"; } - assertAcked( - prepareCreate(index).setSettings(Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 1).put(SETTING_NUMBER_OF_REPLICAS, 0)) - .setMapping("text", termMappings) - ); + assertAcked(prepareCreate(index).setSettings(indexSettings(1, 0)).setMapping("text", termMappings)); List indexBuilders = new ArrayList<>(); addTermsDocs("1", 1, indexBuilders);// low doc freq but high score diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/fieldcaps/FieldCapabilitiesIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/fieldcaps/FieldCapabilitiesIT.java index 033b798c819d..71592f6cda89 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/fieldcaps/FieldCapabilitiesIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/fieldcaps/FieldCapabilitiesIT.java @@ -444,18 +444,12 @@ public class FieldCapabilitiesIT extends ESIntegTestCase { private void populateTimeRangeIndices() throws Exception { internalCluster().ensureAtLeastNumDataNodes(2); assertAcked( - prepareCreate("log-index-1").setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, between(1, 5)) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - ).setMapping("timestamp", "type=date", "field1", "type=keyword") + prepareCreate("log-index-1").setSettings(indexSettings(between(1, 5), 1)) + .setMapping("timestamp", "type=date", "field1", "type=keyword") ); assertAcked( - prepareCreate("log-index-2").setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, between(1, 5)) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - ).setMapping("timestamp", "type=date", "field1", "type=long") + prepareCreate("log-index-2").setSettings(indexSettings(between(1, 5), 1)) + .setMapping("timestamp", "type=date", "field1", "type=long") ); List reqs = new ArrayList<>(); reqs.add(client().prepareIndex("log-index-1").setSource("timestamp", "2015-07-08")); @@ -510,10 +504,7 @@ public class FieldCapabilitiesIT extends ESIntegTestCase { public void testNoActiveCopy() throws Exception { assertAcked( prepareCreate("log-index-inactive").setSettings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, between(1, 5)) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put("index.routing.allocation.require._id", "unknown") + indexSettings(between(1, 5), 1).put("index.routing.allocation.require._id", "unknown") ).setWaitForActiveShards(ActiveShardCount.NONE).setMapping("timestamp", "type=date", "field1", "type=keyword") ); { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/QueryRescorerIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/QueryRescorerIT.java index d756b38cae54..27b172b4cbab 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/QueryRescorerIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/functionscore/QueryRescorerIT.java @@ -33,7 +33,6 @@ import org.elasticsearch.xcontent.XContentFactory; import java.util.Arrays; import java.util.Comparator; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.common.lucene.search.function.CombineFunction.REPLACE; import static org.elasticsearch.index.query.QueryBuilders.boolQuery; @@ -773,10 +772,7 @@ public class QueryRescorerIT extends ESIntegTestCase { // #11277 public void testFromSize() throws Exception { - Builder settings = Settings.builder(); - settings.put(SETTING_NUMBER_OF_SHARDS, 1); - settings.put(SETTING_NUMBER_OF_REPLICAS, 0); - assertAcked(prepareCreate("test").setSettings(settings)); + assertAcked(prepareCreate("test").setSettings(indexSettings(1, 0))); for (int i = 0; i < 5; i++) { client().prepareIndex("test").setId("" + i).setSource("text", "hello world").get(); } diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java index fbee3d0471c6..d19d4a555a2e 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/morelikethis/MoreLikeThisIT.java @@ -34,7 +34,6 @@ import java.util.Collections; import java.util.List; import java.util.concurrent.ExecutionException; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.index.query.QueryBuilders.moreLikeThisQuery; import static org.elasticsearch.index.query.QueryBuilders.termQuery; @@ -319,7 +318,7 @@ public class MoreLikeThisIT extends ESIntegTestCase { // Issue #3039 public void testMoreLikeThisIssueRoutingNotSerialized() throws Exception { - assertAcked(prepareCreate("foo", 2, Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 2).put(SETTING_NUMBER_OF_REPLICAS, 0))); + assertAcked(prepareCreate("foo", 2, indexSettings(2, 0))); ensureGreen(); client().prepareIndex("foo") diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/routing/SearchReplicaSelectionIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/routing/SearchReplicaSelectionIT.java index 890ab8dd4035..35ea9614d182 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/routing/SearchReplicaSelectionIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/routing/SearchReplicaSelectionIT.java @@ -22,8 +22,6 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThanOrEqualTo; @@ -43,11 +41,7 @@ public class SearchReplicaSelectionIT extends ESIntegTestCase { // We grab a client directly to avoid using a randomizing client that might set a search preference. Client client = internalCluster().coordOnlyNodeClient(); - client.admin() - .indices() - .prepareCreate("test") - .setSettings(Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 1).put(SETTING_NUMBER_OF_REPLICAS, 2)) - .get(); + client.admin().indices().prepareCreate("test").setSettings(indexSettings(1, 2)).get(); ensureGreen(); client.prepareIndex("test").setSource("field", "value").get(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollIT.java index c4fd6737e121..3f2d02ed740b 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/scroll/SearchScrollIT.java @@ -503,9 +503,7 @@ public class SearchScrollIT extends ESIntegTestCase { public void testStringSortMissingAscTerminates() throws Exception { assertAcked( - prepareCreate("test").setSettings( - Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1).put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - ).setMapping("no_field", "type=keyword", "some_field", "type=keyword") + prepareCreate("test").setSettings(indexSettings(1, 0)).setMapping("no_field", "type=keyword", "some_field", "type=keyword") ); client().prepareIndex("test").setId("1").setSource("some_field", "test").get(); refresh(); @@ -685,22 +683,8 @@ public class SearchScrollIT extends ESIntegTestCase { public void testRestartDataNodesDuringScrollSearch() throws Exception { final String dataNode = internalCluster().startDataOnlyNode(); - createIndex( - "demo", - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put("index.routing.allocation.include._name", dataNode) - .build() - ); - createIndex( - "prod", - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put("index.routing.allocation.include._name", dataNode) - .build() - ); + createIndex("demo", indexSettings(1, 0).put("index.routing.allocation.include._name", dataNode).build()); + createIndex("prod", indexSettings(1, 0).put("index.routing.allocation.include._name", dataNode).build()); int numDocs = randomIntBetween(10, 100); for (int i = 0; i < numDocs; i++) { index("demo", "demo-" + i, Map.of()); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/simple/SimpleSearchIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/simple/SimpleSearchIT.java index 599a75068e23..ce37896de375 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/simple/SimpleSearchIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/simple/SimpleSearchIT.java @@ -39,8 +39,6 @@ import java.util.List; import java.util.concurrent.ExecutionException; import static org.elasticsearch.action.support.WriteRequest.RefreshPolicy.IMMEDIATE; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.index.query.QueryBuilders.boolQuery; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.index.query.QueryBuilders.queryStringQuery; @@ -310,7 +308,7 @@ public class SimpleSearchIT extends ESIntegTestCase { } public void testSimpleTerminateAfterCount() throws Exception { - prepareCreate("test").setSettings(Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 1).put(SETTING_NUMBER_OF_REPLICAS, 0)).get(); + prepareCreate("test").setSettings(indexSettings(1, 0)).get(); ensureGreen(); int max = randomIntBetween(3, 29); List docbuilders = new ArrayList<>(max); @@ -344,9 +342,7 @@ public class SimpleSearchIT extends ESIntegTestCase { } public void testSimpleIndexSortEarlyTerminate() throws Exception { - prepareCreate("test").setSettings( - Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 1).put(SETTING_NUMBER_OF_REPLICAS, 0).put("index.sort.field", "rank") - ).setMapping("rank", "type=integer").get(); + prepareCreate("test").setSettings(indexSettings(1, 0).put("index.sort.field", "rank")).setMapping("rank", "type=integer").get(); ensureGreen(); int max = randomIntBetween(3, 29); List docbuilders = new ArrayList<>(max); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/stats/FieldUsageStatsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/stats/FieldUsageStatsIT.java index 82299a769925..0e504e888ce2 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/stats/FieldUsageStatsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/stats/FieldUsageStatsIT.java @@ -27,8 +27,6 @@ import java.util.Locale; import java.util.Set; import java.util.concurrent.ExecutionException; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAllSuccessful; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; @@ -51,12 +49,7 @@ public class FieldUsageStatsIT extends ESIntegTestCase { public void testFieldUsageStats() throws ExecutionException, InterruptedException { internalCluster().ensureAtLeastNumDataNodes(2); int numShards = randomIntBetween(1, 2); - assertAcked( - client().admin() - .indices() - .prepareCreate("test") - .setSettings(Settings.builder().put(SETTING_NUMBER_OF_SHARDS, numShards).put(SETTING_NUMBER_OF_REPLICAS, 1)) - ); + assertAcked(client().admin().indices().prepareCreate("test").setSettings(indexSettings(numShards, 1))); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy/MM/dd", Locale.ROOT); LocalDate date = LocalDate.of(2015, 9, 1); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/stats/SearchStatsIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/stats/SearchStatsIT.java index 0b2ffae14377..7adc507123b6 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/stats/SearchStatsIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/stats/SearchStatsIT.java @@ -16,7 +16,6 @@ import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.routing.GroupShardsIterator; import org.elasticsearch.cluster.routing.ShardIterator; import org.elasticsearch.cluster.routing.ShardRouting; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.core.TimeValue; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.index.search.stats.SearchStats.Stats; @@ -36,8 +35,6 @@ import java.util.Set; import java.util.function.Function; import java.util.function.Supplier; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAllSuccessful; @@ -83,11 +80,7 @@ public class SearchStatsIT extends ESIntegTestCase { final int shardsIdx1 = randomIntBetween(1, 10); // we make sure each node gets at least a single shard... final int shardsIdx2 = Math.max(numNodes - shardsIdx1, randomIntBetween(1, 10)); assertThat(numNodes, lessThanOrEqualTo(shardsIdx1 + shardsIdx2)); - assertAcked( - prepareCreate("test1").setSettings( - Settings.builder().put(SETTING_NUMBER_OF_SHARDS, shardsIdx1).put(SETTING_NUMBER_OF_REPLICAS, 0) - ) - ); + assertAcked(prepareCreate("test1").setSettings(indexSettings(shardsIdx1, 0))); int docsTest1 = scaledRandomIntBetween(3 * shardsIdx1, 5 * shardsIdx1); for (int i = 0; i < docsTest1; i++) { client().prepareIndex("test1").setId(Integer.toString(i)).setSource("field", "value").get(); @@ -95,11 +88,7 @@ public class SearchStatsIT extends ESIntegTestCase { refresh(); } } - assertAcked( - prepareCreate("test2").setSettings( - Settings.builder().put(SETTING_NUMBER_OF_SHARDS, shardsIdx2).put(SETTING_NUMBER_OF_REPLICAS, 0) - ) - ); + assertAcked(prepareCreate("test2").setSettings(indexSettings(shardsIdx2, 0))); int docsTest2 = scaledRandomIntBetween(3 * shardsIdx2, 5 * shardsIdx2); for (int i = 0; i < docsTest2; i++) { client().prepareIndex("test2").setId(Integer.toString(i)).setSource("field", "value").get(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java index 979405cd3f9e..18fc34d11bc0 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/CompletionSuggestSearchIT.java @@ -55,8 +55,6 @@ import java.util.Map; import java.util.Set; import static org.elasticsearch.action.support.WriteRequest.RefreshPolicy.IMMEDIATE; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.common.util.CollectionUtils.iterableAsArrayList; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAllSuccessful; @@ -1315,10 +1313,7 @@ public class CompletionSuggestSearchIT extends ESIntegTestCase { // see #3555 public void testPrunedSegments() throws IOException { - createIndexAndMappingAndSettings( - Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 1).put(SETTING_NUMBER_OF_REPLICAS, 0).build(), - completionMappingBuilder - ); + createIndexAndMappingAndSettings(indexSettings(1, 0).build(), completionMappingBuilder); client().prepareIndex(INDEX) .setId("1") diff --git a/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/SuggestSearchIT.java b/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/SuggestSearchIT.java index c37a009edcff..df3442b1cc58 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/SuggestSearchIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/search/suggest/SuggestSearchIT.java @@ -47,7 +47,6 @@ import java.util.Map.Entry; import java.util.Set; import java.util.concurrent.ExecutionException; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.index.query.QueryBuilders.matchQuery; import static org.elasticsearch.search.suggest.SuggestBuilders.phraseSuggestion; @@ -181,10 +180,7 @@ public class SuggestSearchIT extends ESIntegTestCase { // see #3037 public void testSuggestModes() throws IOException { CreateIndexRequestBuilder builder = prepareCreate("test").setSettings( - Settings.builder() - .put(SETTING_NUMBER_OF_SHARDS, 1) - .put(SETTING_NUMBER_OF_REPLICAS, 0) - .put("index.analysis.analyzer.biword.tokenizer", "standard") + indexSettings(1, 0).put("index.analysis.analyzer.biword.tokenizer", "standard") .putList("index.analysis.analyzer.biword.filter", "shingler", "lowercase") .put("index.analysis.filter.shingler.type", "shingle") .put("index.analysis.filter.shingler.min_shingle_size", 2) @@ -241,7 +237,7 @@ public class SuggestSearchIT extends ESIntegTestCase { // see #2729 public void testSizeOneShard() throws Exception { - prepareCreate("test").setSettings(Settings.builder().put(SETTING_NUMBER_OF_SHARDS, 1).put(SETTING_NUMBER_OF_REPLICAS, 0)).get(); + prepareCreate("test").setSettings(indexSettings(1, 0)).get(); ensureGreen(); for (int i = 0; i < 15; i++) { diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/BlobStoreIncrementalityIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/BlobStoreIncrementalityIT.java index 8b974e0babc1..826e68f4f25b 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/BlobStoreIncrementalityIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/BlobStoreIncrementalityIT.java @@ -55,14 +55,7 @@ public class BlobStoreIncrementalityIT extends AbstractSnapshotIntegTestCase { internalCluster().startMasterOnlyNode(); final String primaryNode = internalCluster().startDataOnlyNode(); final String indexName = "test-index"; - createIndex( - indexName, - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), 0) - .build() - ); + createIndex(indexName, indexSettings(1, 1).put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), 0).build()); ensureYellow(indexName); final String newPrimary = internalCluster().startDataOnlyNode(); final Collection toDelete = new ArrayList<>(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/RestoreSnapshotIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/RestoreSnapshotIT.java index 8a7d00d17929..495fb5ee0c91 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/RestoreSnapshotIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/RestoreSnapshotIT.java @@ -297,14 +297,7 @@ public class RestoreSnapshotIT extends AbstractSnapshotIntegTestCase { logger.info("--> delete the index and recreate it with foo field"); cluster().wipeIndices("test-idx"); assertAcked( - prepareCreate( - "test-idx", - 2, - Settings.builder() - .put(SETTING_NUMBER_OF_SHARDS, numShards.numPrimaries) - .put(SETTING_NUMBER_OF_REPLICAS, between(0, 1)) - .put("refresh_interval", 5, TimeUnit.SECONDS) - ) + prepareCreate("test-idx", 2, indexSettings(numShards.numPrimaries, between(0, 1)).put("refresh_interval", 5, TimeUnit.SECONDS)) ); assertAcked(client().admin().indices().preparePutMapping("test-idx").setSource("foo", "type=text")); ensureGreen(); diff --git a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java index e35c9fdf3a98..e38913f066e0 100644 --- a/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java +++ b/server/src/internalClusterTest/java/org/elasticsearch/snapshots/SharedClusterSnapshotRestoreIT.java @@ -1080,13 +1080,7 @@ public class SharedClusterSnapshotRestoreIT extends AbstractSnapshotIntegTestCas ); // Create index on 2 nodes and make sure each node has a primary by setting no replicas - assertAcked( - prepareCreate( - "test-idx", - 2, - Settings.builder().put("number_of_replicas", 0).put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, randomIntBetween(2, 10)) - ) - ); + assertAcked(prepareCreate("test-idx", 2, indexSettingsNoReplicas(randomIntBetween(2, 10)))); indexRandomDocs("test-idx", 100); // Pick one node and block it diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponseTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponseTests.java index 350a03520fea..3108490498d6 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponseTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponseTests.java @@ -21,7 +21,6 @@ import org.elasticsearch.cluster.routing.allocation.RoutingExplanations; import org.elasticsearch.cluster.routing.allocation.command.AllocateReplicaAllocationCommand; import org.elasticsearch.cluster.routing.allocation.decider.Decision; import org.elasticsearch.common.Strings; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.transport.TransportAddress; import org.elasticsearch.common.xcontent.ChunkedToXContent; import org.elasticsearch.common.xcontent.XContentHelper; @@ -310,11 +309,8 @@ public class ClusterRerouteResponseTests extends ESTestCase { .put( IndexMetadata.builder("index") .settings( - Settings.builder() - .put(IndexSettings.INDEX_CHECK_ON_STARTUP.getKey(), true) + indexSettings(1, 0).put(IndexSettings.INDEX_CHECK_ON_STARTUP.getKey(), true) .put(IndexSettings.MAX_SCRIPT_FIELDS_SETTING.getKey(), 10) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) .build() ) diff --git a/server/src/test/java/org/elasticsearch/action/admin/cluster/stats/AnalysisStatsTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/stats/AnalysisStatsTests.java index ef74123779ac..d08a4084f819 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/cluster/stats/AnalysisStatsTests.java +++ b/server/src/test/java/org/elasticsearch/action/admin/cluster/stats/AnalysisStatsTests.java @@ -226,11 +226,7 @@ public class AnalysisStatsTests extends AbstractWireSerializingTestCase {}); @@ -269,11 +265,7 @@ public class AnalysisStatsTests extends AbstractWireSerializingTestCase {}); @@ -281,12 +273,7 @@ public class AnalysisStatsTests extends AbstractWireSerializingTestCase { - private static final Settings SINGLE_SHARD_NO_REPLICAS = Settings.builder() - .put("index.number_of_replicas", 0) - .put("index.number_of_shards", 1) - .put("index.version.created", Version.CURRENT) - .build(); + private static final Settings SINGLE_SHARD_NO_REPLICAS = indexSettings(Version.CURRENT, 1, 0).build(); public static final String MAPPING_TEMPLATE = """ { @@ -469,12 +465,8 @@ public class MappingStatsTests extends AbstractWireSerializingTestCase {}); FieldStats expectedStats = new FieldStats("long"); @@ -486,11 +478,7 @@ public class MappingStatsTests extends AbstractWireSerializingTestCase {}); @@ -498,11 +486,7 @@ public class MappingStatsTests extends AbstractWireSerializingTestCase ASSERTING_DONE_LISTENER = ActionTestUtils.assertNoFailureListener(r -> {}); private final ShardId shardId = new ShardId("index", "_na_", 0); - private final Settings idxSettings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.version.created", Version.CURRENT.id) - .build(); + private final Settings idxSettings = indexSettings(Version.CURRENT, 1, 0).build(); private IndexMetadata indexMetadata() throws IOException { return IndexMetadata.builder("index").putMapping(""" diff --git a/server/src/test/java/org/elasticsearch/action/fieldcaps/RequestDispatcherTests.java b/server/src/test/java/org/elasticsearch/action/fieldcaps/RequestDispatcherTests.java index 97f8a5a5dd73..276789f10a5d 100644 --- a/server/src/test/java/org/elasticsearch/action/fieldcaps/RequestDispatcherTests.java +++ b/server/src/test/java/org/elasticsearch/action/fieldcaps/RequestDispatcherTests.java @@ -111,11 +111,10 @@ public class RequestDispatcherTests extends ESAllocationTestCase { } Metadata.Builder metadata = Metadata.builder(); for (String index : allIndices) { - final Settings.Builder settings = Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, between(1, 10)) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, between(0, 2)) - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT.minimumIndexCompatibilityVersion()); - metadata.put(IndexMetadata.builder(index).settings(settings)); + metadata.put( + IndexMetadata.builder(index) + .settings(indexSettings(Version.CURRENT.minimumIndexCompatibilityVersion(), between(1, 10), between(0, 2))) + ); } clusterState = newClusterState(metadata.build(), discoNodes.build()); } @@ -182,11 +181,10 @@ public class RequestDispatcherTests extends ESAllocationTestCase { } Metadata.Builder metadata = Metadata.builder(); for (String index : allIndices) { - final Settings.Builder settings = Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, between(1, 10)) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, between(1, 3)) - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT.minimumIndexCompatibilityVersion()); - metadata.put(IndexMetadata.builder(index).settings(settings)); + metadata.put( + IndexMetadata.builder(index) + .settings(indexSettings(Version.CURRENT.minimumIndexCompatibilityVersion(), between(1, 10), between(1, 3))) + ); } clusterState = newClusterState(metadata.build(), discoNodes.build()); } @@ -304,11 +302,10 @@ public class RequestDispatcherTests extends ESAllocationTestCase { } Metadata.Builder metadata = Metadata.builder(); for (String index : allIndices) { - final Settings.Builder settings = Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, between(1, 10)) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, between(0, 3)) - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT.minimumIndexCompatibilityVersion()); - metadata.put(IndexMetadata.builder(index).settings(settings)); + metadata.put( + IndexMetadata.builder(index) + .settings(indexSettings(Version.CURRENT.minimumIndexCompatibilityVersion(), between(1, 10), between(0, 3))) + ); } clusterState = newClusterState(metadata.build(), discoNodes.build()); } @@ -428,11 +425,10 @@ public class RequestDispatcherTests extends ESAllocationTestCase { } Metadata.Builder metadata = Metadata.builder(); for (String index : allIndices) { - final Settings.Builder settings = Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, between(2, 10)) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, between(0, 2)) - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT.minimumIndexCompatibilityVersion()); - metadata.put(IndexMetadata.builder(index).settings(settings)); + metadata.put( + IndexMetadata.builder(index) + .settings(indexSettings(Version.CURRENT.minimumIndexCompatibilityVersion(), between(2, 10), between(0, 2))) + ); } clusterState = newClusterState(metadata.build(), discoNodes.build()); } @@ -456,7 +452,6 @@ public class RequestDispatcherTests extends ESAllocationTestCase { ); final RequestTracker requestTracker = new RequestTracker(dispatcher, clusterState.routingTable(), withFilter); transportService.requestTracker.set(requestTracker); - final AtomicInteger failedTimes = new AtomicInteger(); final Set allUnmatchedShardIds = new HashSet<>(); for (String index : indices) { final Set shardIds = new HashSet<>(); @@ -519,7 +514,6 @@ public class RequestDispatcherTests extends ESAllocationTestCase { public void testStopAfterAllShardsUnmatched() throws Exception { final List allIndices = IntStream.rangeClosed(1, 5).mapToObj(n -> "index_" + n).toList(); final ClusterState clusterState; - final boolean newVersionOnly = randomBoolean(); { DiscoveryNodes.Builder discoNodes = DiscoveryNodes.builder(); int numNodes = randomIntBetween(1, 10); @@ -528,11 +522,10 @@ public class RequestDispatcherTests extends ESAllocationTestCase { } Metadata.Builder metadata = Metadata.builder(); for (String index : allIndices) { - final Settings.Builder settings = Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, between(1, 10)) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, between(0, 2)) - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT.minimumIndexCompatibilityVersion()); - metadata.put(IndexMetadata.builder(index).settings(settings)); + metadata.put( + IndexMetadata.builder(index) + .settings(indexSettings(Version.CURRENT.minimumIndexCompatibilityVersion(), between(1, 10), between(0, 2))) + ); } clusterState = newClusterState(metadata.build(), discoNodes.build()); } @@ -556,7 +549,6 @@ public class RequestDispatcherTests extends ESAllocationTestCase { ); final RequestTracker requestTracker = new RequestTracker(dispatcher, clusterState.routingTable(), withFilter); transportService.requestTracker.set(requestTracker); - final AtomicInteger failedTimes = new AtomicInteger(); final List unmatchedIndices = randomSubsetOf(between(1, indices.size()), indices); transportService.setTransportInterceptor(new TransportInterceptor.AsyncSender() { @Override diff --git a/server/src/test/java/org/elasticsearch/action/get/TransportMultiGetActionTests.java b/server/src/test/java/org/elasticsearch/action/get/TransportMultiGetActionTests.java index f64f126c4d2f..bcd2b8e4ca16 100644 --- a/server/src/test/java/org/elasticsearch/action/get/TransportMultiGetActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/get/TransportMultiGetActionTests.java @@ -98,11 +98,7 @@ public class TransportMultiGetActionTests extends ESTestCase { .metadata( new Metadata.Builder().put( new IndexMetadata.Builder(index1.getName()).settings( - Settings.builder() - .put("index.version.created", Version.CURRENT) - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 1) - .put(IndexMetadata.SETTING_INDEX_UUID, index1.getUUID()) + indexSettings(Version.CURRENT, 1, 1).put(IndexMetadata.SETTING_INDEX_UUID, index1.getUUID()) ) .putMapping( XContentHelper.convertToJson( @@ -123,11 +119,7 @@ public class TransportMultiGetActionTests extends ESTestCase { ) .put( new IndexMetadata.Builder(index2.getName()).settings( - Settings.builder() - .put("index.version.created", Version.CURRENT) - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 1) - .put(IndexMetadata.SETTING_INDEX_UUID, index1.getUUID()) + indexSettings(Version.CURRENT, 1, 1).put(IndexMetadata.SETTING_INDEX_UUID, index1.getUUID()) ) .putMapping( XContentHelper.convertToJson( diff --git a/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationAllPermitsAcquisitionTests.java b/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationAllPermitsAcquisitionTests.java index 9decda73f1db..ba8e500ceb9e 100644 --- a/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationAllPermitsAcquisitionTests.java +++ b/server/src/test/java/org/elasticsearch/action/support/replication/TransportReplicationAllPermitsAcquisitionTests.java @@ -66,9 +66,6 @@ import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_CREATION_DATE; import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_INDEX_UUID; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_VERSION_CREATED; import static org.elasticsearch.cluster.routing.TestShardRouting.newShardRouting; import static org.elasticsearch.test.ClusterServiceUtils.createClusterService; import static org.elasticsearch.test.ClusterServiceUtils.setState; @@ -129,11 +126,7 @@ public class TransportReplicationAllPermitsAcquisitionTests extends IndexShardTe RecoverySource.EmptyStoreRecoverySource.INSTANCE ); - Settings indexSettings = Settings.builder() - .put(SETTING_VERSION_CREATED, Version.CURRENT) - .put(SETTING_INDEX_UUID, shardId.getIndex().getUUID()) - .put(SETTING_NUMBER_OF_SHARDS, 1) - .put(SETTING_NUMBER_OF_REPLICAS, 1) + Settings indexSettings = indexSettings(Version.CURRENT, 1, 1).put(SETTING_INDEX_UUID, shardId.getIndex().getUUID()) .put(SETTING_CREATION_DATE, System.currentTimeMillis()) .build(); diff --git a/server/src/test/java/org/elasticsearch/action/termvectors/TransportMultiTermVectorsActionTests.java b/server/src/test/java/org/elasticsearch/action/termvectors/TransportMultiTermVectorsActionTests.java index 579862d79c45..bd44bfadbb54 100644 --- a/server/src/test/java/org/elasticsearch/action/termvectors/TransportMultiTermVectorsActionTests.java +++ b/server/src/test/java/org/elasticsearch/action/termvectors/TransportMultiTermVectorsActionTests.java @@ -99,11 +99,7 @@ public class TransportMultiTermVectorsActionTests extends ESTestCase { .metadata( new Metadata.Builder().put( new IndexMetadata.Builder(index1.getName()).settings( - Settings.builder() - .put("index.version.created", Version.CURRENT) - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 1) - .put(IndexMetadata.SETTING_INDEX_UUID, index1.getUUID()) + indexSettings(Version.CURRENT, 1, 1).put(IndexMetadata.SETTING_INDEX_UUID, index1.getUUID()) ) .putMapping( XContentHelper.convertToJson( @@ -124,11 +120,7 @@ public class TransportMultiTermVectorsActionTests extends ESTestCase { ) .put( new IndexMetadata.Builder(index2.getName()).settings( - Settings.builder() - .put("index.version.created", Version.CURRENT) - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 1) - .put(IndexMetadata.SETTING_INDEX_UUID, index1.getUUID()) + indexSettings(Version.CURRENT, 1, 1).put(IndexMetadata.SETTING_INDEX_UUID, index1.getUUID()) ) .putMapping( XContentHelper.convertToJson( diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ComponentTemplateTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ComponentTemplateTests.java index 65295289ccfa..804b65eafd98 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/ComponentTemplateTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/ComponentTemplateTests.java @@ -112,11 +112,8 @@ public class ComponentTemplateTests extends SimpleDiffableSerializationTestCase< } private static Settings randomSettings() { - return Settings.builder() - .put(IndexMetadata.SETTING_BLOCKS_READ, randomBoolean()) + return indexSettings(randomIntBetween(1, 10), randomIntBetween(0, 5)).put(IndexMetadata.SETTING_BLOCKS_READ, randomBoolean()) .put(IndexMetadata.SETTING_BLOCKS_WRITE, randomBoolean()) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, randomIntBetween(1, 10)) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, randomIntBetween(0, 5)) .put(IndexMetadata.SETTING_BLOCKS_WRITE, randomBoolean()) .put(IndexMetadata.SETTING_PRIORITY, randomIntBetween(0, 100000)) .build(); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java index b70f7a8578ce..7ca52ac1ba1b 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/ComposableIndexTemplateTests.java @@ -127,11 +127,8 @@ public class ComposableIndexTemplateTests extends SimpleDiffableSerializationTes } private static Settings randomSettings() { - return Settings.builder() - .put(IndexMetadata.SETTING_BLOCKS_READ, randomBoolean()) + return indexSettings(randomIntBetween(1, 10), randomIntBetween(0, 5)).put(IndexMetadata.SETTING_BLOCKS_READ, randomBoolean()) .put(IndexMetadata.SETTING_BLOCKS_WRITE, randomBoolean()) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, randomIntBetween(1, 10)) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, randomIntBetween(0, 5)) .put(IndexMetadata.SETTING_BLOCKS_WRITE, randomBoolean()) .put(IndexMetadata.SETTING_PRIORITY, randomIntBetween(0, 100000)) .build(); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataStatsTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataStatsTests.java index 926f96b4a6a6..227d5d1ab448 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataStatsTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataStatsTests.java @@ -20,7 +20,6 @@ import org.elasticsearch.cluster.routing.ShardRouting; import org.elasticsearch.cluster.routing.ShardRoutingHelper; import org.elasticsearch.cluster.routing.UnassignedInfo; import org.elasticsearch.common.UUIDs; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.core.TimeValue; import org.elasticsearch.index.shard.DocsStats; import org.elasticsearch.index.shard.IndexingStats; @@ -38,15 +37,7 @@ import static org.mockito.Mockito.when; public class IndexMetadataStatsTests extends ESTestCase { public void testFromStatsCreation() { final String indexName = "idx"; - final IndexMetadata indexMetadata = IndexMetadata.builder(indexName) - .settings( - Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 3) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .build() - ) - .build(); + final IndexMetadata indexMetadata = IndexMetadata.builder(indexName).settings(indexSettings(Version.CURRENT, 3, 1)).build(); final IndicesStatsResponse response = mock(IndicesStatsResponse.class); final IndexStats indexStats = mock(IndexStats.class); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataTests.java index 783790b9aed8..884466bd24b6 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataTests.java @@ -79,13 +79,7 @@ public class IndexMetadataTests extends ESTestCase { Double indexWriteLoadForecast = randomBoolean() ? randomDoubleBetween(0.0, 128, true) : null; Long shardSizeInBytesForecast = randomBoolean() ? randomLongBetween(1024, 10240) : null; IndexMetadata metadata = IndexMetadata.builder("foo") - .settings( - Settings.builder() - .put("index.version.created", 1) - .put("index.number_of_shards", numShard) - .put("index.number_of_replicas", numberOfReplicas) - .build() - ) + .settings(indexSettings(numShard, numberOfReplicas).put("index.version.created", 1)) .creationDate(randomLong()) .primaryTerm(0, 2) .setRoutingNumShards(32) @@ -176,13 +170,7 @@ public class IndexMetadataTests extends ESTestCase { public void testSelectShrinkShards() { int numberOfReplicas = randomIntBetween(0, 10); IndexMetadata metadata = IndexMetadata.builder("foo") - .settings( - Settings.builder() - .put("index.version.created", 1) - .put("index.number_of_shards", 32) - .put("index.number_of_replicas", numberOfReplicas) - .build() - ) + .settings(indexSettings(32, numberOfReplicas).put("index.version.created", 1)) .creationDate(randomLong()) .build(); Set shardIds = IndexMetadata.selectShrinkShards(0, metadata, 8); @@ -226,25 +214,13 @@ public class IndexMetadataTests extends ESTestCase { int numTargetShards = randomFrom(4, 6, 8, 12); IndexMetadata split = IndexMetadata.builder("foo") - .settings( - Settings.builder() - .put("index.version.created", 1) - .put("index.number_of_shards", 2) - .put("index.number_of_replicas", 0) - .build() - ) + .settings(indexSettings(2, 0).put("index.version.created", 1)) .creationDate(randomLong()) .setRoutingNumShards(numTargetShards * 2) .build(); IndexMetadata shrink = IndexMetadata.builder("foo") - .settings( - Settings.builder() - .put("index.version.created", 1) - .put("index.number_of_shards", 32) - .put("index.number_of_replicas", 0) - .build() - ) + .settings(indexSettings(32, 0).put("index.version.created", 1)) .creationDate(randomLong()) .build(); int shard = randomIntBetween(0, numTargetShards - 1); @@ -265,13 +241,7 @@ public class IndexMetadataTests extends ESTestCase { public void testSelectSplitShard() { IndexMetadata metadata = IndexMetadata.builder("foo") - .settings( - Settings.builder() - .put("index.version.created", 1) - .put("index.number_of_shards", 2) - .put("index.number_of_replicas", 0) - .build() - ) + .settings(indexSettings(2, 0).put("index.version.created", 1)) .creationDate(randomLong()) .setRoutingNumShards(4) .build(); @@ -301,12 +271,7 @@ public class IndexMetadataTests extends ESTestCase { } public void testIndexFormat() { - Settings defaultSettings = Settings.builder() - .put("index.version.created", 1) - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 1) - .build(); - + Settings defaultSettings = indexSettings(1, 1).put("index.version.created", 1).build(); // matching version { IndexMetadata metadata = IndexMetadata.builder("foo") @@ -446,10 +411,7 @@ public class IndexMetadataTests extends ESTestCase { } public void testIsHidden() { - Settings.Builder settings = Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, randomIntBetween(1, 8)) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT); + Settings.Builder settings = indexSettings(Version.CURRENT, randomIntBetween(1, 8), 0); IndexMetadata indexMetadata = IndexMetadata.builder("test").settings(settings).build(); assertFalse(indexMetadata.isHidden()); @@ -480,11 +442,7 @@ public class IndexMetadataTests extends ESTestCase { } public void testLifeCyclePolicyName() { - Settings.Builder settings = Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, randomIntBetween(1, 8)) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT); - + Settings.Builder settings = indexSettings(Version.CURRENT, randomIntBetween(1, 8), 0); IndexMetadata idxMeta1 = IndexMetadata.builder("test").settings(settings).build(); // null means no policy @@ -535,12 +493,7 @@ public class IndexMetadataTests extends ESTestCase { } private static Settings indexSettingsWithDataTier(String dataTier) { - return Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(DataTier.TIER_PREFERENCE, dataTier) - .build(); + return indexSettings(Version.CURRENT, 1, 0).put(DataTier.TIER_PREFERENCE, dataTier).build(); } private IndexMetadataStats randomIndexStats(int numberOfShards) { diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataVerifierTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataVerifierTests.java index 006ca3ceedf2..237fee858d77 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataVerifierTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataVerifierTests.java @@ -152,14 +152,10 @@ public class IndexMetadataVerifierTests extends ESTestCase { } private static IndexMetadata.Builder newIndexMetaBuilder(String name, Settings indexSettings) { - final Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, randomIndexCompatibleVersion(random())) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, between(0, 5)) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, between(1, 5)) - .put(IndexMetadata.SETTING_CREATION_DATE, randomNonNegativeLong()) - .put(IndexMetadata.SETTING_INDEX_UUID, UUIDs.randomBase64UUID(random())) - .put(indexSettings) - .build(); + final Settings settings = indexSettings(randomIndexCompatibleVersion(random()), between(1, 5), between(0, 5)).put( + IndexMetadata.SETTING_CREATION_DATE, + randomNonNegativeLong() + ).put(IndexMetadata.SETTING_INDEX_UUID, UUIDs.randomBase64UUID(random())).put(indexSettings).build(); final IndexMetadata.Builder indexMetadataBuilder = IndexMetadata.builder(name).settings(settings); if (randomBoolean()) { indexMetadataBuilder.state(IndexMetadata.State.CLOSE); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java index 61cc9ce1f0ba..fecbaf87407b 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateServiceTests.java @@ -125,9 +125,7 @@ public class MetadataIndexTemplateServiceTests extends ESSingleNodeTestCase { PutRequest request = new PutRequest("test", "test_replicas"); request.patterns(singletonList("test_shards_wait*")); - Settings.Builder settingsBuilder = builder().put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, "1") - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, "1") - .put(IndexMetadata.SETTING_WAIT_FOR_ACTIVE_SHARDS.getKey(), "2"); + Settings.Builder settingsBuilder = indexSettings(1, 1).put(IndexMetadata.SETTING_WAIT_FOR_ACTIVE_SHARDS.getKey(), "2"); request.settings(settingsBuilder.build()); @@ -140,9 +138,7 @@ public class MetadataIndexTemplateServiceTests extends ESSingleNodeTestCase { PutRequest request = new PutRequest("test", "test_specified_replicas"); request.patterns(singletonList("test_shards_wait*")); - Settings.Builder settingsBuilder = builder().put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, "1") - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, "1") - .put(IndexMetadata.SETTING_WAIT_FOR_ACTIVE_SHARDS.getKey(), "3"); + Settings.Builder settingsBuilder = indexSettings(1, 1).put(IndexMetadata.SETTING_WAIT_FOR_ACTIVE_SHARDS.getKey(), "3"); request.settings(settingsBuilder.build()); @@ -1908,16 +1904,8 @@ public class MetadataIndexTemplateServiceTests extends ESSingleNodeTestCase { ) .put( IndexMetadata.builder(".ds-unreferenced-000001") - .settings( - Settings.builder() - .put(IndexMetadata.SETTING_INDEX_UUID, "uuid2") - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .build() - ) + .settings(indexSettings(Version.CURRENT, 1, 0).put(IndexMetadata.SETTING_INDEX_UUID, "uuid2")) ) - .build() ) .build(); @@ -1945,16 +1933,8 @@ public class MetadataIndexTemplateServiceTests extends ESSingleNodeTestCase { ) .put( IndexMetadata.builder(".ds-logs-mysql-default-000001") - .settings( - Settings.builder() - .put(IndexMetadata.SETTING_INDEX_UUID, "uuid") - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .build() - ) + .settings(indexSettings(Version.CURRENT, 1, 0).put(IndexMetadata.SETTING_INDEX_UUID, "uuid")) ) - .build() ) .build(); @@ -2068,16 +2048,8 @@ public class MetadataIndexTemplateServiceTests extends ESSingleNodeTestCase { ) .put( IndexMetadata.builder(".ds-unreferenced-000001") - .settings( - Settings.builder() - .put(IndexMetadata.SETTING_INDEX_UUID, "uuid2") - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .build() - ) + .settings(indexSettings(Version.CURRENT, 1, 0).put(IndexMetadata.SETTING_INDEX_UUID, "uuid2")) ) - .build() ) .build(); @@ -2105,16 +2077,8 @@ public class MetadataIndexTemplateServiceTests extends ESSingleNodeTestCase { ) .put( IndexMetadata.builder(".ds-logs-mysql-default-000001") - .settings( - Settings.builder() - .put(IndexMetadata.SETTING_INDEX_UUID, "uuid") - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .build() - ) + .settings(indexSettings(Version.CURRENT, 1, 0).put(IndexMetadata.SETTING_INDEX_UUID, "uuid")) ) - .build() ) .build(); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataTests.java index 8bf618fb301f..462bbad50510 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetadataTests.java @@ -620,26 +620,8 @@ public class MetadataTests extends ESTestCase { public void testFindMappings() throws IOException { Metadata metadata = Metadata.builder() - .put( - IndexMetadata.builder("index1") - .settings( - Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - ) - .putMapping(FIND_MAPPINGS_TEST_ITEM) - ) - .put( - IndexMetadata.builder("index2") - .settings( - Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - ) - .putMapping(FIND_MAPPINGS_TEST_ITEM) - ) + .put(IndexMetadata.builder("index1").settings(indexSettings(Version.CURRENT, 1, 0)).putMapping(FIND_MAPPINGS_TEST_ITEM)) + .put(IndexMetadata.builder("index2").settings(indexSettings(Version.CURRENT, 1, 0)).putMapping(FIND_MAPPINGS_TEST_ITEM)) .build(); { @@ -684,16 +666,7 @@ public class MetadataTests extends ESTestCase { ); Metadata metadata = Metadata.builder() - .put( - IndexMetadata.builder("index1") - .settings( - Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - ) - .putMapping(originalMappingMetadata) - ) + .put(IndexMetadata.builder("index1").settings(indexSettings(Version.CURRENT, 1, 0)).putMapping(originalMappingMetadata)) .build(); { @@ -729,36 +702,9 @@ public class MetadataTests extends ESTestCase { } Metadata metadata = Metadata.builder() - .put( - IndexMetadata.builder("index1") - .settings( - Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - ) - .putMapping(mapping) - ) - .put( - IndexMetadata.builder("index2") - .settings( - Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - ) - .putMapping(mapping) - ) - .put( - IndexMetadata.builder("index3") - .settings( - Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - ) - .putMapping(mapping) - ) + .put(IndexMetadata.builder("index1").settings(indexSettings(Version.CURRENT, 1, 0)).putMapping(mapping)) + .put(IndexMetadata.builder("index2").settings(indexSettings(Version.CURRENT, 1, 0)).putMapping(mapping)) + .put(IndexMetadata.builder("index3").settings(indexSettings(Version.CURRENT, 1, 0)).putMapping(mapping)) .build(); { @@ -1269,14 +1215,7 @@ public class MetadataTests extends ESTestCase { b = Metadata.builder(); b.put( - IndexMetadata.builder("index1") - .settings( - Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - ) - .putAlias(new AliasMetadata.Builder("my-alias")) + IndexMetadata.builder("index1").settings(indexSettings(Version.CURRENT, 1, 0)).putAlias(new AliasMetadata.Builder("my-alias")) ); addDataStream("d1", b); @@ -1304,14 +1243,7 @@ public class MetadataTests extends ESTestCase { b = Metadata.builder(); b.put( - IndexMetadata.builder("index1") - .settings( - Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - ) - .putAlias(new AliasMetadata.Builder("my-alias")) + IndexMetadata.builder("index1").settings(indexSettings(Version.CURRENT, 1, 0)).putAlias(new AliasMetadata.Builder("my-alias")) ); b.dataStreams(Map.of("d1", createDataStream("d1")), Map.of("my-alias", new DataStreamAlias("my-alias", List.of("d1"), null, null))); e = expectThrows(IllegalStateException.class, b::build); diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/SystemIndexMetadataUpgradeServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/SystemIndexMetadataUpgradeServiceTests.java index 9fd5a5a38d95..f5afbfdcb538 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/SystemIndexMetadataUpgradeServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/SystemIndexMetadataUpgradeServiceTests.java @@ -236,9 +236,6 @@ public class SystemIndexMetadataUpgradeServiceTests extends ESTestCase { } private static Settings.Builder getSettingsBuilder() { - return Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1); + return indexSettings(Version.CURRENT, 1, 0); } } diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java index 1a3d3f0668da..b50a9a6f0fa1 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/FailedNodeRoutingTests.java @@ -44,8 +44,6 @@ import java.util.Locale; import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.cluster.routing.RoutingNodesHelper.shardsWithState; import static org.elasticsearch.cluster.routing.ShardRoutingState.INITIALIZING; import static org.elasticsearch.cluster.routing.ShardRoutingState.STARTED; @@ -138,10 +136,8 @@ public class FailedNodeRoutingTests extends ESAllocationTestCase { logger.info("--> creating some indices"); for (int i = 0; i < randomIntBetween(2, 5); i++) { String name = "index_" + randomAlphaOfLength(8).toLowerCase(Locale.ROOT); - Settings.Builder settingsBuilder = Settings.builder() - .put(SETTING_NUMBER_OF_SHARDS, randomIntBetween(1, 4)) - .put(SETTING_NUMBER_OF_REPLICAS, randomIntBetween(2, 4)); - CreateIndexRequest request = new CreateIndexRequest(name, settingsBuilder.build()).waitForActiveShards(ActiveShardCount.NONE); + CreateIndexRequest request = new CreateIndexRequest(name, indexSettings(randomIntBetween(1, 4), randomIntBetween(2, 4)).build()) + .waitForActiveShards(ActiveShardCount.NONE); state = cluster.createIndex(state, request); assertTrue(state.metadata().hasIndex(name)); } diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java index 47dd0602feec..ed1bccaba9ac 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/IndexBalanceTests.java @@ -496,14 +496,7 @@ public class IndexBalanceTests extends ESAllocationTestCase { IntFunction assignmentFunction ) { final var inSyncIds = randomList(numberOfShards, numberOfShards, () -> UUIDs.randomBase64UUID(random())); - final var indexMetadataBuilder = IndexMetadata.builder(indexName) - .settings( - Settings.builder() - .put("index.number_of_shards", numberOfShards) - .put("index.number_of_replicas", 0) - .put("index.version.created", Version.CURRENT) - .build() - ); + final var indexMetadataBuilder = IndexMetadata.builder(indexName).settings(indexSettings(Version.CURRENT, numberOfShards, 0)); for (int shardId = 0; shardId < numberOfShards; shardId++) { indexMetadataBuilder.putInSyncAllocationIds(shardId, Set.of(inSyncIds.get(shardId))); } diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java index 6cca1271c65f..44eae2a73009 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/ResizeAllocationDeciderTests.java @@ -312,23 +312,13 @@ public class ResizeAllocationDeciderTests extends ESAllocationTestCase { public void testGetForcedInitialShardAllocationToNodes() { var source = IndexMetadata.builder("source") - .settings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_INDEX_UUID, "uuid-1") - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - ) + .settings(indexSettings(Version.CURRENT, 1, 0).put(IndexMetadata.SETTING_INDEX_UUID, "uuid-1")) .build(); var target = IndexMetadata.builder("target") .settings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.INDEX_RESIZE_SOURCE_NAME.getKey(), "source") + indexSettings(Version.CURRENT, 1, 0).put(IndexMetadata.INDEX_RESIZE_SOURCE_NAME.getKey(), "source") .put(IndexMetadata.INDEX_RESIZE_SOURCE_UUID.getKey(), "uuid-1") .put(IndexMetadata.SETTING_INDEX_UUID, "uuid-2") - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) ) .build(); var clusterState = ClusterState.builder(new ClusterName("test-cluster")) diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/ClusterAllocationSimulationTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/ClusterAllocationSimulationTests.java index a7821386dbf9..2fe8e008edca 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/ClusterAllocationSimulationTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/ClusterAllocationSimulationTests.java @@ -119,11 +119,10 @@ public class ClusterAllocationSimulationTests extends ESAllocationTestCase { metadataBuilder.put( IndexMetadata.builder(indexName) .settings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, shardCount) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, replicaCount) - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.INDEX_ROUTING_REQUIRE_GROUP_PREFIX + ".fake_tier", tier) + indexSettings(Version.CURRENT, shardCount, replicaCount).put( + IndexMetadata.INDEX_ROUTING_REQUIRE_GROUP_PREFIX + ".fake_tier", + tier + ) ) .indexWriteLoadForecast(indexWriteLoad) .shardSizeInBytesForecast(shardSize) diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/ClusterInfoSimulatorTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/ClusterInfoSimulatorTests.java index 6e74c510159e..f8f2d573e7df 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/ClusterInfoSimulatorTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/ClusterInfoSimulatorTests.java @@ -329,12 +329,7 @@ public class ClusterInfoSimulatorTests extends ESTestCase { private static void addIndex(Metadata.Builder metadataBuilder, RoutingTable.Builder routingTableBuilder, ShardRouting shardRouting) { var name = shardRouting.getIndexName(); - var settings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.version.created", Version.CURRENT) - .build(); - metadataBuilder.put(IndexMetadata.builder(name).settings(settings)); + metadataBuilder.put(IndexMetadata.builder(name).settings(indexSettings(Version.CURRENT, 1, 0))); routingTableBuilder.add(IndexRoutingTable.builder(metadataBuilder.get(name).getIndex()).addShard(shardRouting)); } diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputerTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputerTests.java index 8913dcb59ca2..5cf539a9a246 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputerTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/DesiredBalanceComputerTests.java @@ -602,14 +602,7 @@ public class DesiredBalanceComputerTests extends ESTestCase { var inSyncIds = randomList(shards * (replicas + 1), shards * (replicas + 1), () -> UUIDs.randomBase64UUID(random())); var shardSize = randomLongBetween(10_000_000L, 10_000_000_000L); - var indexMetadataBuilder = IndexMetadata.builder(indexName) - .settings( - Settings.builder() - .put("index.number_of_shards", shards) - .put("index.number_of_replicas", replicas) - .put("index.version.created", Version.CURRENT) - .build() - ); + var indexMetadataBuilder = IndexMetadata.builder(indexName).settings(indexSettings(Version.CURRENT, shards, replicas)); if (randomBoolean()) { indexMetadataBuilder.shardSizeInBytesForecast(smallShardSizeDeviation(shardSize)); } @@ -749,14 +742,7 @@ public class DesiredBalanceComputerTests extends ESTestCase { metadataBuilder.put( IndexMetadata.builder(indexName) - .settings( - Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 1) - .put("index.version.created", Version.CURRENT) - .put("index.routing.allocation.exclude._name", "node-2") - .build() - ) + .settings(indexSettings(Version.CURRENT, 1, 1).put("index.routing.allocation.exclude._name", "node-2")) ); var indexId = metadataBuilder.get(indexName).getIndex(); @@ -789,14 +775,7 @@ public class DesiredBalanceComputerTests extends ESTestCase { metadataBuilder.put( IndexMetadata.builder(indexName) - .settings( - Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.version.created", Version.CURRENT) - .put("index.routing.allocation.exclude._name", "node-2") - .build() - ) + .settings(indexSettings(Version.CURRENT, 1, 0).put("index.routing.allocation.exclude._name", "node-2")) ); var indexId = metadataBuilder.get(indexName).getIndex(); diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java index 72d7650ad72d..3602c13350ab 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/FilterAllocationDeciderTests.java @@ -297,12 +297,8 @@ public class FilterAllocationDeciderTests extends ESAllocationTestCase { public void testGetForcedInitialShardAllocationToNodes() { var index = IndexMetadata.builder("index") .settings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put("index.routing.allocation.initial_recovery._id", "node-1") + indexSettings(Version.CURRENT, 1, 0).put("index.routing.allocation.initial_recovery._id", "node-1") .put(IndexMetadata.SETTING_INDEX_UUID, "uuid") - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) ) .build(); var clusterState = ClusterState.builder(new ClusterName("test-cluster")) diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/NodeReplacementAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/NodeReplacementAllocationDeciderTests.java index a3c304a055a0..7d7f091e58f5 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/NodeReplacementAllocationDeciderTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/NodeReplacementAllocationDeciderTests.java @@ -75,14 +75,7 @@ public class NodeReplacementAllocationDeciderTests extends ESAllocationTestCase private final String idxName = "test-idx"; private final String idxUuid = "test-idx-uuid"; private final IndexMetadata indexMetadata = IndexMetadata.builder(idxName) - .settings( - Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_INDEX_UUID, idxUuid) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .build() - ) + .settings(indexSettings(Version.CURRENT, 1, 0).put(IndexMetadata.SETTING_INDEX_UUID, idxUuid)) .build(); public void testNoReplacements() { diff --git a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/NodeShutdownAllocationDeciderTests.java b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/NodeShutdownAllocationDeciderTests.java index 3bf93279128f..a08ec879330e 100644 --- a/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/NodeShutdownAllocationDeciderTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/routing/allocation/decider/NodeShutdownAllocationDeciderTests.java @@ -69,14 +69,7 @@ public class NodeShutdownAllocationDeciderTests extends ESAllocationTestCase { private final String idxName = "test-idx"; private final String idxUuid = "test-idx-uuid"; private final IndexMetadata indexMetadata = IndexMetadata.builder(idxName) - .settings( - Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_INDEX_UUID, idxUuid) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .build() - ) + .settings(indexSettings(Version.CURRENT, 1, 0).put(IndexMetadata.SETTING_INDEX_UUID, idxUuid)) .build(); private static final List REMOVE_SHUTDOWN_TYPES = List.of( diff --git a/server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java b/server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java index f5bcb7ecc885..af1260c8ee36 100644 --- a/server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java +++ b/server/src/test/java/org/elasticsearch/common/settings/ScopedSettingsTests.java @@ -1066,14 +1066,7 @@ public class ScopedSettingsTests extends ESTestCase { } public static IndexMetadata newIndexMeta(String name, Settings indexSettings) { - Settings build = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(indexSettings) - .build(); - IndexMetadata metadata = IndexMetadata.builder(name).settings(build).build(); - return metadata; + return IndexMetadata.builder(name).settings(indexSettings(Version.CURRENT, 1, 0).put(indexSettings)).build(); } public void testKeyPattern() { diff --git a/server/src/test/java/org/elasticsearch/gateway/ClusterStateUpdatersTests.java b/server/src/test/java/org/elasticsearch/gateway/ClusterStateUpdatersTests.java index bd2efecc5af2..d2aa71589e84 100644 --- a/server/src/test/java/org/elasticsearch/gateway/ClusterStateUpdatersTests.java +++ b/server/src/test/java/org/elasticsearch/gateway/ClusterStateUpdatersTests.java @@ -107,14 +107,7 @@ public class ClusterStateUpdatersTests extends ESTestCase { private IndexMetadata createIndexMetadata(final String name, final Settings settings) { return IndexMetadata.builder(name) - .settings( - Settings.builder() - .put(IndexMetadata.SETTING_INDEX_UUID, UUIDs.randomBase64UUID()) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(settings) - ) + .settings(indexSettings(Version.CURRENT, 1, 0).put(IndexMetadata.SETTING_INDEX_UUID, UUIDs.randomBase64UUID()).put(settings)) .build(); } diff --git a/server/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java b/server/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java index 462f3bcf8d6a..fa9cb5e3a5bf 100644 --- a/server/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java +++ b/server/src/test/java/org/elasticsearch/gateway/DanglingIndicesStateTests.java @@ -33,11 +33,7 @@ import static org.mockito.Mockito.when; public class DanglingIndicesStateTests extends ESTestCase { - private static final Settings indexSettings = Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .build(); + private static final Settings indexSettings = indexSettings(Version.CURRENT, 1, 0).build(); public void testDanglingIndicesAreDiscovered() throws Exception { try (NodeEnvironment env = newNodeEnvironment()) { diff --git a/server/src/test/java/org/elasticsearch/gateway/GatewayMetaStatePersistedStateTests.java b/server/src/test/java/org/elasticsearch/gateway/GatewayMetaStatePersistedStateTests.java index d94d2ab60f42..b3ee755bcc64 100644 --- a/server/src/test/java/org/elasticsearch/gateway/GatewayMetaStatePersistedStateTests.java +++ b/server/src/test/java/org/elasticsearch/gateway/GatewayMetaStatePersistedStateTests.java @@ -171,16 +171,9 @@ public class GatewayMetaStatePersistedStateTests extends ESTestCase { return builder.build(); } - private IndexMetadata createIndexMetadata(String indexName, int numberOfShards, long version) { + private static IndexMetadata createIndexMetadata(String indexName, int numberOfShards, long version) { return IndexMetadata.builder(indexName) - .settings( - Settings.builder() - .put(IndexMetadata.SETTING_INDEX_UUID, indexName) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, numberOfShards) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .build() - ) + .settings(indexSettings(Version.CURRENT, numberOfShards, 0).put(IndexMetadata.SETTING_INDEX_UUID, indexName).build()) .version(version) .build(); } diff --git a/server/src/test/java/org/elasticsearch/gateway/MetaStateServiceTests.java b/server/src/test/java/org/elasticsearch/gateway/MetaStateServiceTests.java index b76f097d5c1d..89023840d616 100644 --- a/server/src/test/java/org/elasticsearch/gateway/MetaStateServiceTests.java +++ b/server/src/test/java/org/elasticsearch/gateway/MetaStateServiceTests.java @@ -45,14 +45,7 @@ public class MetaStateServiceTests extends ESTestCase { private static IndexMetadata indexMetadata(String name) { return IndexMetadata.builder(name) - .settings( - Settings.builder() - .put(IndexMetadata.SETTING_INDEX_UUID, UUIDs.randomBase64UUID()) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .build() - ) + .settings(indexSettings(Version.CURRENT, 1, 0).put(IndexMetadata.SETTING_INDEX_UUID, UUIDs.randomBase64UUID())) .build(); } diff --git a/server/src/test/java/org/elasticsearch/gateway/PriorityComparatorTests.java b/server/src/test/java/org/elasticsearch/gateway/PriorityComparatorTests.java index 6495a730bc37..1961a5369f89 100644 --- a/server/src/test/java/org/elasticsearch/gateway/PriorityComparatorTests.java +++ b/server/src/test/java/org/elasticsearch/gateway/PriorityComparatorTests.java @@ -279,12 +279,8 @@ public class PriorityComparatorTests extends ESTestCase { } private static Settings buildSettings(int creationDate, int priority) { - return Settings.builder() - .put(IndexMetadata.SETTING_CREATION_DATE, creationDate) + return indexSettings(Version.CURRENT, 1, 0).put(IndexMetadata.SETTING_CREATION_DATE, creationDate) .put(IndexMetadata.SETTING_PRIORITY, priority) - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) .build(); } } diff --git a/server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java b/server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java index 4c6b13e0434f..97bee26c2f49 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexSettingsTests.java @@ -220,11 +220,7 @@ public class IndexSettingsTests extends ESTestCase { public void testNodeSettingsAreContained() { final int numShards = randomIntBetween(1, 10); final int numReplicas = randomIntBetween(0, 10); - Settings theSettings = Settings.builder() - .put("index.foo.bar", 0) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, numReplicas) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, numShards) - .build(); + Settings theSettings = indexSettings(numShards, numReplicas).put("index.foo.bar", 0).build(); Settings nodeSettings = Settings.builder().put("index.foo.bar", 43).build(); final AtomicInteger indexValue = new AtomicInteger(0); @@ -236,44 +232,18 @@ public class IndexSettingsTests extends ESTestCase { assertEquals(0, indexValue.get()); assertTrue( - settings.updateIndexMetadata( - newIndexMeta( - "index", - Settings.builder() - .put("index.foo.bar", 42) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, numReplicas + 1) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, numShards) - .build() - ) - ) + settings.updateIndexMetadata(newIndexMeta("index", indexSettings(numShards, numReplicas + 1).put("index.foo.bar", 42).build())) ); assertEquals(42, indexValue.get()); assertSame(nodeSettings, settings.getNodeSettings()); - assertTrue( - settings.updateIndexMetadata( - newIndexMeta( - "index", - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, numReplicas + 1) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, numShards) - .build() - ) - ) - ); + assertTrue(settings.updateIndexMetadata(newIndexMeta("index", indexSettings(numShards, numReplicas + 1).build()))); assertEquals(43, indexValue.get()); - } public static IndexMetadata newIndexMeta(String name, Settings indexSettings) { - Settings build = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(indexSettings) - .build(); - return IndexMetadata.builder(name).settings(build).build(); + return IndexMetadata.builder(name).settings(indexSettings(Version.CURRENT, 1, 1).put(indexSettings)).build(); } public void testUpdateDurability() { diff --git a/server/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java b/server/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java index 7560a5ab2c97..4323785a1d8f 100644 --- a/server/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java +++ b/server/src/test/java/org/elasticsearch/index/IndexingSlowLogTests.java @@ -469,13 +469,6 @@ public class IndexingSlowLogTests extends ESTestCase { } private IndexMetadata newIndexMeta(String name, Settings indexSettings) { - Settings build = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(indexSettings) - .build(); - IndexMetadata metadata = IndexMetadata.builder(name).settings(build).build(); - return metadata; + return IndexMetadata.builder(name).settings(indexSettings(Version.CURRENT, 1, 1).put(indexSettings)).build(); } } diff --git a/server/src/test/java/org/elasticsearch/index/MergeSchedulerSettingsTests.java b/server/src/test/java/org/elasticsearch/index/MergeSchedulerSettingsTests.java index e79fea5a3d4c..62a71d03e1f3 100644 --- a/server/src/test/java/org/elasticsearch/index/MergeSchedulerSettingsTests.java +++ b/server/src/test/java/org/elasticsearch/index/MergeSchedulerSettingsTests.java @@ -64,11 +64,10 @@ public class MergeSchedulerSettingsTests extends ESTestCase { Loggers.addAppender(settingsLogger, mockAppender); Loggers.setLevel(settingsLogger, Level.TRACE); try { - Settings.Builder builder = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, "1") - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, "0") - .put(MergePolicyConfig.INDEX_MERGE_POLICY_MAX_MERGE_AT_ONCE_SETTING.getKey(), "2") + Settings.Builder builder = indexSettings(Version.CURRENT, 1, 0).put( + MergePolicyConfig.INDEX_MERGE_POLICY_MAX_MERGE_AT_ONCE_SETTING.getKey(), + "2" + ) .put(MergePolicyConfig.INDEX_MERGE_POLICY_SEGMENTS_PER_TIER_SETTING.getKey(), "2") .put(MergeSchedulerConfig.MAX_THREAD_COUNT_SETTING.getKey(), "1") .put(MergeSchedulerConfig.MAX_MERGE_COUNT_SETTING.getKey(), "2") @@ -95,11 +94,10 @@ public class MergeSchedulerSettingsTests extends ESTestCase { Loggers.addAppender(settingsLogger, mockAppender); Loggers.setLevel(settingsLogger, Level.TRACE); try { - Settings.Builder builder = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, "1") - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, "0") - .put(MergePolicyConfig.INDEX_MERGE_POLICY_MAX_MERGE_AT_ONCE_SETTING.getKey(), "2") + Settings.Builder builder = indexSettings(Version.CURRENT, 1, 0).put( + MergePolicyConfig.INDEX_MERGE_POLICY_MAX_MERGE_AT_ONCE_SETTING.getKey(), + "2" + ) .put(MergePolicyConfig.INDEX_MERGE_POLICY_SEGMENTS_PER_TIER_SETTING.getKey(), "2") .put(MergeSchedulerConfig.MAX_THREAD_COUNT_SETTING.getKey(), "10000") .put(MergeSchedulerConfig.MAX_MERGE_COUNT_SETTING.getKey(), "10000"); diff --git a/server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java b/server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java index 6d87cd5be8ed..f0d080c43e2e 100644 --- a/server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java +++ b/server/src/test/java/org/elasticsearch/index/SearchSlowLogTests.java @@ -496,14 +496,7 @@ public class SearchSlowLogTests extends ESSingleNodeTestCase { } private IndexMetadata newIndexMeta(String name, Settings indexSettings) { - Settings build = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(indexSettings) - .build(); - IndexMetadata metadata = IndexMetadata.builder(name).settings(build).build(); - return metadata; + return IndexMetadata.builder(name).settings(indexSettings(Version.CURRENT, 1, 1).put(indexSettings)).build(); } private SearchContext searchContextWithSourceAndTask(IndexService index) { diff --git a/server/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java b/server/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java index a887277d8540..dd2188383ed9 100644 --- a/server/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java +++ b/server/src/test/java/org/elasticsearch/index/fieldstats/FieldStatsProviderRefreshTests.java @@ -12,8 +12,6 @@ import org.elasticsearch.action.admin.indices.refresh.RefreshResponse; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; -import org.elasticsearch.cluster.metadata.IndexMetadata; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.indices.IndicesRequestCache; import org.elasticsearch.rest.RestStatus; @@ -32,12 +30,7 @@ public class FieldStatsProviderRefreshTests extends ESSingleNodeTestCase { .indices() .prepareCreate("index") .setMapping("s", "type=text") - .setSettings( - Settings.builder() - .put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - ) + .setSettings(indexSettings(1, 0).put(IndicesRequestCache.INDEX_CACHE_REQUEST_ENABLED_SETTING.getKey(), true)) .get() ); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java index 14c48348fcd4..38b770bf1994 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/DateFieldTypeTests.java @@ -169,11 +169,7 @@ public class DateFieldTypeTests extends FieldTypeTestCase { } public void testTermQuery() { - Settings indexSettings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .build(); + Settings indexSettings = indexSettings(Version.CURRENT, 1, 1).build(); SearchExecutionContext context = new SearchExecutionContext( 0, 0, @@ -224,11 +220,7 @@ public class DateFieldTypeTests extends FieldTypeTestCase { } public void testRangeQuery() throws IOException { - Settings indexSettings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .build(); + Settings indexSettings = indexSettings(Version.CURRENT, 1, 1).build(); SearchExecutionContext context = new SearchExecutionContext( 0, 0, @@ -297,12 +289,7 @@ public class DateFieldTypeTests extends FieldTypeTestCase { } public void testRangeQueryWithIndexSort() { - Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put("index.sort.field", "field") - .build(); + Settings settings = indexSettings(Version.CURRENT, 1, 1).put("index.sort.field", "field").build(); IndexMetadata indexMetadata = new IndexMetadata.Builder("index").settings(settings).build(); IndexSettings indexSettings = new IndexSettings(indexMetadata, settings); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/IdFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/IdFieldTypeTests.java index 9320a6c5de2e..fb42d6633bb0 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/IdFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/IdFieldTypeTests.java @@ -34,11 +34,10 @@ public class IdFieldTypeTests extends ESTestCase { public void testTermsQuery() { SearchExecutionContext context = Mockito.mock(SearchExecutionContext.class); - Settings.Builder indexSettings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_INDEX_UUID, UUIDs.randomBase64UUID()); + Settings.Builder indexSettings = indexSettings(Version.CURRENT, 1, 0).put( + IndexMetadata.SETTING_INDEX_UUID, + UUIDs.randomBase64UUID() + ); if (randomBoolean()) { indexSettings.put(IndexSettings.MODE.getKey(), "time_series"); indexSettings.put(IndexMetadata.INDEX_ROUTING_PATH.getKey(), "foo"); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java b/server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java index aa0341f4d620..2a3a4604cacf 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/MapperServiceTests.java @@ -282,12 +282,7 @@ public class MapperServiceTests extends MapperServiceTestCase { { IndexMetadata.Builder builder = new IndexMetadata.Builder("test"); - Settings settings = Settings.builder() - .put("index.number_of_replicas", 0) - .put("index.number_of_shards", 1) - .put("index.version.created", Version.CURRENT) - .build(); - builder.settings(settings); + builder.settings(indexSettings(Version.CURRENT, 1, 0)); // Text fields are not stored by default, so an incoming update that is identical but // just has `stored:false` should not require an update @@ -298,12 +293,7 @@ public class MapperServiceTests extends MapperServiceTestCase { { IndexMetadata.Builder builder = new IndexMetadata.Builder("test"); - Settings settings = Settings.builder() - .put("index.number_of_replicas", 0) - .put("index.number_of_shards", 1) - .put("index.version.created", Version.CURRENT) - .build(); - builder.settings(settings); + builder.settings(indexSettings(Version.CURRENT, 1, 0)); // However, an update that really does need a rebuild will throw an exception builder.putMapping(""" diff --git a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java index 920040fd8054..deb6432a9ce9 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/NumberFieldTypeTests.java @@ -584,13 +584,7 @@ public class NumberFieldTypeTests extends FieldTypeTestCase { public void doTestIndexSortRangeQueries(NumberType type, Supplier valueSupplier) throws IOException { // Create index settings with an index sort. - Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put("index.sort.field", "field") - .build(); - + Settings settings = indexSettings(Version.CURRENT, 1, 1).put("index.sort.field", "field").build(); IndexMetadata indexMetadata = new IndexMetadata.Builder("index").settings(settings).build(); IndexSettings indexSettings = new IndexSettings(indexMetadata, settings); diff --git a/server/src/test/java/org/elasticsearch/index/mapper/ReloadableAnalyzerTests.java b/server/src/test/java/org/elasticsearch/index/mapper/ReloadableAnalyzerTests.java index 85ba074a7b96..11f655b1b436 100644 --- a/server/src/test/java/org/elasticsearch/index/mapper/ReloadableAnalyzerTests.java +++ b/server/src/test/java/org/elasticsearch/index/mapper/ReloadableAnalyzerTests.java @@ -9,7 +9,6 @@ package org.elasticsearch.index.mapper; import org.apache.lucene.analysis.TokenStream; -import org.elasticsearch.cluster.metadata.IndexMetadata; import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.compress.CompressedXContent; import org.elasticsearch.common.settings.Settings; @@ -39,10 +38,7 @@ public class ReloadableAnalyzerTests extends ESSingleNodeTestCase { } public void testReloadSearchAnalyzers() throws IOException { - Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put("index.analysis.analyzer.reloadableAnalyzer.type", "custom") + Settings settings = indexSettings(1, 1).put("index.analysis.analyzer.reloadableAnalyzer.type", "custom") .put("index.analysis.analyzer.reloadableAnalyzer.tokenizer", "standard") .putList("index.analysis.analyzer.reloadableAnalyzer.filter", "myReloadableFilter") .build(); diff --git a/server/src/test/java/org/elasticsearch/index/query/SearchExecutionContextTests.java b/server/src/test/java/org/elasticsearch/index/query/SearchExecutionContextTests.java index b2820292e36d..d895c0e630a3 100644 --- a/server/src/test/java/org/elasticsearch/index/query/SearchExecutionContextTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/SearchExecutionContextTests.java @@ -172,12 +172,7 @@ public class SearchExecutionContextTests extends ESTestCase { } public void testIndexSortedOnField() { - Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put("index.sort.field", "sort_field") - .build(); + Settings settings = indexSettings(Version.CURRENT, 1, 1).put("index.sort.field", "sort_field").build(); IndexMetadata indexMetadata = new IndexMetadata.Builder("index").settings(settings).build(); IndexSettings indexSettings = new IndexSettings(indexMetadata, settings); @@ -441,13 +436,7 @@ public class SearchExecutionContextTests extends ESTestCase { Map runtimeMappings ) { IndexMetadata.Builder indexMetadataBuilder = new IndexMetadata.Builder("index"); - indexMetadataBuilder.settings( - Settings.builder() - .put("index.version.created", Version.CURRENT) - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 1) - .put(IndexMetadata.SETTING_INDEX_UUID, indexUuid) - ); + indexMetadataBuilder.settings(indexSettings(Version.CURRENT, 1, 1).put(IndexMetadata.SETTING_INDEX_UUID, indexUuid)); IndexMetadata indexMetadata = indexMetadataBuilder.build(); IndexSettings indexSettings = new IndexSettings(indexMetadata, Settings.EMPTY); MapperService mapperService = createMapperService(indexSettings, mappingLookup); diff --git a/server/src/test/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilderTests.java b/server/src/test/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilderTests.java index c3ce1757a8dd..893d84df5222 100644 --- a/server/src/test/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/index/query/functionscore/ScoreFunctionBuilderTests.java @@ -55,12 +55,10 @@ public class ScoreFunctionBuilderTests extends ESTestCase { RandomScoreFunctionBuilder builder = new RandomScoreFunctionBuilder(); builder.seed(42); SearchExecutionContext context = Mockito.mock(SearchExecutionContext.class); - Settings indexSettings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .build(); - IndexSettings settings = new IndexSettings(IndexMetadata.builder("index").settings(indexSettings).build(), Settings.EMPTY); + IndexSettings settings = new IndexSettings( + IndexMetadata.builder("index").settings(indexSettings(Version.CURRENT, 1, 1)).build(), + Settings.EMPTY + ); Mockito.when(context.index()).thenReturn(settings.getIndex()); Mockito.when(context.getShardId()).thenReturn(0); Mockito.when(context.getIndexSettings()).thenReturn(settings); @@ -75,12 +73,10 @@ public class ScoreFunctionBuilderTests extends ESTestCase { builder.setField("foo"); builder.seed(42); SearchExecutionContext context = Mockito.mock(SearchExecutionContext.class); - Settings indexSettings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .build(); - IndexSettings settings = new IndexSettings(IndexMetadata.builder("index").settings(indexSettings).build(), Settings.EMPTY); + IndexSettings settings = new IndexSettings( + IndexMetadata.builder("index").settings(indexSettings(Version.CURRENT, 1, 1)).build(), + Settings.EMPTY + ); Mockito.when(context.index()).thenReturn(settings.getIndex()); Mockito.when(context.getShardId()).thenReturn(0); Mockito.when(context.getIndexSettings()).thenReturn(settings); diff --git a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseActionsTests.java b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseActionsTests.java index 57986f907ce4..37c48e5d7cd6 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseActionsTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseActionsTests.java @@ -38,11 +38,7 @@ import static org.hamcrest.Matchers.hasToString; public class RetentionLeaseActionsTests extends ESSingleNodeTestCase { public void testAddAction() { - final Settings settings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true) - .build(); + final Settings settings = indexSettings(1, 0).put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true).build(); final IndexService indexService = createIndex("index", settings); ensureGreen("index"); @@ -73,11 +69,7 @@ public class RetentionLeaseActionsTests extends ESSingleNodeTestCase { } public void testAddAlreadyExists() { - final Settings settings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true) - .build(); + final Settings settings = indexSettings(1, 0).put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true).build(); final IndexService indexService = createIndex("index", settings); ensureGreen("index"); @@ -104,11 +96,7 @@ public class RetentionLeaseActionsTests extends ESSingleNodeTestCase { } public void testRenewAction() throws InterruptedException { - final Settings settings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true) - .build(); + final Settings settings = indexSettings(1, 0).put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true).build(); final IndexService indexService = createIndex("index", settings); ensureGreen("index"); @@ -195,11 +183,7 @@ public class RetentionLeaseActionsTests extends ESSingleNodeTestCase { } public void testRenewNotFound() { - final Settings settings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true) - .build(); + final Settings settings = indexSettings(1, 0).put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true).build(); final IndexService indexService = createIndex("index", settings); ensureGreen("index"); @@ -218,11 +202,7 @@ public class RetentionLeaseActionsTests extends ESSingleNodeTestCase { } public void testRemoveAction() { - final Settings settings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true) - .build(); + final Settings settings = indexSettings(1, 0).put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true).build(); final IndexService indexService = createIndex("index", settings); ensureGreen("index"); @@ -253,11 +233,7 @@ public class RetentionLeaseActionsTests extends ESSingleNodeTestCase { } public void testRemoveNotFound() { - final Settings settings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true) - .build(); + final Settings settings = indexSettings(1, 0).put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true).build(); final IndexService indexService = createIndex("index", settings); ensureGreen("index"); @@ -274,11 +250,7 @@ public class RetentionLeaseActionsTests extends ESSingleNodeTestCase { } public void testAddUnderBlock() throws InterruptedException { - final Settings settings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true) - .build(); + final Settings settings = indexSettings(1, 0).put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true).build(); final IndexService indexService = createIndex("index", settings); ensureGreen("index"); final String id = randomAlphaOfLength(8); @@ -323,11 +295,7 @@ public class RetentionLeaseActionsTests extends ESSingleNodeTestCase { } public void testRenewUnderBlock() throws InterruptedException { - final Settings settings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true) - .build(); + final Settings settings = indexSettings(1, 0).put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true).build(); final IndexService indexService = createIndex("index", settings); ensureGreen("index"); final String id = randomAlphaOfLength(8); @@ -429,11 +397,7 @@ public class RetentionLeaseActionsTests extends ESSingleNodeTestCase { } public void testRemoveUnderBlock() throws InterruptedException { - final Settings settings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true) - .build(); + final Settings settings = indexSettings(1, 0).put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true).build(); final IndexService indexService = createIndex("index", settings); ensureGreen("index"); final String id = randomAlphaOfLength(8); diff --git a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseStatsTests.java b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseStatsTests.java index 8a608e3c796b..ed4606f3b1fb 100644 --- a/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseStatsTests.java +++ b/server/src/test/java/org/elasticsearch/index/seqno/RetentionLeaseStatsTests.java @@ -28,11 +28,7 @@ import static org.hamcrest.Matchers.equalTo; public class RetentionLeaseStatsTests extends ESSingleNodeTestCase { public void testRetentionLeaseStats() throws InterruptedException { - final Settings settings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true) - .build(); + final Settings settings = indexSettings(1, 0).put(IndexSettings.INDEX_SOFT_DELETES_SETTING.getKey(), true).build(); createIndex("index", settings); ensureGreen("index"); final IndexShard primary = node().injector() diff --git a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java index 592dc23efe52..2040f4098790 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/IndexShardTests.java @@ -1176,11 +1176,7 @@ public class IndexShardTests extends IndexShardTestCase { ShardRoutingState.INITIALIZING, RecoverySource.EmptyStoreRecoverySource.INSTANCE ); - final Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 2) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .build(); + final Settings settings = indexSettings(Version.CURRENT, 1, 2).build(); final IndexMetadata.Builder indexMetadata = IndexMetadata.builder(shardRouting.getIndexName()).settings(settings).primaryTerm(0, 1); final AtomicBoolean synced = new AtomicBoolean(); final IndexShard primaryShard = newShard( @@ -1241,12 +1237,7 @@ public class IndexShardTests extends IndexShardTestCase { public void testClosedIndicesSkipSyncGlobalCheckpoint() throws Exception { ShardId shardId = new ShardId("index", "_na_", 0); IndexMetadata.Builder indexMetadata = IndexMetadata.builder("index") - .settings( - Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 2) - ) + .settings(indexSettings(Version.CURRENT, 1, 2)) .state(IndexMetadata.State.CLOSE) .primaryTerm(0, 1); ShardRouting shardRouting = TestShardRouting.newShardRouting( @@ -1594,11 +1585,7 @@ public class IndexShardTests extends IndexShardTestCase { final NodeEnvironment.DataPath dataPath = new NodeEnvironment.DataPath(createTempDir()); ShardPath shardPath = new ShardPath(false, dataPath.resolve(shardId), dataPath.resolve(shardId), shardId); - Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .build(); + Settings settings = indexSettings(Version.CURRENT, 1, 0).build(); IndexMetadata metadata = IndexMetadata.builder(shardRouting.getIndexName()).settings(settings).primaryTerm(0, 1).build(); // Override two Directory methods to make them fail at our will @@ -2657,11 +2644,7 @@ public class IndexShardTests extends IndexShardTestCase { public void testReaderWrapperWorksWithGlobalOrdinals() throws IOException { CheckedFunction wrapper = reader -> new FieldMaskingReader("foo", reader); - Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .build(); + Settings settings = indexSettings(Version.CURRENT, 1, 0).build(); IndexMetadata metadata = IndexMetadata.builder("test").putMapping(""" { "properties": { "foo": { "type": "text", "fielddata": true }}}""").settings(settings).primaryTerm(0, 1).build(); IndexShard shard = newShard(new ShardId(metadata.getIndex(), 0), true, "n1", metadata, wrapper); @@ -2788,11 +2771,7 @@ public class IndexShardTests extends IndexShardTestCase { } public void testTranslogRecoverySyncsTranslog() throws IOException { - Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .build(); + Settings settings = indexSettings(Version.CURRENT, 1, 1).build(); IndexMetadata metadata = IndexMetadata.builder("test").putMapping(""" { "properties": { "foo": { "type": "text"}}}""").settings(settings).primaryTerm(0, 1).build(); IndexShard primary = newShard(new ShardId(metadata.getIndex(), 0), true, "n1", metadata, null); @@ -2830,11 +2809,7 @@ public class IndexShardTests extends IndexShardTestCase { } public void testRecoverFromTranslog() throws IOException { - Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .build(); + Settings settings = indexSettings(Version.CURRENT, 1, 1).build(); IndexMetadata metadata = IndexMetadata.builder("test") .putMapping(""" { "properties": { "foo": { "type": "text"}}}""") @@ -2918,11 +2893,7 @@ public class IndexShardTests extends IndexShardTestCase { } public void testShardActiveDuringPeerRecovery() throws IOException { - Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .build(); + Settings settings = indexSettings(Version.CURRENT, 1, 1).build(); IndexMetadata metadata = IndexMetadata.builder("test").putMapping(""" { "properties": { "foo": { "type": "text"}}}""").settings(settings).primaryTerm(0, 1).build(); IndexShard primary = newShard(new ShardId(metadata.getIndex(), 0), true, "n1", metadata, null); @@ -2965,11 +2936,7 @@ public class IndexShardTests extends IndexShardTestCase { } public void testRefreshListenersDuringPeerRecovery() throws IOException { - Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .build(); + Settings settings = indexSettings(Version.CURRENT, 1, 1).build(); IndexMetadata metadata = IndexMetadata.builder("test").putMapping(""" { "properties": { "foo": { "type": "text"}}}""").settings(settings).primaryTerm(0, 1).build(); IndexShard primary = newShard(new ShardId(metadata.getIndex(), 0), true, "n1", metadata, null); @@ -3038,11 +3005,7 @@ public class IndexShardTests extends IndexShardTestCase { } public void testRecoverFromLocalShard() throws IOException { - Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .build(); + Settings settings = indexSettings(Version.CURRENT, 1, 1).build(); IndexMetadata metadata = IndexMetadata.builder("source") .putMapping("{ \"properties\": { \"foo\": { \"type\": \"text\"}}}") .settings(settings) @@ -3707,11 +3670,7 @@ public class IndexShardTests extends IndexShardTestCase { } public void testIsSearchIdle() throws Exception { - Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .build(); + Settings settings = indexSettings(Version.CURRENT, 1, 1).build(); IndexMetadata metadata = IndexMetadata.builder("test").putMapping(""" { "properties": { "foo": { "type": "text"}}}""").settings(settings).primaryTerm(0, 1).build(); IndexShard primary = newShard(new ShardId(metadata.getIndex(), 0), true, "n1", metadata, null); @@ -3754,11 +3713,7 @@ public class IndexShardTests extends IndexShardTestCase { } public void testScheduledRefresh() throws Exception { - Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .build(); + Settings settings = indexSettings(Version.CURRENT, 1, 1).build(); IndexMetadata metadata = IndexMetadata.builder("test").putMapping(""" { "properties": { "foo": { "type": "text"}}}""").settings(settings).primaryTerm(0, 1).build(); IndexShard primary = newShard(new ShardId(metadata.getIndex(), 0), true, "n1", metadata, null); @@ -3825,11 +3780,7 @@ public class IndexShardTests extends IndexShardTestCase { } public void testRefreshIsNeededWithRefreshListeners() throws IOException, InterruptedException { - Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .build(); + Settings settings = indexSettings(Version.CURRENT, 1, 1).build(); IndexMetadata metadata = IndexMetadata.builder("test").putMapping(""" { "properties": { "foo": { "type": "text"}}}""").settings(settings).primaryTerm(0, 1).build(); IndexShard primary = newShard(new ShardId(metadata.getIndex(), 0), true, "n1", metadata, null); @@ -4390,11 +4341,7 @@ public class IndexShardTests extends IndexShardTestCase { } public void testTypelessGet() throws IOException { - Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .build(); + Settings settings = indexSettings(Version.CURRENT, 1, 1).build(); IndexMetadata metadata = IndexMetadata.builder("index") .putMapping("{ \"properties\": { \"foo\": { \"type\": \"text\"}}}") .settings(settings) diff --git a/server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java b/server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java index 68666b409563..19d03086c463 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/RemoveCorruptedShardDataCommandTests.java @@ -122,11 +122,7 @@ public class RemoveCorruptedShardDataCommandTests extends IndexShardTestCase { Files.createDirectories(dataPath); } - final Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(MergePolicyConfig.INDEX_MERGE_ENABLED, false) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) + final Settings settings = indexSettings(Version.CURRENT, 1, 0).put(MergePolicyConfig.INDEX_MERGE_ENABLED, false) .put(IndexMetadata.SETTING_INDEX_UUID, shardId.getIndex().getUUID()) .build(); diff --git a/server/src/test/java/org/elasticsearch/index/shard/ShardGetServiceTests.java b/server/src/test/java/org/elasticsearch/index/shard/ShardGetServiceTests.java index db25e368704d..bc4a345084e4 100644 --- a/server/src/test/java/org/elasticsearch/index/shard/ShardGetServiceTests.java +++ b/server/src/test/java/org/elasticsearch/index/shard/ShardGetServiceTests.java @@ -32,12 +32,7 @@ import static org.hamcrest.Matchers.equalTo; public class ShardGetServiceTests extends IndexShardTestCase { public void testGetForUpdate() throws IOException { - Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - - .build(); + Settings settings = indexSettings(Version.CURRENT, 1, 1).build(); IndexMetadata metadata = IndexMetadata.builder("test").putMapping(""" { "properties": { "foo": { "type": "text"}}}""").settings(settings).primaryTerm(0, 1).build(); IndexShard primary = newShard(new ShardId(metadata.getIndex(), 0), true, "n1", metadata, null); @@ -126,12 +121,6 @@ public class ShardGetServiceTests extends IndexShardTestCase { Object expectedFooVal, boolean sourceOnlyFetchCreatesInMemoryReader ) throws IOException { - Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .build(); - IndexMetadata metadata = IndexMetadata.builder("test").putMapping(Strings.format(""" { "properties": { @@ -143,7 +132,7 @@ public class ShardGetServiceTests extends IndexShardTestCase { }, "_source": { %s } } - }""", fieldType, fieldType, sourceOptions)).settings(settings).primaryTerm(0, 1).build(); + }""", fieldType, fieldType, sourceOptions)).settings(indexSettings(Version.CURRENT, 1, 1)).primaryTerm(0, 1).build(); IndexShard primary = newShard(new ShardId(metadata.getIndex(), 0), true, "n1", metadata, EngineTestCase.randomReaderWrapper()); recoverShardFromStore(primary); LongSupplier translogInMemorySegmentCount = ((InternalEngine) primary.getEngine()).translogInMemorySegmentsCount::get; @@ -208,13 +197,8 @@ public class ShardGetServiceTests extends IndexShardTestCase { } public void testTypelessGetForUpdate() throws IOException { - Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .build(); IndexMetadata metadata = IndexMetadata.builder("index").putMapping(""" - { "properties": { "foo": { "type": "text"}}}""").settings(settings).primaryTerm(0, 1).build(); + { "properties": { "foo": { "type": "text"}}}""").settings(indexSettings(Version.CURRENT, 1, 1)).primaryTerm(0, 1).build(); IndexShard shard = newShard(new ShardId(metadata.getIndex(), 0), true, "n1", metadata, null); recoverShardFromStore(shard); Engine.IndexResult indexResult = indexDoc(shard, "some_type", "0", "{\"foo\" : \"bar\"}"); diff --git a/server/src/test/java/org/elasticsearch/indices/IndicesServiceCloseTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesServiceCloseTests.java index a028e48ee0b0..8fbd9e881f69 100644 --- a/server/src/test/java/org/elasticsearch/indices/IndicesServiceCloseTests.java +++ b/server/src/test/java/org/elasticsearch/indices/IndicesServiceCloseTests.java @@ -42,8 +42,6 @@ import java.util.Collections; import java.util.concurrent.TimeUnit; import static org.elasticsearch.cluster.coordination.ClusterBootstrapService.INITIAL_MASTER_NODES_SETTING; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_REPLICAS; -import static org.elasticsearch.cluster.metadata.IndexMetadata.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.discovery.SettingsBasedSeedHostsProvider.DISCOVERY_SEED_HOSTS_SETTING; import static org.elasticsearch.test.NodeRoles.dataNode; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; @@ -203,12 +201,7 @@ public class IndicesServiceCloseTests extends ESTestCase { .admin() .indices() .prepareCreate("test") - .setSettings( - Settings.builder() - .put(SETTING_NUMBER_OF_SHARDS, 1) - .put(SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexModule.INDEX_QUERY_CACHE_EVERYTHING_SETTING.getKey(), true) - ) + .setSettings(indexSettings(1, 0).put(IndexModule.INDEX_QUERY_CACHE_EVERYTHING_SETTING.getKey(), true)) ); node.client().prepareIndex("test").setId("1").setSource(Collections.singletonMap("foo", 3L)).get(); ElasticsearchAssertions.assertAllSuccessful(node.client().admin().indices().prepareRefresh("test").get()); @@ -245,12 +238,7 @@ public class IndicesServiceCloseTests extends ESTestCase { .admin() .indices() .prepareCreate("test") - .setSettings( - Settings.builder() - .put(SETTING_NUMBER_OF_SHARDS, 1) - .put(SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexModule.INDEX_QUERY_CACHE_EVERYTHING_SETTING.getKey(), true) - ) + .setSettings(indexSettings(1, 0).put(IndexModule.INDEX_QUERY_CACHE_EVERYTHING_SETTING.getKey(), true)) ); node.client().prepareIndex("test").setId("1").setSource(Collections.singletonMap("foo", 3L)).get(); ElasticsearchAssertions.assertAllSuccessful(node.client().admin().indices().prepareRefresh("test").get()); diff --git a/server/src/test/java/org/elasticsearch/indices/SystemIndexManagerTests.java b/server/src/test/java/org/elasticsearch/indices/SystemIndexManagerTests.java index 8694a5680588..0b9cfb9d094d 100644 --- a/server/src/test/java/org/elasticsearch/indices/SystemIndexManagerTests.java +++ b/server/src/test/java/org/elasticsearch/indices/SystemIndexManagerTests.java @@ -400,12 +400,7 @@ public class SystemIndexManagerTests extends ESTestCase { } private static Settings getSettings() { - return Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.INDEX_FORMAT_SETTING.getKey(), 6) - .build(); + return indexSettings(Version.CURRENT, 1, 0).put(IndexMetadata.INDEX_FORMAT_SETTING.getKey(), 6).build(); } private static XContentBuilder getMappings() { diff --git a/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java b/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java index c09213145430..60f933c6337d 100644 --- a/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java +++ b/server/src/test/java/org/elasticsearch/indices/recovery/RecoverySourceHandlerTests.java @@ -712,11 +712,10 @@ public class RecoverySourceHandlerTests extends MapperServiceTestCase { final IndexMetadata.Builder indexMetadata = IndexMetadata.builder("test") .settings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, between(0, 5)) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, between(1, 5)) - .put(IndexMetadata.SETTING_VERSION_CREATED, VersionUtils.randomVersion(random())) - .put(IndexMetadata.SETTING_INDEX_UUID, UUIDs.randomBase64UUID(random())) + indexSettings(VersionUtils.randomVersion(random()), between(1, 5), between(0, 5)).put( + IndexMetadata.SETTING_INDEX_UUID, + UUIDs.randomBase64UUID(random()) + ) ); if (randomBoolean()) { indexMetadata.state(IndexMetadata.State.CLOSE); @@ -1144,13 +1143,7 @@ public class RecoverySourceHandlerTests extends MapperServiceTestCase { writer.close(); when(shard.state()).thenReturn(IndexShardState.STARTED); final var indexMetadata = IndexMetadata.builder(IndexMetadata.INDEX_UUID_NA_VALUE) - .settings( - Settings.builder() - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_INDEX_VERSION_CREATED.getKey(), Version.CURRENT) - .build() - ) + .settings(indexSettings(Version.CURRENT, 1, 0)) .build(); IndexSettings indexSettings = new IndexSettings(indexMetadata, Settings.EMPTY); when(shard.indexSettings()).thenReturn(indexSettings); diff --git a/server/src/test/java/org/elasticsearch/repositories/blobstore/ShardSnapshotTaskRunnerTests.java b/server/src/test/java/org/elasticsearch/repositories/blobstore/ShardSnapshotTaskRunnerTests.java index f0aa256ff031..eada289a0215 100644 --- a/server/src/test/java/org/elasticsearch/repositories/blobstore/ShardSnapshotTaskRunnerTests.java +++ b/server/src/test/java/org/elasticsearch/repositories/blobstore/ShardSnapshotTaskRunnerTests.java @@ -111,13 +111,8 @@ public class ShardSnapshotTaskRunnerTests extends ESTestCase { public static SnapshotShardContext dummyContext(final SnapshotId snapshotId, final long startTime) { IndexId indexId = new IndexId(randomAlphaOfLength(10), UUIDs.randomBase64UUID()); ShardId shardId = new ShardId(indexId.getName(), indexId.getId(), 1); - Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .build(); IndexSettings indexSettings = new IndexSettings( - IndexMetadata.builder(indexId.getName()).settings(settings).build(), + IndexMetadata.builder(indexId.getName()).settings(indexSettings(Version.CURRENT, 1, 0)).build(), Settings.EMPTY ); Store dummyStore = new Store(shardId, indexSettings, new ByteBuffersDirectory(), new DummyShardLock(shardId)); diff --git a/server/src/test/java/org/elasticsearch/search/DefaultSearchContextTests.java b/server/src/test/java/org/elasticsearch/search/DefaultSearchContextTests.java index 3a808d7fb38b..c49a3c18b6ad 100644 --- a/server/src/test/java/org/elasticsearch/search/DefaultSearchContextTests.java +++ b/server/src/test/java/org/elasticsearch/search/DefaultSearchContextTests.java @@ -81,13 +81,9 @@ public class DefaultSearchContextTests extends ESTestCase { int maxResultWindow = randomIntBetween(50, 100); int maxRescoreWindow = randomIntBetween(50, 100); int maxSlicesPerScroll = randomIntBetween(50, 100); - Settings settings = Settings.builder() - .put("index.max_result_window", maxResultWindow) + Settings settings = indexSettings(Version.CURRENT, 2, 1).put("index.max_result_window", maxResultWindow) .put("index.max_slices_per_scroll", maxSlicesPerScroll) .put("index.max_rescore_window", maxRescoreWindow) - .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 2) .build(); IndexService indexService = mock(IndexService.class); diff --git a/server/src/test/java/org/elasticsearch/search/fetch/subphase/FieldFetcherTests.java b/server/src/test/java/org/elasticsearch/search/fetch/subphase/FieldFetcherTests.java index 678b33f60be1..d6fbf27d39e0 100644 --- a/server/src/test/java/org/elasticsearch/search/fetch/subphase/FieldFetcherTests.java +++ b/server/src/test/java/org/elasticsearch/search/fetch/subphase/FieldFetcherTests.java @@ -1257,12 +1257,7 @@ public class FieldFetcherTests extends MapperServiceTestCase { MapperService mapperService, BiFunction> indexFieldDataLookup ) { - Settings settings = Settings.builder() - .put("index.version.created", Version.CURRENT) - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put(IndexMetadata.SETTING_INDEX_UUID, "uuid") - .build(); + Settings settings = indexSettings(Version.CURRENT, 1, 0).put(IndexMetadata.SETTING_INDEX_UUID, "uuid").build(); IndexMetadata indexMetadata = new IndexMetadata.Builder("test").settings(settings).build(); IndexSettings indexSettings = new IndexSettings(indexMetadata, settings); return new SearchExecutionContext( diff --git a/server/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java b/server/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java index 4bf7b4d76691..39024bf7cc59 100644 --- a/server/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java +++ b/server/src/test/java/org/elasticsearch/search/slice/SliceBuilderTests.java @@ -90,12 +90,7 @@ public class SliceBuilderTests extends ESTestCase { } private IndexSettings createIndexSettings(Version indexVersionCreated) { - Settings settings = Settings.builder() - .put(IndexMetadata.SETTING_VERSION_CREATED, indexVersionCreated) - .put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1) - .put(IndexMetadata.SETTING_NUMBER_OF_REPLICAS, 0) - .build(); - IndexMetadata indexState = IndexMetadata.builder("index").settings(settings).build(); + IndexMetadata indexState = IndexMetadata.builder("index").settings(indexSettings(indexVersionCreated, 1, 0)).build(); return new IndexSettings(indexState, Settings.EMPTY); } diff --git a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java index bd89fb095c90..5a8b9c598713 100644 --- a/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/index/mapper/MapperServiceTestCase.java @@ -227,12 +227,7 @@ public abstract class MapperServiceTestCase extends ESTestCase { } protected static IndexSettings createIndexSettings(Version version, Settings settings) { - settings = Settings.builder() - .put("index.number_of_replicas", 0) - .put("index.number_of_shards", 1) - .put(settings) - .put("index.version.created", version) - .build(); + settings = indexSettings(1, 0).put(settings).put("index.version.created", version).build(); IndexMetadata meta = IndexMetadata.builder("index").settings(settings).build(); return new IndexSettings(meta, settings); } diff --git a/x-pack/plugin/ccr/qa/security/src/test/java/org/elasticsearch/xpack/ccr/FollowIndexSecurityIT.java b/x-pack/plugin/ccr/qa/security/src/test/java/org/elasticsearch/xpack/ccr/FollowIndexSecurityIT.java index 8803a0159cc8..e6c68b058037 100644 --- a/x-pack/plugin/ccr/qa/security/src/test/java/org/elasticsearch/xpack/ccr/FollowIndexSecurityIT.java +++ b/x-pack/plugin/ccr/qa/security/src/test/java/org/elasticsearch/xpack/ccr/FollowIndexSecurityIT.java @@ -206,8 +206,7 @@ public class FollowIndexSecurityIT extends ESCCRRestTestCase { final String forgetFollower = "forget-follower"; if ("leader".equals(targetCluster)) { logger.info("running against leader cluster"); - final Settings indexSettings = Settings.builder().put("index.number_of_replicas", 0).put("index.number_of_shards", 1).build(); - createIndex(adminClient(), forgetLeader, indexSettings); + createIndex(adminClient(), forgetLeader, indexSettings(1, 0).build()); } else { logger.info("running against follower cluster"); followIndex(client(), "leader_cluster", forgetLeader, forgetFollower); @@ -256,11 +255,7 @@ public class FollowIndexSecurityIT extends ESCCRRestTestCase { final String cleanFollower = "clean-follower"; if ("leader".equals(targetCluster)) { logger.info("running against leader cluster"); - final Settings indexSettings = Settings.builder() - .put("index.number_of_replicas", 0) - .put("index.number_of_shards", 1) - .put("index.soft_deletes.enabled", true) - .build(); + final Settings indexSettings = indexSettings(1, 0).put("index.soft_deletes.enabled", true).build(); createIndex(adminClient(), cleanLeader, indexSettings); } else { logger.info("running against follower cluster"); diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardChangesActionTests.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardChangesActionTests.java index 6d9a1d8ef35a..06a3a39b0850 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardChangesActionTests.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardChangesActionTests.java @@ -47,8 +47,7 @@ public class ShardChangesActionTests extends ESSingleNodeTestCase { } public void testGetOperations() throws Exception { - final Settings settings = Settings.builder().put("index.number_of_shards", 1).put("index.number_of_replicas", 0).build(); - final IndexService indexService = createIndex("index", settings); + final IndexService indexService = createIndex("index", indexSettings(1, 0).build()); final int numWrites = randomIntBetween(10, 4096); for (int i = 0; i < numWrites; i++) { @@ -166,8 +165,7 @@ public class ShardChangesActionTests extends ESSingleNodeTestCase { } public void testGetOperationsExceedByteLimit() throws Exception { - final Settings settings = Settings.builder().put("index.number_of_shards", 1).put("index.number_of_replicas", 0).build(); - final IndexService indexService = createIndex("index", settings); + final IndexService indexService = createIndex("index", indexSettings(1, 0).build()); final long numWrites = 32; for (int i = 0; i < numWrites; i++) { @@ -195,8 +193,7 @@ public class ShardChangesActionTests extends ESSingleNodeTestCase { } public void testGetOperationsAlwaysReturnAtLeastOneOp() throws Exception { - final Settings settings = Settings.builder().put("index.number_of_shards", 1).put("index.number_of_replicas", 0).build(); - final IndexService indexService = createIndex("index", settings); + final IndexService indexService = createIndex("index", indexSettings(1, 0).build()); client().prepareIndex("index").setId("0").setSource("{}", XContentType.JSON).get(); diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardChangesTests.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardChangesTests.java index 299e8cfbd081..fa68ce263b9a 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardChangesTests.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/action/ShardChangesTests.java @@ -106,10 +106,7 @@ public class ShardChangesTests extends ESSingleNodeTestCase { .indices() .prepareCreate("index") .setSettings( - Settings.builder() - .put("index.soft_deletes.retention.operations", 0) - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) + indexSettings(1, 0).put("index.soft_deletes.retention.operations", 0) .put(IndexService.RETENTION_LEASE_SYNC_INTERVAL_SETTING.getKey(), "200ms") ) .get(); diff --git a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngineTests.java b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngineTests.java index 3dab6a8b221c..476db636ccc2 100644 --- a/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngineTests.java +++ b/x-pack/plugin/ccr/src/test/java/org/elasticsearch/xpack/ccr/index/engine/FollowingEngineTests.java @@ -94,11 +94,8 @@ public class FollowingEngineTests extends ESTestCase { super.tearDown(); } - public void testFollowingEngineRejectsNonFollowingIndex() throws IOException { - final Settings.Builder builder = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.version.created", Version.CURRENT); + public void testFollowingEngineRejectsNonFollowingIndex() { + final Settings.Builder builder = indexSettings(Version.CURRENT, 1, 0); if (randomBoolean()) { builder.put("index.xpack.ccr.following_index", false); } @@ -126,12 +123,7 @@ public class FollowingEngineTests extends ESTestCase { * ensures that these semantics are maintained. */ public void testOutOfOrderDocuments() throws IOException { - final Settings settings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.version.created", Version.CURRENT) - .put("index.xpack.ccr.following_index", true) - .build(); + final Settings settings = indexSettings(Version.CURRENT, 1, 0).put("index.xpack.ccr.following_index", true).build(); final IndexMetadata indexMetadata = IndexMetadata.builder(index.getName()).settings(settings).build(); final IndexSettings indexSettings = new IndexSettings(indexMetadata, settings); try (Store store = createStore(shardId, indexSettings, newDirectory())) { @@ -150,12 +142,7 @@ public class FollowingEngineTests extends ESTestCase { final Engine.Operation.Origin origin, final CheckedBiConsumer consumer ) throws IOException { - final Settings settings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.version.created", Version.CURRENT) - .put("index.xpack.ccr.following_index", true) - .build(); + final Settings settings = indexSettings(Version.CURRENT, 1, 0).put("index.xpack.ccr.following_index", true).build(); final IndexMetadata indexMetadata = IndexMetadata.builder(index.getName()).settings(settings).build(); final IndexSettings indexSettings = new IndexSettings(indexMetadata, settings); try (Store store = createStore(shardId, indexSettings, newDirectory())) { @@ -181,12 +168,7 @@ public class FollowingEngineTests extends ESTestCase { final Engine.Operation.Origin origin, final CheckedBiConsumer consumer ) throws IOException { - final Settings settings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.version.created", Version.CURRENT) - .put("index.xpack.ccr.following_index", true) - .build(); + final Settings settings = indexSettings(Version.CURRENT, 1, 0).put("index.xpack.ccr.following_index", true).build(); final IndexMetadata indexMetadata = IndexMetadata.builder(index.getName()).settings(settings).build(); final IndexSettings indexSettings = new IndexSettings(indexMetadata, settings); try (Store store = createStore(shardId, indexSettings, newDirectory())) { @@ -212,12 +194,7 @@ public class FollowingEngineTests extends ESTestCase { } public void testDoNotFillSeqNoGaps() throws Exception { - final Settings settings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.version.created", Version.CURRENT) - .put("index.xpack.ccr.following_index", true) - .build(); + final Settings settings = indexSettings(Version.CURRENT, 1, 0).put("index.xpack.ccr.following_index", true).build(); final IndexMetadata indexMetadata = IndexMetadata.builder(index.getName()).settings(settings).build(); final IndexSettings indexSettings = new IndexSettings(indexMetadata, settings); try (Store store = createStore(shardId, indexSettings, newDirectory())) { @@ -512,12 +489,7 @@ public class FollowingEngineTests extends ESTestCase { public void testConcurrentIndexOperationsWithDeletesCanAdvanceMaxSeqNoOfUpdates() throws Exception { // See #72527 for more details - Settings followerSettings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.version.created", Version.CURRENT) - .put("index.xpack.ccr.following_index", true) - .build(); + Settings followerSettings = indexSettings(Version.CURRENT, 1, 0).put("index.xpack.ccr.following_index", true).build(); IndexMetadata followerIndexMetadata = IndexMetadata.builder(index.getName()).settings(followerSettings).build(); IndexSettings followerIndexSettings = new IndexSettings(followerIndexMetadata, Settings.EMPTY); @@ -624,11 +596,7 @@ public class FollowingEngineTests extends ESTestCase { } }; - Settings leaderSettings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.version.created", Version.CURRENT) - .build(); + Settings leaderSettings = indexSettings(Version.CURRENT, 1, 0).build(); IndexMetadata leaderIndexMetadata = IndexMetadata.builder(index.getName()).settings(leaderSettings).build(); IndexSettings leaderIndexSettings = new IndexSettings(leaderIndexMetadata, leaderSettings); try (Store leaderStore = createStore(shardId, leaderIndexSettings, newDirectory())) { @@ -644,12 +612,7 @@ public class FollowingEngineTests extends ESTestCase { ); try (InternalEngine leaderEngine = new InternalEngine(leaderConfig)) { leaderEngine.skipTranslogRecovery(); - Settings followerSettings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.version.created", Version.CURRENT) - .put("index.xpack.ccr.following_index", true) - .build(); + Settings followerSettings = indexSettings(Version.CURRENT, 1, 0).put("index.xpack.ccr.following_index", true).build(); IndexMetadata followerIndexMetadata = IndexMetadata.builder(index.getName()).settings(followerSettings).build(); IndexSettings followerIndexSettings = new IndexSettings(followerIndexMetadata, leaderSettings); try (Store followerStore = createStore(shardId, followerIndexSettings, newDirectory())) { @@ -725,11 +688,7 @@ public class FollowingEngineTests extends ESTestCase { } public void testProcessOnceOnPrimary() throws Exception { - final Settings.Builder settingsBuilder = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.version.created", Version.CURRENT) - .put("index.xpack.ccr.following_index", true); + final Settings.Builder settingsBuilder = indexSettings(Version.CURRENT, 1, 0).put("index.xpack.ccr.following_index", true); switch (indexMode) { case STANDARD: break; @@ -859,12 +818,7 @@ public class FollowingEngineTests extends ESTestCase { } public void testMaxSeqNoInCommitUserData() throws Exception { - final Settings settings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.version.created", Version.CURRENT) - .put("index.xpack.ccr.following_index", true) - .build(); + final Settings settings = indexSettings(Version.CURRENT, 1, 0).put("index.xpack.ccr.following_index", true).build(); final IndexMetadata indexMetadata = IndexMetadata.builder(index.getName()).settings(settings).build(); final IndexSettings indexSettings = new IndexSettings(indexMetadata, settings); try (Store store = createStore(shardId, indexSettings, newDirectory())) { diff --git a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierAllocationDeciderIT.java b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierAllocationDeciderIT.java index 5a43891af647..41933caa9c3e 100644 --- a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierAllocationDeciderIT.java +++ b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/cluster/routing/allocation/DataTierAllocationDeciderIT.java @@ -389,21 +389,11 @@ public class DataTierAllocationDeciderIT extends ESIntegTestCase { client().admin() .indices() .prepareCreate(index) - .setSettings( - Settings.builder() - .put(DataTier.TIER_PREFERENCE, "data_hot") - .put("index.number_of_shards", 2) - .put("index.number_of_replicas", 0) - ) + .setSettings(indexSettings(2, 0).put(DataTier.TIER_PREFERENCE, "data_hot")) .setWaitForActiveShards(0) .get(); - client().admin() - .indices() - .prepareCreate(index + "2") - .setSettings(Settings.builder().put("index.number_of_shards", 1).put("index.number_of_replicas", 1)) - .setWaitForActiveShards(0) - .get(); + client().admin().indices().prepareCreate(index + "2").setSettings(indexSettings(1, 1)).setWaitForActiveShards(0).get(); ensureGreen(); client().prepareIndex(index).setSource("foo", "bar").get(); @@ -436,26 +426,12 @@ public class DataTierAllocationDeciderIT extends ESIntegTestCase { IllegalArgumentException e = expectThrows( IllegalArgumentException.class, - () -> createIndex( - index, - Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put(DataTier.TIER_PREFERENCE, DataTier.DATA_FROZEN) - .build() - ) + () -> createIndex(index, indexSettings(1, 0).put(DataTier.TIER_PREFERENCE, DataTier.DATA_FROZEN).build()) ); assertThat(e.getMessage(), equalTo("[data_frozen] tier can only be used for partial searchable snapshots")); String initialTier = randomFrom(DataTier.DATA_HOT, DataTier.DATA_WARM, DataTier.DATA_COLD); - createIndex( - index, - Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put(DataTier.TIER_PREFERENCE, initialTier) - .build() - ); + createIndex(index, indexSettings(1, 0).put(DataTier.TIER_PREFERENCE, initialTier).build()); IllegalArgumentException e2 = expectThrows(IllegalArgumentException.class, () -> updatePreference(DataTier.DATA_FROZEN)); assertThat(e2.getMessage(), equalTo("[data_frozen] tier can only be used for partial searchable snapshots")); diff --git a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/rest/action/ReloadSynonymAnalyzerIT.java b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/rest/action/ReloadSynonymAnalyzerIT.java index dc27336e8d2b..f219792095a9 100644 --- a/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/rest/action/ReloadSynonymAnalyzerIT.java +++ b/x-pack/plugin/core/src/internalClusterTest/java/org/elasticsearch/xpack/core/rest/action/ReloadSynonymAnalyzerIT.java @@ -76,10 +76,7 @@ public class ReloadSynonymAnalyzerIT extends ESIntegTestCase { .indices() .prepareCreate("test") .setSettings( - Settings.builder() - .put("index.number_of_shards", cluster().numDataNodes() * 2) - .put("index.number_of_replicas", 1) - .put("analysis.analyzer.my_synonym_analyzer.tokenizer", "standard") + indexSettings(cluster().numDataNodes() * 2, 1).put("analysis.analyzer.my_synonym_analyzer.tokenizer", "standard") .put("analysis.analyzer.my_synonym_analyzer.filter", "my_synonym_filter") .put("analysis.filter.my_synonym_filter.type", "synonym") .put("analysis.filter.my_synonym_filter.updateable", "true") diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/action/ReloadAnalyzerTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/action/ReloadAnalyzerTests.java index d22e8ce366ee..69fdb2b3468b 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/action/ReloadAnalyzerTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/action/ReloadAnalyzerTests.java @@ -12,7 +12,6 @@ import org.elasticsearch.action.admin.indices.analyze.AnalyzeAction.AnalyzeToken import org.elasticsearch.action.admin.indices.analyze.AnalyzeAction.Response; import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.analysis.common.CommonAnalysisPlugin; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.index.mapper.MapperException; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.plugins.Plugin; @@ -56,10 +55,7 @@ public class ReloadAnalyzerTests extends ESSingleNodeTestCase { .indices() .prepareCreate(indexName) .setSettings( - Settings.builder() - .put("index.number_of_shards", 5) - .put("index.number_of_replicas", 0) - .put("analysis.analyzer." + synonymAnalyzerName + ".tokenizer", "standard") + indexSettings(5, 0).put("analysis.analyzer." + synonymAnalyzerName + ".tokenizer", "standard") .putList("analysis.analyzer." + synonymAnalyzerName + ".filter", "lowercase", "synonym_filter") .put("analysis.analyzer." + synonymGraphAnalyzerName + ".tokenizer", "standard") .putList("analysis.analyzer." + synonymGraphAnalyzerName + ".filter", "lowercase", "synonym_graph_filter") @@ -137,10 +133,7 @@ public class ReloadAnalyzerTests extends ESSingleNodeTestCase { .indices() .prepareCreate(indexName) .setSettings( - Settings.builder() - .put("index.number_of_shards", 5) - .put("index.number_of_replicas", 0) - .put("analysis.analyzer." + synonymAnalyzerName + ".tokenizer", "whitespace") + indexSettings(5, 0).put("analysis.analyzer." + synonymAnalyzerName + ".tokenizer", "whitespace") .putList("analysis.analyzer." + synonymAnalyzerName + ".filter", "my_multiplexer") .put("analysis.filter.synonym_filter.type", "synonym") .put("analysis.filter.synonym_filter.updateable", "true") @@ -223,10 +216,7 @@ public class ReloadAnalyzerTests extends ESSingleNodeTestCase { .indices() .prepareCreate(indexName) .setSettings( - Settings.builder() - .put("index.number_of_shards", 5) - .put("index.number_of_replicas", 0) - .put("analysis.analyzer." + analyzerName + ".tokenizer", "standard") + indexSettings(5, 0).put("analysis.analyzer." + analyzerName + ".tokenizer", "standard") .putList("analysis.analyzer." + analyzerName + ".filter", "lowercase", "synonym_filter") .put("analysis.filter.synonym_filter.type", "synonym") .put("analysis.filter.synonym_filter.updateable", "true") @@ -249,10 +239,7 @@ public class ReloadAnalyzerTests extends ESSingleNodeTestCase { .indices() .prepareCreate(indexName) .setSettings( - Settings.builder() - .put("index.number_of_shards", 5) - .put("index.number_of_replicas", 0) - .put("analysis.analyzer." + analyzerName + ".tokenizer", "whitespace") + indexSettings(5, 0).put("analysis.analyzer." + analyzerName + ".tokenizer", "whitespace") .putList("analysis.analyzer." + analyzerName + ".filter", "my_multiplexer") .put("analysis.filter.synonym_filter.type", "synonym") .put("analysis.filter.synonym_filter.updateable", "true") @@ -282,10 +269,7 @@ public class ReloadAnalyzerTests extends ESSingleNodeTestCase { .indices() .prepareCreate(indexName) .setSettings( - Settings.builder() - .put("index.number_of_shards", 5) - .put("index.number_of_replicas", 0) - .put("analysis.analyzer." + analyzerName + ".tokenizer", "whitespace") + indexSettings(5, 0).put("analysis.analyzer." + analyzerName + ".tokenizer", "whitespace") .putList("analysis.analyzer." + analyzerName + ".filter", "keyword_marker_filter", "stemmer") .put("analysis.filter.keyword_marker_filter.type", "keyword_marker") .put("analysis.filter.keyword_marker_filter.updateable", "true") diff --git a/x-pack/plugin/fleet/src/internalClusterTest/java/org/elasticsearch/xpack/fleet/action/GetGlobalCheckpointsActionIT.java b/x-pack/plugin/fleet/src/internalClusterTest/java/org/elasticsearch/xpack/fleet/action/GetGlobalCheckpointsActionIT.java index dc86fd00b768..38633eae3236 100644 --- a/x-pack/plugin/fleet/src/internalClusterTest/java/org/elasticsearch/xpack/fleet/action/GetGlobalCheckpointsActionIT.java +++ b/x-pack/plugin/fleet/src/internalClusterTest/java/org/elasticsearch/xpack/fleet/action/GetGlobalCheckpointsActionIT.java @@ -55,12 +55,10 @@ public class GetGlobalCheckpointsActionIT extends ESIntegTestCase { .indices() .prepareCreate(indexName) .setSettings( - Settings.builder() + indexSettings(shards, 1) // ESIntegTestCase randomizes durability settings. The global checkpoint only advances after a fsync, hence we // must run with REQUEST durability .put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.REQUEST) - .put("index.number_of_shards", shards) - .put("index.number_of_replicas", 1) ) .get(); @@ -108,12 +106,7 @@ public class GetGlobalCheckpointsActionIT extends ESIntegTestCase { client().admin() .indices() .prepareCreate(indexName) - .setSettings( - Settings.builder() - .put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.REQUEST) - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 1) - ) + .setSettings(indexSettings(1, 1).put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.REQUEST)) .get(); final GetGlobalCheckpointsAction.Request request = new GetGlobalCheckpointsAction.Request( @@ -155,12 +148,7 @@ public class GetGlobalCheckpointsActionIT extends ESIntegTestCase { client().admin() .indices() .prepareCreate(indexName) - .setSettings( - Settings.builder() - .put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.REQUEST) - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - ) + .setSettings(indexSettings(1, 0).put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.REQUEST)) .get(); final int totalDocuments = 30; @@ -188,12 +176,7 @@ public class GetGlobalCheckpointsActionIT extends ESIntegTestCase { client().admin() .indices() .prepareCreate(indexName) - .setSettings( - Settings.builder() - .put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.REQUEST) - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - ) + .setSettings(indexSettings(1, 0).put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.REQUEST)) .get(); final long[] incorrectArrayLength = new long[2]; @@ -220,12 +203,7 @@ public class GetGlobalCheckpointsActionIT extends ESIntegTestCase { client().admin() .indices() .prepareCreate(indexName) - .setSettings( - Settings.builder() - .put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.REQUEST) - .put("index.number_of_shards", 3) - .put("index.number_of_replicas", 0) - ) + .setSettings(indexSettings(3, 0).put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.REQUEST)) .get(); final GetGlobalCheckpointsAction.Request request = new GetGlobalCheckpointsAction.Request( @@ -290,12 +268,7 @@ public class GetGlobalCheckpointsActionIT extends ESIntegTestCase { client().admin() .indices() .prepareCreate(indexName) - .setSettings( - Settings.builder() - .put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.REQUEST) - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - ) + .setSettings(indexSettings(1, 0).put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.REQUEST)) .get(); client().prepareIndex(indexName).setId(Integer.toString(0)).setSource("{}", XContentType.JSON).get(); @@ -319,10 +292,7 @@ public class GetGlobalCheckpointsActionIT extends ESIntegTestCase { .prepareCreate("not-assigned") .setWaitForActiveShards(ActiveShardCount.NONE) .setSettings( - Settings.builder() - .put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.REQUEST) - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) + indexSettings(1, 0).put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.REQUEST) .put(IndexMetadata.INDEX_ROUTING_INCLUDE_GROUP_SETTING.getKey() + "node", "none") ) .get(); @@ -348,10 +318,7 @@ public class GetGlobalCheckpointsActionIT extends ESIntegTestCase { .prepareCreate("not-assigned") .setWaitForActiveShards(ActiveShardCount.NONE) .setSettings( - Settings.builder() - .put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.REQUEST) - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) + indexSettings(1, 0).put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.REQUEST) .put(IndexMetadata.INDEX_ROUTING_INCLUDE_GROUP_SETTING.getKey() + "node", "none") ) .get(); @@ -377,10 +344,7 @@ public class GetGlobalCheckpointsActionIT extends ESIntegTestCase { .prepareCreate(indexName) .setWaitForActiveShards(ActiveShardCount.NONE) .setSettings( - Settings.builder() - .put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.REQUEST) - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) + indexSettings(1, 0).put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.REQUEST) .put(IndexMetadata.INDEX_ROUTING_INCLUDE_GROUP_SETTING.getKey() + "node", "none") ) .get(); @@ -406,12 +370,7 @@ public class GetGlobalCheckpointsActionIT extends ESIntegTestCase { .indices() .prepareCreate(indexName) .setWaitForActiveShards(ActiveShardCount.NONE) - .setSettings( - Settings.builder() - .put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.REQUEST) - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - ) + .setSettings(indexSettings(1, 0).put(IndexSettings.INDEX_TRANSLOG_DURABILITY_SETTING.getKey(), Translog.Durability.REQUEST)) .get(); long start = System.nanoTime(); diff --git a/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexTests.java b/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexTests.java index e606646d6a8e..6ca8faad86ae 100644 --- a/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexTests.java +++ b/x-pack/plugin/frozen-indices/src/internalClusterTest/java/org/elasticsearch/index/engine/frozen/FrozenIndexTests.java @@ -522,7 +522,7 @@ public class FrozenIndexTests extends ESSingleNodeTestCase { public void testFreezeIndexIncreasesIndexSettingsVersion() { final String index = "test"; - createIndex(index, Settings.builder().put("index.number_of_shards", 1).put("index.number_of_replicas", 0).build()); + createIndex(index, indexSettings(1, 0).build()); client().prepareIndex(index).setSource("field", "value").execute().actionGet(); final long settingsVersion = client().admin() @@ -544,14 +544,7 @@ public class FrozenIndexTests extends ESSingleNodeTestCase { public void testFreezeEmptyIndexWithTranslogOps() throws Exception { final String indexName = "empty"; - createIndex( - indexName, - Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.refresh_interval", TimeValue.MINUS_ONE) - .build() - ); + createIndex(indexName, indexSettings(1, 0).put("index.refresh_interval", TimeValue.MINUS_ONE).build()); final long nbNoOps = randomIntBetween(1, 10); for (long i = 0; i < nbNoOps; i++) { diff --git a/x-pack/plugin/ilm/qa/multi-cluster/src/test/java/org/elasticsearch/xpack/ilm/CCRIndexLifecycleIT.java b/x-pack/plugin/ilm/qa/multi-cluster/src/test/java/org/elasticsearch/xpack/ilm/CCRIndexLifecycleIT.java index 0f55d296fce5..5168cd11eb17 100644 --- a/x-pack/plugin/ilm/qa/multi-cluster/src/test/java/org/elasticsearch/xpack/ilm/CCRIndexLifecycleIT.java +++ b/x-pack/plugin/ilm/qa/multi-cluster/src/test/java/org/elasticsearch/xpack/ilm/CCRIndexLifecycleIT.java @@ -56,10 +56,7 @@ public class CCRIndexLifecycleIT extends ESCCRRestTestCase { String policyName = "basic-test"; if ("leader".equals(targetCluster)) { putILMPolicy(policyName, "50GB", null, TimeValue.timeValueHours(7 * 24)); - Settings indexSettings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.lifecycle.name", policyName) + Settings indexSettings = indexSettings(1, 0).put("index.lifecycle.name", policyName) .put("index.lifecycle.rollover_alias", "logs") .build(); createIndex(indexName, indexSettings, "", "\"logs\": { }"); @@ -111,8 +108,7 @@ public class CCRIndexLifecycleIT extends ESCCRRestTestCase { public void testCCRUnfollowDuringSnapshot() throws Exception { String indexName = "unfollow-test-index"; if ("leader".equals(targetCluster)) { - Settings indexSettings = Settings.builder().put("index.number_of_shards", 2).put("index.number_of_replicas", 0).build(); - createIndex(adminClient(), indexName, indexSettings); + createIndex(adminClient(), indexName, indexSettings(2, 0).build()); ensureGreen(indexName); } else if ("follow".equals(targetCluster)) { createNewSingletonPolicy("unfollow-only", "hot", UnfollowAction.INSTANCE, TimeValue.ZERO); @@ -185,10 +181,7 @@ public class CCRIndexLifecycleIT extends ESCCRRestTestCase { // Create a policy on the leader putILMPolicy(policyName, null, 1, null); Request templateRequest = new Request("PUT", "/_index_template/my_template"); - Settings indexSettings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.lifecycle.name", policyName) + Settings indexSettings = indexSettings(1, 0).put("index.lifecycle.name", policyName) .put("index.lifecycle.rollover_alias", alias) .build(); templateRequest.setJsonEntity( @@ -300,11 +293,8 @@ public class CCRIndexLifecycleIT extends ESCCRRestTestCase { final int numberOfAliases = randomIntBetween(0, 4); if ("leader".equals(targetCluster)) { - Settings indexSettings = Settings.builder() - .put("index.number_of_shards", 3) - .put("index.number_of_replicas", 0) - .put("index.lifecycle.name", policyName) // this policy won't exist on the leader, that's fine - .build(); + // this policy won't exist on the leader, that's fine + Settings indexSettings = indexSettings(3, 0).put("index.lifecycle.name", policyName).build(); final StringBuilder aliases = new StringBuilder(); boolean first = true; for (int i = 0; i < numberOfAliases; i++) { @@ -364,11 +354,8 @@ public class CCRIndexLifecycleIT extends ESCCRRestTestCase { final String policyName = "shrink-test-policy"; if ("leader".equals(targetCluster)) { - Settings indexSettings = Settings.builder() - .put("index.number_of_shards", 3) - .put("index.number_of_replicas", 0) - .put("index.lifecycle.name", policyName) // this policy won't exist on the leader, that's fine - .build(); + // this policy won't exist on the leader, that's fine + Settings indexSettings = indexSettings(3, 0).put("index.lifecycle.name", policyName).build(); createIndex(indexName, indexSettings, "", ""); ensureGreen(indexName); } else if ("follow".equals(targetCluster)) { @@ -413,8 +400,7 @@ public class CCRIndexLifecycleIT extends ESCCRRestTestCase { // otherwise it'll proceed through shrink before we can set up the // follower putShrinkOnlyPolicy(client(), policyName); - Settings indexSettings = Settings.builder().put("index.number_of_shards", 2).put("index.number_of_replicas", 0).build(); - createIndex(indexName, indexSettings, "", ""); + createIndex(indexName, indexSettings(2, 0).build(), "", ""); ensureGreen(indexName); } else if ("follow".equals(targetCluster)) { @@ -482,10 +468,8 @@ public class CCRIndexLifecycleIT extends ESCCRRestTestCase { final String policyName = "unfollow_only_policy"; if ("leader".equals(targetCluster)) { - Settings indexSettings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.lifecycle.name", policyName) // this policy won't exist on the leader, that's fine + Settings indexSettings = indexSettings(1, 0).put("index.lifecycle.name", policyName) // this policy won't exist on the leader, + // that's fine .build(); createIndex(leaderIndex, indexSettings, "", ""); ensureGreen(leaderIndex); diff --git a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/IndexLifecycleRunnerTests.java b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/IndexLifecycleRunnerTests.java index e9de26696d40..db54e3af543c 100644 --- a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/IndexLifecycleRunnerTests.java +++ b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/IndexLifecycleRunnerTests.java @@ -793,12 +793,7 @@ public class IndexLifecycleRunnerTests extends ESTestCase { String phaseJson = Strings.toString(pei); LifecycleAction action = randomValueOtherThan(MigrateAction.DISABLED, () -> randomFrom(phase.getActions().values())); Step step = randomFrom(action.toSteps(client, phaseName, MOCK_STEP_KEY, null)); - Settings indexSettings = Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.version.created", Version.CURRENT) - .put(LifecycleSettings.LIFECYCLE_NAME, policyName) - .build(); + Settings indexSettings = indexSettings(Version.CURRENT, 1, 0).put(LifecycleSettings.LIFECYCLE_NAME, policyName).build(); LifecycleExecutionState.Builder lifecycleState = LifecycleExecutionState.builder(); lifecycleState.setPhaseDefinition(phaseJson); lifecycleState.setPhase(step.getKey().phase()); diff --git a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/PolicyStepsRegistryTests.java b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/PolicyStepsRegistryTests.java index e2888f36d7ad..931783491891 100644 --- a/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/PolicyStepsRegistryTests.java +++ b/x-pack/plugin/ilm/src/test/java/org/elasticsearch/xpack/ilm/PolicyStepsRegistryTests.java @@ -104,14 +104,7 @@ public class PolicyStepsRegistryTests extends ESTestCase { LifecycleExecutionState.Builder lifecycleState = LifecycleExecutionState.builder(); lifecycleState.setPhaseDefinition(phaseJson); IndexMetadata indexMetadata = IndexMetadata.builder("test") - .settings( - Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.version.created", Version.CURRENT) - .put(LifecycleSettings.LIFECYCLE_NAME, "policy") - .build() - ) + .settings(indexSettings(Version.CURRENT, 1, 0).put(LifecycleSettings.LIFECYCLE_NAME, "policy")) .putCustom(ILM_CUSTOM_METADATA_KEY, lifecycleState.build().asMap()) .build(); SortedMap metas = new TreeMap<>(); @@ -151,14 +144,7 @@ public class PolicyStepsRegistryTests extends ESTestCase { LifecyclePolicy policy = LifecyclePolicyTests.randomTimeseriesLifecyclePolicy("policy"); LifecyclePolicyMetadata policyMetadata = new LifecyclePolicyMetadata(policy, Collections.emptyMap(), 1, randomNonNegativeLong()); IndexMetadata indexMetadata = IndexMetadata.builder("test") - .settings( - Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.version.created", Version.CURRENT) - .put(LifecycleSettings.LIFECYCLE_NAME, "policy") - .build() - ) + .settings(indexSettings(Version.CURRENT, 1, 0).put(LifecycleSettings.LIFECYCLE_NAME, "policy").build()) .build(); SortedMap metas = new TreeMap<>(); metas.put("policy", policyMetadata); @@ -181,14 +167,7 @@ public class PolicyStepsRegistryTests extends ESTestCase { LifecycleExecutionState.Builder lifecycleState = LifecycleExecutionState.builder(); lifecycleState.setPhaseDefinition(phaseJson); IndexMetadata indexMetadata = IndexMetadata.builder("test") - .settings( - Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.version.created", Version.CURRENT) - .put(LifecycleSettings.LIFECYCLE_NAME, "policy") - .build() - ) + .settings(indexSettings(Version.CURRENT, 1, 0).put(LifecycleSettings.LIFECYCLE_NAME, "policy").build()) .putCustom(ILM_CUSTOM_METADATA_KEY, lifecycleState.build().asMap()) .build(); SortedMap metas = new TreeMap<>(); @@ -226,10 +205,7 @@ public class PolicyStepsRegistryTests extends ESTestCase { .put( IndexMetadata.builder("test") .settings( - Settings.builder() - .put("index.uuid", "uuid") - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) + indexSettings(1, 0).put("index.uuid", "uuid") .put("index.version.created", Version.CURRENT.id) .put(LifecycleSettings.LIFECYCLE_NAME, policyName) ) @@ -395,10 +371,7 @@ public class PolicyStepsRegistryTests extends ESTestCase { .put( IndexMetadata.builder("test") .settings( - Settings.builder() - .put("index.uuid", "uuid") - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) + indexSettings(1, 0).put("index.uuid", "uuid") .put("index.version.created", Version.CURRENT.id) .put(LifecycleSettings.LIFECYCLE_NAME, policyName) ) @@ -481,14 +454,7 @@ public class PolicyStepsRegistryTests extends ESTestCase { .setPhaseDefinition(Strings.toString(new PhaseExecutionInfo(policy.getName(), phase, 1, randomNonNegativeLong()))) .build(); IndexMetadata indexMetadata = IndexMetadata.builder("test") - .settings( - Settings.builder() - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0) - .put("index.version.created", Version.CURRENT) - .put(LifecycleSettings.LIFECYCLE_NAME, "policy") - .build() - ) + .settings(indexSettings(Version.CURRENT, 1, 0).put(LifecycleSettings.LIFECYCLE_NAME, "policy").build()) .putCustom(ILM_CUSTOM_METADATA_KEY, lifecycleState.asMap()) .build(); diff --git a/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/downsample/DownsampleActionSingleNodeTests.java b/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/downsample/DownsampleActionSingleNodeTests.java index 99563f5f7e64..e31a64962e74 100644 --- a/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/downsample/DownsampleActionSingleNodeTests.java +++ b/x-pack/plugin/rollup/src/test/java/org/elasticsearch/xpack/downsample/DownsampleActionSingleNodeTests.java @@ -436,13 +436,7 @@ public class DownsampleActionSingleNodeTests extends ESSingleNodeTestCase { prepareSourceIndex(sourceIndex); // Create an empty index with the same name as the rollup index - assertAcked( - client().admin() - .indices() - .prepareCreate(rollupIndex) - .setSettings(Settings.builder().put("index.number_of_shards", 1).put("index.number_of_replicas", 0).build()) - .get() - ); + assertAcked(client().admin().indices().prepareCreate(rollupIndex).setSettings(indexSettings(1, 0)).get()); ResourceAlreadyExistsException exception = expectThrows( ResourceAlreadyExistsException.class, () -> rollup(sourceIndex, rollupIndex, config) @@ -465,14 +459,10 @@ public class DownsampleActionSingleNodeTests extends ESSingleNodeTestCase { .indices() .prepareCreate(sourceIndex) .setSettings( - Settings.builder() - .put("index.number_of_shards", numOfShards) - .put("index.number_of_replicas", numOfReplicas) - .put(IndexSettings.MODE.getKey(), IndexMode.TIME_SERIES) + indexSettings(numOfShards, numOfReplicas).put(IndexSettings.MODE.getKey(), IndexMode.TIME_SERIES) .putList(IndexMetadata.INDEX_ROUTING_PATH.getKey(), List.of(FIELD_DIMENSION_1)) .put(IndexSettings.TIME_SERIES_START_TIME.getKey(), Instant.ofEpochMilli(startTime).toString()) .put(IndexSettings.TIME_SERIES_END_TIME.getKey(), "2106-01-08T23:40:53.384Z") - .build() ) .setMapping( FIELD_TIMESTAMP, diff --git a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/ShrinkIndexWithSecurityTests.java b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/ShrinkIndexWithSecurityTests.java index 843eb12c0e6e..218cb39baa9a 100644 --- a/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/ShrinkIndexWithSecurityTests.java +++ b/x-pack/plugin/security/src/internalClusterTest/java/org/elasticsearch/integration/ShrinkIndexWithSecurityTests.java @@ -51,12 +51,7 @@ public class ShrinkIndexWithSecurityTests extends SecurityIntegTestCase { // wait for green and then shrink ensureGreen(); - assertAcked( - client().admin() - .indices() - .prepareResizeIndex("bigindex", "shrunk_bigindex") - .setSettings(Settings.builder().put("index.number_of_replicas", 0).put("index.number_of_shards", 1).build()) - ); + assertAcked(client().admin().indices().prepareResizeIndex("bigindex", "shrunk_bigindex").setSettings(indexSettings(1, 0).build())); // verify all docs ensureGreen(); diff --git a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/OptOutQueryCacheTests.java b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/OptOutQueryCacheTests.java index 102fa69ab6a8..6a36f448d907 100644 --- a/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/OptOutQueryCacheTests.java +++ b/x-pack/plugin/security/src/test/java/org/elasticsearch/xpack/security/authz/accesscontrol/OptOutQueryCacheTests.java @@ -150,11 +150,7 @@ public class OptOutQueryCacheTests extends ESTestCase { } public void testOptOutQueryCacheNoIndicesPermissions() { - final Settings.Builder settings = Settings.builder() - .put("index.version.created", Version.CURRENT) - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0); - final IndexMetadata indexMetadata = IndexMetadata.builder("index").settings(settings).build(); + final IndexMetadata indexMetadata = IndexMetadata.builder("index").settings(indexSettings(Version.CURRENT, 1, 0)).build(); final IndicesQueryCache indicesQueryCache = mock(IndicesQueryCache.class); final ThreadContext threadContext = new ThreadContext(Settings.EMPTY); final OptOutQueryCache cache = new OptOutQueryCache(indexMetadata.getIndex(), indicesQueryCache, threadContext); @@ -166,11 +162,7 @@ public class OptOutQueryCacheTests extends ESTestCase { } public void testOptOutQueryCacheIndexDoesNotHaveFieldLevelSecurity() { - final Settings.Builder settings = Settings.builder() - .put("index.version.created", Version.CURRENT) - .put("index.number_of_shards", 1) - .put("index.number_of_replicas", 0); - final IndexMetadata indexMetadata = IndexMetadata.builder("index").settings(settings).build(); + final IndexMetadata indexMetadata = IndexMetadata.builder("index").settings(indexSettings(Version.CURRENT, 1, 0)).build(); final IndicesQueryCache indicesQueryCache = mock(IndicesQueryCache.class); final ThreadContext threadContext = new ThreadContext(Settings.EMPTY); final IndicesAccessControl.IndexAccessControl indexAccessControl = mock(IndicesAccessControl.IndexAccessControl.class); diff --git a/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/NodeShutdownShardsIT.java b/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/NodeShutdownShardsIT.java index f184806b7173..5af0f6b3c6ef 100644 --- a/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/NodeShutdownShardsIT.java +++ b/x-pack/plugin/shutdown/src/internalClusterTest/java/org/elasticsearch/xpack/shutdown/NodeShutdownShardsIT.java @@ -200,14 +200,7 @@ public class NodeShutdownShardsIT extends ESIntegTestCase { String nodeA = internalCluster().startNode(Settings.builder().put("node.name", "node-a")); // Create an index and pin it to nodeA, when we replace it with nodeB, // it'll move the data, overridding the `_name` allocation filter - createIndex( - "myindex", - Settings.builder() - .put("index.routing.allocation.require._name", nodeA) - .put("index.number_of_shards", 3) - .put("index.number_of_replicas", 0) - .build() - ); + createIndex("myindex", indexSettings(3, 0).put("index.routing.allocation.require._name", nodeA).build()); final String nodeAId = getNodeId(nodeA); final String nodeB = "node_t2"; // TODO: fix this to so it's actually overrideable @@ -270,14 +263,7 @@ public class NodeShutdownShardsIT extends ESIntegTestCase { String nodeA = internalCluster().startNode(Settings.builder().put("node.name", "node-a")); // Create an index on nodeA, then create allocation filter that could not be satisfied. // when we replace it with nodeB, it'll move the data, overridding the `_name` allocation filter - createIndex( - "myindex", - Settings.builder() - .put("index.routing.allocation.require._name", nodeA) - .put("index.number_of_shards", 3) - .put("index.number_of_replicas", 0) - .build() - ); + createIndex("myindex", indexSettings(3, 0).put("index.routing.allocation.require._name", nodeA).build()); var fakeNodeName = UUIDs.randomBase64UUID(); updateIndexSettings(Settings.builder().put("index.routing.allocation.require._name", fakeNodeName), "myindex"); diff --git a/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/checkpoint/TransformGetCheckpointIT.java b/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/checkpoint/TransformGetCheckpointIT.java index c070a3beea29..4c3ccaf6f420 100644 --- a/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/checkpoint/TransformGetCheckpointIT.java +++ b/x-pack/plugin/transform/src/internalClusterTest/java/org/elasticsearch/xpack/transform/checkpoint/TransformGetCheckpointIT.java @@ -11,7 +11,6 @@ import org.elasticsearch.action.admin.indices.refresh.RefreshRequest; import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse; import org.elasticsearch.action.support.IndicesOptions; import org.elasticsearch.common.Strings; -import org.elasticsearch.common.settings.Settings; import org.elasticsearch.xcontent.XContentType; import org.elasticsearch.xpack.core.transform.action.GetCheckpointAction; import org.elasticsearch.xpack.transform.TransformSingleNodeTestCase; @@ -31,11 +30,7 @@ public class TransformGetCheckpointIT extends TransformSingleNodeTestCase { final int indices = randomIntBetween(1, 5); for (int i = 0; i < indices; ++i) { - client().admin() - .indices() - .prepareCreate(indexNamePrefix + i) - .setSettings(Settings.builder().put("index.number_of_shards", shards).put("index.number_of_replicas", 1)) - .get(); + client().admin().indices().prepareCreate(indexNamePrefix + i).setSettings(indexSettings(shards, 1)).get(); } final GetCheckpointAction.Request request = new GetCheckpointAction.Request(