diff --git a/docs/reference/modules/cluster/misc.asciidoc b/docs/reference/modules/cluster/misc.asciidoc index f397c3075b711..fcf3491fb25ec 100644 --- a/docs/reference/modules/cluster/misc.asciidoc +++ b/docs/reference/modules/cluster/misc.asciidoc @@ -26,44 +26,40 @@ API can make the cluster read-write again. ==== Cluster Shard Limit -In a Elasticsearch 7.0 and later, there will be a soft limit on the number of -shards in a cluster, based on the number of nodes in the cluster. This is -intended to prevent operations which may unintentionally destabilize the -cluster. Prior to 7.0, actions which would result in the cluster going over the -limit will issue a deprecation warning. - -NOTE: You can set the system property `es.enforce_max_shards_per_node` to `true` -to opt in to strict enforcement of the shard limit. If this system property is -set, actions which would result in the cluster going over the limit will result -in an error, rather than a deprecation warning. This property will be removed in -Elasticsearch 7.0, as strict enforcement of the limit will be the default and -only behavior. +There is a soft limit on the number of shards in a cluster, based on the number +of nodes in the cluster. This is intended to prevent operations which may +unintentionally destabilize the cluster. If an operation, such as creating a new index, restoring a snapshot of an index, or opening a closed index would lead to the number of shards in the cluster -going over this limit, the operation will issue a deprecation warning. +going over this limit, the operation will fail with an error indicating the +shard limit. If the cluster is already over the limit, due to changes in node membership or -setting changes, all operations that create or open indices will issue warnings -until either the limit is increased as described below, or some indices are +setting changes, all operations that create or open indices will fail until +either the limit is increased as described below, or some indices are <> or <> to bring the number of shards below the limit. Replicas count towards this limit, but closed indexes do not. An index with 5 -primary shards and 2 replicas will be counted as 15 shards. Any closed index +primary shards and 2 replicas will be counted as 15 shards. Any closed index is counted as 0, no matter how many shards and replicas it contains. -The limit defaults to 1,000 shards per node, and be dynamically adjusted using -the following property: +The limit defaults to 1,000 shards per data node, and can be dynamically +adjusted using the following property: `cluster.max_shards_per_node`:: - Controls the number of shards allowed in the cluster per node. + Controls the number of shards allowed in the cluster per data node. For example, a 3-node cluster with the default setting would allow 3,000 shards -total, across all open indexes. If the above setting is changed to 1,500, then +total, across all open indexes. If the above setting is changed to 1,500, then the cluster would allow 4,500 shards total. +NOTE: If there are no data nodes in the cluster, the limit will not be enforced. +This allows the creation of indices during cluster creation if dedicated master +nodes are set up before data nodes. + [[user-defined-data]] ==== User Defined Cluster Metadata diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java index 3bb6c38dd1d9e..939cabb93a8bb 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java @@ -602,7 +602,7 @@ public void validateIndexSettings(String indexName, final Settings settings, fin final boolean forbidPrivateIndexSettings) throws IndexCreationException { List validationErrors = getIndexSettingsValidationErrors(settings, forbidPrivateIndexSettings); - Optional shardAllocation = checkShardLimit(settings, clusterState, deprecationLogger); + Optional shardAllocation = checkShardLimit(settings, clusterState); shardAllocation.ifPresent(validationErrors::add); if (validationErrors.isEmpty() == false) { @@ -617,14 +617,13 @@ public void validateIndexSettings(String indexName, final Settings settings, fin * * @param settings The settings of the index to be created. * @param clusterState The current cluster state. - * @param deprecationLogger The logger to use to emit a deprecation warning, if appropriate. * @return If present, an error message to be used to reject index creation. If empty, a signal that this operation may be carried out. */ - static Optional checkShardLimit(Settings settings, ClusterState clusterState, DeprecationLogger deprecationLogger) { + static Optional checkShardLimit(Settings settings, ClusterState clusterState) { int shardsToCreate = IndexMetaData.INDEX_NUMBER_OF_SHARDS_SETTING.get(settings) * (1 + IndexMetaData.INDEX_NUMBER_OF_REPLICAS_SETTING.get(settings)); - return IndicesService.checkShardLimit(shardsToCreate, clusterState, deprecationLogger); + return IndicesService.checkShardLimit(shardsToCreate, clusterState); } List getIndexSettingsValidationErrors(final Settings settings, final boolean forbidPrivateIndexSettings) { diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java index 3d3258c5ae301..25cf3ba2ca476 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateService.java @@ -19,8 +19,8 @@ package org.elasticsearch.cluster.metadata; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.Version; import org.elasticsearch.action.ActionListener; @@ -188,7 +188,7 @@ public ClusterState execute(ClusterState currentState) { } } - validateShardLimit(currentState, request.indices(), deprecationLogger); + validateShardLimit(currentState, request.indices()); if (indicesToOpen.isEmpty()) { return currentState; @@ -238,16 +238,15 @@ public ClusterState execute(ClusterState currentState) { * * @param currentState The current cluster state. * @param indices The indices which are to be opened. - * @param deprecationLogger The logger to use to emit a deprecation warning, if appropriate. * @throws ValidationException If this operation would take the cluster over the limit and enforcement is enabled. */ - static void validateShardLimit(ClusterState currentState, Index[] indices, DeprecationLogger deprecationLogger) { + static void validateShardLimit(ClusterState currentState, Index[] indices) { int shardsToOpen = Arrays.stream(indices) .filter(index -> currentState.metaData().index(index).getState().equals(IndexMetaData.State.CLOSE)) .mapToInt(index -> getTotalShardCount(currentState, index)) .sum(); - Optional error = IndicesService.checkShardLimit(shardsToOpen, currentState, deprecationLogger); + Optional error = IndicesService.checkShardLimit(shardsToOpen, currentState); if (error.isPresent()) { ValidationException ex = new ValidationException(); ex.addValidationError(error.get()); diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java index 011d1113455c8..bc765bfb14842 100644 --- a/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java +++ b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataUpdateSettingsService.java @@ -155,7 +155,7 @@ public ClusterState execute(ClusterState currentState) { int totalNewShards = Arrays.stream(request.indices()) .mapToInt(i -> getTotalNewShards(i, currentState, updatedNumberOfReplicas)) .sum(); - Optional error = IndicesService.checkShardLimit(totalNewShards, currentState, deprecationLogger); + Optional error = IndicesService.checkShardLimit(totalNewShards, currentState); if (error.isPresent()) { ValidationException ex = new ValidationException(); ex.addValidationError(error.get()); diff --git a/server/src/main/java/org/elasticsearch/indices/IndicesService.java b/server/src/main/java/org/elasticsearch/indices/IndicesService.java index 0eb9634e2a0f8..19388a2b63d4d 100644 --- a/server/src/main/java/org/elasticsearch/indices/IndicesService.java +++ b/server/src/main/java/org/elasticsearch/indices/IndicesService.java @@ -54,7 +54,6 @@ import org.elasticsearch.common.io.stream.StreamInput; import org.elasticsearch.common.io.stream.StreamOutput; import org.elasticsearch.common.lease.Releasable; -import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.settings.IndexScopedSettings; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Setting.Property; @@ -1401,11 +1400,10 @@ public boolean isMetaDataField(String field) { * * @param newShards The number of shards to be added by this operation * @param state The current cluster state - * @param deprecationLogger The logger to use for deprecation warnings * @return If present, an error message to be given as the reason for failing * an operation. If empty, a sign that the operation is valid. */ - public static Optional checkShardLimit(int newShards, ClusterState state, DeprecationLogger deprecationLogger) { + public static Optional checkShardLimit(int newShards, ClusterState state) { Settings theseSettings = state.metaData().settings(); int nodeCount = state.getNodes().getDataNodes().size(); @@ -1421,13 +1419,7 @@ public static Optional checkShardLimit(int newShards, ClusterState state if ((currentOpenShards + newShards) > maxShardsInCluster) { String errorMessage = "this action would add [" + newShards + "] total shards, but this cluster currently has [" + currentOpenShards + "]/[" + maxShardsInCluster + "] maximum shards open"; - if (ENFORCE_MAX_SHARDS_PER_NODE) { - return Optional.of(errorMessage); - } else { - deprecationLogger.deprecated("In a future major version, this request will fail because {}. Before upgrading, " + - "reduce the number of shards in your cluster or adjust the cluster setting [{}].", - errorMessage, MetaData.SETTING_CLUSTER_MAX_SHARDS_PER_NODE.getKey()); - } + return Optional.of(errorMessage); } return Optional.empty(); } diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java index c8877c138a3c2..6cbd83e5b242c 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexServiceTests.java @@ -52,6 +52,7 @@ import java.util.Comparator; import java.util.HashSet; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.function.Consumer; import java.util.stream.Collectors; @@ -471,7 +472,7 @@ public void testCalculateNumRoutingShards() { } } - public void testShardLimitDeprecationWarning() { + public void testShardLimit() { int nodesInCluster = randomIntBetween(2,100); ClusterShardLimitIT.ShardCounts counts = forDataNodeCount(nodesInCluster); Settings clusterSettings = Settings.builder() @@ -487,13 +488,13 @@ public void testShardLimitDeprecationWarning() { .build(); DeprecationLogger deprecationLogger = new DeprecationLogger(logger); - MetaDataCreateIndexService.checkShardLimit(indexSettings, state, deprecationLogger); + Optional errorMessage = MetaDataCreateIndexService.checkShardLimit(indexSettings, state); int totalShards = counts.getFailingIndexShards() * (1 + counts.getFailingIndexReplicas()); int currentShards = counts.getFirstIndexShards() * (1 + counts.getFirstIndexReplicas()); int maxShards = counts.getShardsPerNode() * nodesInCluster; - assertWarnings("In a future major version, this request will fail because this action would add [" + - totalShards + "] total shards, but this cluster currently has [" + currentShards + "]/[" + maxShards + "] maximum shards open."+ - " Before upgrading, reduce the number of shards in your cluster or adjust the cluster setting [cluster.max_shards_per_node]."); + assertTrue(errorMessage.isPresent()); + assertEquals("this action would add [" + totalShards + "] total shards, but this cluster currently has [" + currentShards + + "]/[" + maxShards + "] maximum shards open", errorMessage.get()); } } diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateServiceTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateServiceTests.java index 55e2216edb564..712f3ccdd4755 100644 --- a/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateServiceTests.java +++ b/server/src/test/java/org/elasticsearch/cluster/metadata/MetaDataIndexStateServiceTests.java @@ -25,6 +25,7 @@ import org.elasticsearch.cluster.node.DiscoveryNode; import org.elasticsearch.cluster.node.DiscoveryNodes; import org.elasticsearch.cluster.shards.ClusterShardLimitIT; +import org.elasticsearch.common.ValidationException; import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.settings.Settings; @@ -40,7 +41,7 @@ public class MetaDataIndexStateServiceTests extends ESTestCase { - public void testValidateShardLimitDeprecationWarning() { + public void testValidateShardLimit() { int nodesInCluster = randomIntBetween(2,100); ClusterShardLimitIT.ShardCounts counts = forDataNodeCount(nodesInCluster); Settings clusterSettings = Settings.builder() @@ -55,13 +56,13 @@ public void testValidateShardLimitDeprecationWarning() { .toArray(new Index[2]); DeprecationLogger deprecationLogger = new DeprecationLogger(logger); - MetaDataIndexStateService.validateShardLimit(state, indices, deprecationLogger); int totalShards = counts.getFailingIndexShards() * (1 + counts.getFailingIndexReplicas()); int currentShards = counts.getFirstIndexShards() * (1 + counts.getFirstIndexReplicas()); int maxShards = counts.getShardsPerNode() * nodesInCluster; - assertWarnings("In a future major version, this request will fail because this action would add [" + - totalShards + "] total shards, but this cluster currently has [" + currentShards + "]/[" + maxShards + "] maximum shards open."+ - " Before upgrading, reduce the number of shards in your cluster or adjust the cluster setting [cluster.max_shards_per_node]."); + ValidationException exception = expectThrows(ValidationException.class, + () -> MetaDataIndexStateService.validateShardLimit(state, indices)); + assertEquals("Validation Failed: 1: this action would add [" + totalShards + "] total shards, but this cluster currently has [" + + currentShards + "]/[" + maxShards + "] maximum shards open;", exception.getMessage()); } public static ClusterState createClusterForShardLimitTest(int nodesInCluster, int openIndexShards, int openIndexReplicas, diff --git a/server/src/test/java/org/elasticsearch/cluster/shards/ClusterShardLimitIT.java b/server/src/test/java/org/elasticsearch/cluster/shards/ClusterShardLimitIT.java index f9958d3aba2cd..434c371278e06 100644 --- a/server/src/test/java/org/elasticsearch/cluster/shards/ClusterShardLimitIT.java +++ b/server/src/test/java/org/elasticsearch/cluster/shards/ClusterShardLimitIT.java @@ -20,11 +20,31 @@ package org.elasticsearch.cluster.shards; +import org.elasticsearch.Version; +import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse; import org.elasticsearch.action.admin.cluster.settings.ClusterUpdateSettingsResponse; +import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse; +import org.elasticsearch.action.admin.cluster.snapshots.restore.RestoreSnapshotResponse; +import org.elasticsearch.action.support.master.AcknowledgedResponse; +import org.elasticsearch.client.Client; +import org.elasticsearch.cluster.ClusterState; import org.elasticsearch.cluster.metadata.MetaData; +import org.elasticsearch.common.Priority; import org.elasticsearch.common.settings.Settings; +import org.elasticsearch.common.unit.ByteSizeUnit; +import org.elasticsearch.node.Node; +import org.elasticsearch.snapshots.SnapshotInfo; +import org.elasticsearch.snapshots.SnapshotState; import org.elasticsearch.test.ESIntegTestCase; +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.test.hamcrest.ElasticsearchAssertions.assertAcked; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.greaterThan; + @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST) public class ClusterShardLimitIT extends ESIntegTestCase { private static final String shardsPerNodeKey = MetaData.SETTING_CLUSTER_MAX_SHARDS_PER_NODE.getKey(); @@ -55,6 +75,233 @@ public void testMinimumPerNode() { } } + + public void testIndexCreationOverLimit() { + int dataNodes = client().admin().cluster().prepareState().get().getState().getNodes().getDataNodes().size(); + + ShardCounts counts = ShardCounts.forDataNodeCount(dataNodes); + + setShardsPerNode(counts.getShardsPerNode()); + + // Create an index that will bring us up to the limit + createIndex("test", Settings.builder().put(indexSettings()) + .put(SETTING_NUMBER_OF_SHARDS, counts.getFirstIndexShards()) + .put(SETTING_NUMBER_OF_REPLICAS, counts.getFirstIndexReplicas()).build()); + + try { + prepareCreate("should-fail", Settings.builder() + .put(indexSettings()) + .put(SETTING_NUMBER_OF_SHARDS, counts.getFailingIndexShards()) + .put(SETTING_NUMBER_OF_REPLICAS, counts.getFailingIndexReplicas())).get(); + fail("Should not have been able to go over the limit"); + } catch (IllegalArgumentException e) { + verifyException(dataNodes, counts, e); + } + ClusterState clusterState = client().admin().cluster().prepareState().get().getState(); + assertFalse(clusterState.getMetaData().hasIndex("should-fail")); + } + + public void testIncreaseReplicasOverLimit() { + int dataNodes = client().admin().cluster().prepareState().get().getState().getNodes().getDataNodes().size(); + + dataNodes = ensureMultipleDataNodes(dataNodes); + + int firstShardCount = between(2, 10); + 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(); + + try { + client().admin().indices().prepareUpdateSettings("growing-should-fail") + .setSettings(Settings.builder().put("number_of_replicas", dataNodes)).get(); + fail("shouldn't be able to increase the number of replicas"); + } catch (IllegalArgumentException e) { + String expectedError = "Validation Failed: 1: this action would add [" + (dataNodes * firstShardCount) + + "] total shards, but this cluster currently has [" + firstShardCount + "]/[" + dataNodes * shardsPerNode + + "] maximum shards open;"; + assertEquals(expectedError, e.getMessage()); + } + MetaData clusterState = client().admin().cluster().prepareState().get().getState().metaData(); + assertEquals(0, clusterState.index("growing-should-fail").getNumberOfReplicas()); + } + + public void testChangingMultipleIndicesOverLimit() { + int dataNodes = client().admin().cluster().prepareState().get().getState().getNodes().getDataNodes().size(); + + dataNodes = ensureMultipleDataNodes(dataNodes); + + // Create two indexes: One that ends up with fewer shards, and one + // that ends up with more to verify that we check the _total_ number of + // shards the operation would add. + + int firstIndexFactor = between (5, 10); + int firstIndexShards = firstIndexFactor * dataNodes; + int firstIndexReplicas = 0; + + int secondIndexFactor = between(1, 3); + int secondIndexShards = secondIndexFactor * dataNodes; + int secondIndexReplicas = dataNodes; + + int shardsPerNode = firstIndexFactor + (secondIndexFactor * (1 + secondIndexReplicas)); + setShardsPerNode(shardsPerNode); + + + createIndex("test-1-index", Settings.builder().put(indexSettings()) + .put(SETTING_NUMBER_OF_SHARDS, firstIndexShards) + .put(SETTING_NUMBER_OF_REPLICAS, firstIndexReplicas).build()); + createIndex("test-2-index", Settings.builder().put(indexSettings()) + .put(SETTING_NUMBER_OF_SHARDS, secondIndexShards) + .put(SETTING_NUMBER_OF_REPLICAS, secondIndexReplicas).build()); + try { + client().admin().indices() + .prepareUpdateSettings(randomFrom("_all", "test-*", "*-index")) + .setSettings(Settings.builder().put("number_of_replicas", dataNodes - 1)) + .get(); + fail("should not have been able to increase shards above limit"); + } catch (IllegalArgumentException e) { + int totalShardsBefore = (firstIndexShards * (1 + firstIndexReplicas)) + (secondIndexShards * (1 + secondIndexReplicas)); + int totalShardsAfter = (dataNodes) * (firstIndexShards + secondIndexShards); + int difference = totalShardsAfter - totalShardsBefore; + + String expectedError = "Validation Failed: 1: this action would add [" + difference + + "] total shards, but this cluster currently has [" + totalShardsBefore + "]/[" + dataNodes * shardsPerNode + + "] maximum shards open;"; + assertEquals(expectedError, e.getMessage()); + } + MetaData clusterState = client().admin().cluster().prepareState().get().getState().metaData(); + assertEquals(firstIndexReplicas, clusterState.index("test-1-index").getNumberOfReplicas()); + assertEquals(secondIndexReplicas, clusterState.index("test-2-index").getNumberOfReplicas()); + } + + public void testPreserveExistingSkipsCheck() { + int dataNodes = client().admin().cluster().prepareState().get().getState().getNodes().getDataNodes().size(); + + dataNodes = ensureMultipleDataNodes(dataNodes); + + int firstShardCount = between(2, 10); + int shardsPerNode = firstShardCount - 1; + setShardsPerNode(shardsPerNode); + + prepareCreate("test-index", Settings.builder() + .put(indexSettings()) + .put(SETTING_NUMBER_OF_SHARDS, firstShardCount) + .put(SETTING_NUMBER_OF_REPLICAS, 0)).get(); + + // Since a request with preserve_existing can't change the number of + // replicas, we should never get an error here. + assertAcked(client().admin().indices() + .prepareUpdateSettings("test-index") + .setPreserveExisting(true) + .setSettings(Settings.builder().put("number_of_replicas", dataNodes)) + .get()); + ClusterState clusterState = client().admin().cluster().prepareState().get().getState(); + assertEquals(0, clusterState.getMetaData().index("test-index").getNumberOfReplicas()); + } + + public void testRestoreSnapshotOverLimit() { + Client client = client(); + + logger.info("--> creating repository"); + Settings.Builder repoSettings = Settings.builder(); + repoSettings.put("location", randomRepoPath()); + repoSettings.put("compress", randomBoolean()); + repoSettings.put("chunk_size", randomIntBetween(100, 1000), ByteSizeUnit.BYTES); + + assertAcked(client.admin().cluster().preparePutRepository("test-repo").setType("fs").setSettings(repoSettings.build())); + + int dataNodes = client().admin().cluster().prepareState().get().getState().getNodes().getDataNodes().size(); + ShardCounts counts = ShardCounts.forDataNodeCount(dataNodes); + createIndex("snapshot-index", Settings.builder().put(indexSettings()) + .put(SETTING_NUMBER_OF_SHARDS, counts.getFailingIndexShards()) + .put(SETTING_NUMBER_OF_REPLICAS, counts.getFailingIndexReplicas()).build()); + ensureGreen(); + + logger.info("--> snapshot"); + CreateSnapshotResponse createSnapshotResponse = client.admin().cluster() + .prepareCreateSnapshot("test-repo", "test-snap") + .setWaitForCompletion(true) + .setIndices("snapshot-index").get(); + assertThat(createSnapshotResponse.getSnapshotInfo().successfulShards(), greaterThan(0)); + assertThat(createSnapshotResponse.getSnapshotInfo().successfulShards(), + equalTo(createSnapshotResponse.getSnapshotInfo().totalShards())); + + List snapshotInfos = client.admin().cluster().prepareGetSnapshots("test-repo") + .setSnapshots("test-snap").get().getSnapshots(); + assertThat(snapshotInfos.size(), equalTo(1)); + SnapshotInfo snapshotInfo = snapshotInfos.get(0); + assertThat(snapshotInfo.state(), equalTo(SnapshotState.SUCCESS)); + assertThat(snapshotInfo.version(), equalTo(Version.CURRENT)); + + // Test restore after index deletion + logger.info("--> delete indices"); + cluster().wipeIndices("snapshot-index"); + + // Reduce the shard limit and fill it up + setShardsPerNode(counts.getShardsPerNode()); + createIndex("test-fill", Settings.builder().put(indexSettings()) + .put(SETTING_NUMBER_OF_SHARDS, counts.getFirstIndexShards()) + .put(SETTING_NUMBER_OF_REPLICAS, counts.getFirstIndexReplicas()).build()); + + logger.info("--> restore one index after deletion"); + try { + RestoreSnapshotResponse restoreSnapshotResponse = client.admin().cluster() + .prepareRestoreSnapshot("test-repo", "test-snap") + .setWaitForCompletion(true).setIndices("snapshot-index").execute().actionGet(); + fail("Should not have been able to restore snapshot in full cluster"); + } catch (IllegalArgumentException e) { + verifyException(dataNodes, counts, e); + } + ensureGreen(); + ClusterState clusterState = client.admin().cluster().prepareState().get().getState(); + assertFalse(clusterState.getMetaData().hasIndex("snapshot-index")); + } + + public void testOpenIndexOverLimit() { + Client client = client(); + int dataNodes = client().admin().cluster().prepareState().get().getState().getNodes().getDataNodes().size(); + ShardCounts counts = ShardCounts.forDataNodeCount(dataNodes); + + createIndex("test-index-1", Settings.builder().put(indexSettings()) + .put(SETTING_NUMBER_OF_SHARDS, counts.getFailingIndexShards()) + .put(SETTING_NUMBER_OF_REPLICAS, counts.getFailingIndexReplicas()).build()); + + ClusterHealthResponse healthResponse = client.admin().cluster().prepareHealth().setWaitForGreenStatus().execute().actionGet(); + assertFalse(healthResponse.isTimedOut()); + + AcknowledgedResponse closeIndexResponse = client.admin().indices().prepareClose("test-index-1").execute().actionGet(); + assertTrue(closeIndexResponse.isAcknowledged()); + + // Fill up the cluster + setShardsPerNode(counts.getShardsPerNode()); + createIndex("test-fill", Settings.builder().put(indexSettings()) + .put(SETTING_NUMBER_OF_SHARDS, counts.getFirstIndexShards()) + .put(SETTING_NUMBER_OF_REPLICAS, counts.getFirstIndexReplicas()).build()); + + + try { + client.admin().indices().prepareOpen("test-index-1").execute().actionGet(); + fail("should not have been able to open index"); + } catch (IllegalArgumentException e) { + verifyException(dataNodes, counts, e); + } + ClusterState clusterState = client.admin().cluster().prepareState().get().getState(); + assertFalse(clusterState.getMetaData().hasIndex("snapshot-index")); + } + + private int ensureMultipleDataNodes(int dataNodes) { + if (dataNodes == 1) { + internalCluster().startNode(Settings.builder().put(Node.NODE_DATA_SETTING.getKey(), true).build()); + assertThat(client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForNodes(">=2").setLocal(true) + .execute().actionGet().isTimedOut(), equalTo(false)); + dataNodes = client().admin().cluster().prepareState().get().getState().getNodes().getDataNodes().size(); + } + return dataNodes; + } + private void setShardsPerNode(int shardsPerNode) { try { ClusterUpdateSettingsResponse response; @@ -76,6 +323,15 @@ private void setShardsPerNode(int shardsPerNode) { } } + private void verifyException(int dataNodes, ShardCounts counts, IllegalArgumentException e) { + int totalShards = counts.getFailingIndexShards() * (1 + counts.getFailingIndexReplicas()); + int currentShards = counts.getFirstIndexShards() * (1 + counts.getFirstIndexReplicas()); + int maxShards = counts.getShardsPerNode() * dataNodes; + String expectedError = "Validation Failed: 1: this action would add [" + totalShards + + "] total shards, but this cluster currently has [" + currentShards + "]/[" + maxShards + "] maximum shards open;"; + assertEquals(expectedError, e.getMessage()); + } + public static class ShardCounts { private final int shardsPerNode; diff --git a/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java b/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java index cfac866895f0e..3ce5b90a7f414 100644 --- a/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java +++ b/server/src/test/java/org/elasticsearch/indices/IndicesServiceTests.java @@ -36,7 +36,6 @@ import org.elasticsearch.common.UUIDs; import org.elasticsearch.common.collect.ImmutableOpenMap; import org.elasticsearch.common.io.FileSystemUtils; -import org.elasticsearch.common.logging.DeprecationLogger; import org.elasticsearch.common.settings.Setting; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.unit.TimeValue; @@ -585,16 +584,14 @@ public void testOverShardLimit() { clusterSettings); int shardsToAdd = counts.getFailingIndexShards() * (1 + counts.getFailingIndexReplicas()); - DeprecationLogger deprecationLogger = new DeprecationLogger(logger); - Optional errorMessage = IndicesService.checkShardLimit(shardsToAdd, state, deprecationLogger); + Optional errorMessage = IndicesService.checkShardLimit(shardsToAdd, state); int totalShards = counts.getFailingIndexShards() * (1 + counts.getFailingIndexReplicas()); int currentShards = counts.getFirstIndexShards() * (1 + counts.getFirstIndexReplicas()); int maxShards = counts.getShardsPerNode() * nodesInCluster; - assertWarnings("In a future major version, this request will fail because this action would add [" + - totalShards + "] total shards, but this cluster currently has [" + currentShards + "]/[" + maxShards + "] maximum shards open."+ - " Before upgrading, reduce the number of shards in your cluster or adjust the cluster setting [cluster.max_shards_per_node]."); - assertFalse(errorMessage.isPresent()); + assertTrue(errorMessage.isPresent()); + assertEquals("this action would add [" + totalShards + "] total shards, but this cluster currently has [" + currentShards + + "]/[" + maxShards + "] maximum shards open", errorMessage.get()); } public void testUnderShardLimit() { @@ -611,8 +608,7 @@ public void testUnderShardLimit() { int existingShards = counts.getFirstIndexShards() * (1 + counts.getFirstIndexReplicas()); int shardsToAdd = randomIntBetween(1, (counts.getShardsPerNode() * nodesInCluster) - existingShards); - DeprecationLogger deprecationLogger = new DeprecationLogger(logger); - Optional errorMessage = IndicesService.checkShardLimit(shardsToAdd, state, deprecationLogger); + Optional errorMessage = IndicesService.checkShardLimit(shardsToAdd, state); assertFalse(errorMessage.isPresent()); } diff --git a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/ClusterDeprecationChecks.java b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/ClusterDeprecationChecks.java deleted file mode 100644 index 7f11c2c2944a7..0000000000000 --- a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/ClusterDeprecationChecks.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the Elastic License; - * you may not use this file except in compliance with the Elastic License. - */ - -package org.elasticsearch.xpack.deprecation; - -import org.elasticsearch.cluster.ClusterState; -import org.elasticsearch.cluster.metadata.MetaData; -import org.elasticsearch.xpack.core.deprecation.DeprecationIssue; - -public class ClusterDeprecationChecks { - - static DeprecationIssue checkShardLimit(ClusterState state) { - int shardsPerNode = MetaData.SETTING_CLUSTER_MAX_SHARDS_PER_NODE.get(state.metaData().settings()); - int nodeCount = state.getNodes().getDataNodes().size(); - int maxShardsInCluster = shardsPerNode * nodeCount; - int currentOpenShards = state.getMetaData().getTotalOpenIndexShards(); - - if (currentOpenShards >= maxShardsInCluster) { - return new DeprecationIssue(DeprecationIssue.Level.WARNING, - "Number of open shards exceeds cluster soft limit", - "https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking_70_cluster_changes.html", - "There are [" + currentOpenShards + "] open shards in this cluster, but the cluster is limited to [" + - shardsPerNode + "] per data node, for [" + maxShardsInCluster + "] maximum."); - } - return null; - } -} diff --git a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationChecks.java b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationChecks.java index 97c0498c3f603..b03b79dae2fe6 100644 --- a/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationChecks.java +++ b/x-pack/plugin/deprecation/src/main/java/org/elasticsearch/xpack/deprecation/DeprecationChecks.java @@ -28,9 +28,7 @@ private DeprecationChecks() { } static List> CLUSTER_SETTINGS_CHECKS = - Collections.unmodifiableList(Arrays.asList( - ClusterDeprecationChecks::checkShardLimit - )); + Collections.emptyList(); static List, List, DeprecationIssue>> NODE_SETTINGS_CHECKS = Collections.unmodifiableList(Arrays.asList(