Revert "Add deprecation warning for default shards (#30587)"

This reverts commit 3bb200f.

Author: jasontedor

distribution/archives/integ-test-zip/src/test/java/org/elasticsearch/test/rest/DefaultShardsIT.java

@@ -19,9 +19,11 @@
 
 package org.elasticsearch.cluster.metadata;
 
+import com.carrotsearch.hppc.cursors.ObjectCursor;
 import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.message.ParameterizedMessage;
+import org.apache.lucene.util.CollectionUtil;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ResourceAlreadyExistsException;
 import org.elasticsearch.Version;
@@ -57,6 +59,7 @@
 import org.elasticsearch.common.io.PathUtils;
 import org.elasticsearch.common.logging.DeprecationLogger;
 import org.elasticsearch.common.logging.Loggers;
+import org.elasticsearch.common.regex.Regex;
 import org.elasticsearch.common.settings.IndexScopedSettings;
 import org.elasticsearch.common.settings.Setting;
 import org.elasticsearch.common.settings.Settings;
@@ -78,10 +81,12 @@
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
@@ -371,9 +376,6 @@ public ClusterState execute(ClusterState currentState) throws Exception {
                 // now, put the request settings, so they override templates
                 indexSettingsBuilder.put(request.settings());
                 if (indexSettingsBuilder.get(SETTING_NUMBER_OF_SHARDS) == null) {
-                    deprecationLogger.deprecated("the default number of shards will change from [5] to [1] in 7.0.0; "
-                            + "if you wish to continue using the default of [5] shards, "
-                            + "you must manage this on the create index request or with an index template");
                     indexSettingsBuilder.put(SETTING_NUMBER_OF_SHARDS, settings.getAsInt(SETTING_NUMBER_OF_SHARDS, 5));
                 }
                 if (indexSettingsBuilder.get(SETTING_NUMBER_OF_REPLICAS) == null) {

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

@@ -120,10 +120,6 @@ public void testMatchTemplates() throws Exception {
 
         final ClusterState result = executeTask();
 
-        assertWarnings("the default number of shards will change from [5] to [1] in 7.0.0; "
-                + "if you wish to continue using the default of [5] shards, "
-                + "you must manage this on the create index request or with an index template");
-
         assertThat(result.metaData().index("test").getAliases(), hasAllKeys("alias_from_template_1", "alias_from_template_2"));
         assertThat(result.metaData().index("test").getAliases(), not(hasKey("alias_from_template_3")));
     }
@@ -138,10 +134,6 @@ public void testApplyDataFromTemplate() throws Exception {
 
         final ClusterState result = executeTask();
 
-        assertWarnings("the default number of shards will change from [5] to [1] in 7.0.0; "
-                + "if you wish to continue using the default of [5] shards, "
-                + "you must manage this on the create index request or with an index template");
-
         assertThat(result.metaData().index("test").getAliases(), hasKey("alias1"));
         assertThat(result.metaData().index("test").getCustoms(), hasKey("custom1"));
         assertThat(result.metaData().index("test").getSettings().get("key1"), equalTo("value1"));
@@ -156,10 +148,6 @@ public void testApplyDataFromRequest() throws Exception {
 
         final ClusterState result = executeTask();
 
-        assertWarnings("the default number of shards will change from [5] to [1] in 7.0.0; "
-                + "if you wish to continue using the default of [5] shards, "
-                + "you must manage this on the create index request or with an index template");
-
         assertThat(result.metaData().index("test").getAliases(), hasKey("alias1"));
         assertThat(result.metaData().index("test").getCustoms(), hasKey("custom1"));
         assertThat(result.metaData().index("test").getSettings().get("key1"), equalTo("value1"));
@@ -189,10 +177,6 @@ public void testRequestDataHavePriorityOverTemplateData() throws Exception {
 
         final ClusterState result = executeTask();
 
-        assertWarnings("the default number of shards will change from [5] to [1] in 7.0.0; "
-                + "if you wish to continue using the default of [5] shards, "
-                + "you must manage this on the create index request or with an index template");
-
         assertThat(result.metaData().index("test").getCustoms().get("custom1"), equalTo(mergedCustom));
         assertThat(result.metaData().index("test").getAliases().get("alias1").getSearchRouting(), equalTo("fromReq"));
         assertThat(result.metaData().index("test").getSettings().get("key1"), equalTo("reqValue"));
@@ -202,10 +186,6 @@ public void testRequestDataHavePriorityOverTemplateData() throws Exception {
     public void testDefaultSettings() throws Exception {
         final ClusterState result = executeTask();
 
-        assertWarnings("the default number of shards will change from [5] to [1] in 7.0.0; "
-                + "if you wish to continue using the default of [5] shards, "
-                + "you must manage this on the create index request or with an index template");
-
         assertThat(result.getMetaData().index("test").getSettings().get(SETTING_NUMBER_OF_SHARDS), equalTo("5"));
     }
 
@@ -214,10 +194,6 @@ public void testSettingsFromClusterState() throws Exception {
 
         final ClusterState result = executeTask();
 
-        assertWarnings("the default number of shards will change from [5] to [1] in 7.0.0; "
-                + "if you wish to continue using the default of [5] shards, "
-                + "you must manage this on the create index request or with an index template");
-
         assertThat(result.getMetaData().index("test").getSettings().get(SETTING_NUMBER_OF_SHARDS), equalTo("15"));
     }
 
@@ -270,10 +246,6 @@ public void testRequestStateOpen() throws Exception {
 
         executeTask();
 
-        assertWarnings("the default number of shards will change from [5] to [1] in 7.0.0; "
-                + "if you wish to continue using the default of [5] shards, "
-                + "you must manage this on the create index request or with an index template");
-
         verify(allocationService, times(1)).reroute(anyObject(), anyObject());
     }
 
@@ -283,10 +255,6 @@ public void testIndexRemovalOnFailure() throws Exception {
 
         expectThrows(RuntimeException.class, this::executeTask);
 
-        assertWarnings("the default number of shards will change from [5] to [1] in 7.0.0; "
-                + "if you wish to continue using the default of [5] shards, "
-                + "you must manage this on the create index request or with an index template");
-
         verify(indicesService, times(1)).removeIndex(anyObject(), anyObject(), anyObject());
     }
 
@@ -322,10 +290,6 @@ public void testValidateWaitForActiveShardsFailure() throws Exception {
 
         IllegalArgumentException e = expectThrows(IllegalArgumentException.class, this::executeTask);
 
-        assertWarnings("the default number of shards will change from [5] to [1] in 7.0.0; "
-                + "if you wish to continue using the default of [5] shards, "
-                + "you must manage this on the create index request or with an index template");
-
         assertThat(e.getMessage(), containsString("invalid wait_for_active_shards"));
     }
 

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

@@ -271,16 +271,7 @@ void checkWarningHeaders(final List<String> warningHeaders) {
             final boolean matches = matcher.matches();
             if (matches) {
                 final String message = matcher.group(1);
-                // noinspection StatementWithEmptyBody
-                if (message.equals("the default number of shards will change from [5] to [1] in 7.0.0; "
-                        + "if you wish to continue using the default of [5] shards, "
-                        + "you must manage this on the create index request or with an index template")) {
-                    /*
-                     * This warning header will come back in the vast majority of our tests that create an index. Rather than rewrite our
-                     * tests to assert this warning header, we assume that it is expected.
-                     */
-                }
-                else if (expected.remove(message) == false) {
+                if (expected.remove(message) == false) {
                     unexpected.add(header);
                 }
             } else {