Tests for ignoring

Author: lukewhiting

x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/DataStreamDeprecationChecksTests.java

@@ -32,6 +32,7 @@
 import static java.util.Map.entry;
 import static java.util.Map.ofEntries;
 import static org.elasticsearch.index.IndexModule.INDEX_STORE_TYPE_SETTING;
+import static org.elasticsearch.xpack.core.deprecation.DeprecatedIndexPredicate.MINIMUM_WRITEABLE_VERSION_AFTER_UPGRADE;
 import static org.elasticsearch.xpack.deprecation.DeprecationChecks.DATA_STREAM_CHECKS;
 import static org.hamcrest.Matchers.equalTo;
 
@@ -49,15 +50,17 @@ public void testOldIndicesCheck() {
             Settings.Builder settings = settings(IndexVersion.fromId(7170099));
 
             String indexName = "old-data-stream-index-" + i;
-            if (expectedIndices.isEmpty() == false && randomIntBetween(0, 2) == 0) {
+            int randomInt = randomIntBetween(0, 2);
+            if (expectedIndices.isEmpty() == false && randomInt == 0) {
                 settings.put(INDEX_STORE_TYPE_SETTING.getKey(), SearchableSnapshotsSettings.SEARCHABLE_SNAPSHOT_STORE_TYPE);
+            } else if (expectedIndices.isEmpty() == false && randomInt == 1) {
+                settings.put(IndexMetadata.INDEX_IGNORE_DEPRECATION_WARNING_FOR_VERSION_KEY, MINIMUM_WRITEABLE_VERSION_AFTER_UPGRADE.id());
             } else {
                 expectedIndices.add(indexName);
             }
 
-            Settings.Builder settingsBuilder = settings;
             IndexMetadata oldIndexMetadata = IndexMetadata.builder(indexName)
-                .settings(settingsBuilder)
+                .settings(settings)
                 .numberOfShards(1)
                 .numberOfReplicas(0)
                 .build();
@@ -104,6 +107,7 @@ public void testOldIndicesCheck() {
             false,
             ofEntries(
                 entry("reindex_required", true),
+                entry("minimum_writable_version_after_upgrade", MINIMUM_WRITEABLE_VERSION_AFTER_UPGRADE.id()),
                 entry("total_backing_indices", oldIndexCount + newIndexCount),
                 entry("indices_requiring_upgrade_count", expectedIndices.size()),
                 entry("indices_requiring_upgrade", expectedIndices)

x-pack/plugin/deprecation/src/test/java/org/elasticsearch/xpack/deprecation/IndexDeprecationChecksTests.java

@@ -22,15 +22,19 @@
 import org.elasticsearch.index.engine.frozen.FrozenEngine;
 import org.elasticsearch.snapshots.SearchableSnapshotsSettings;
 import org.elasticsearch.test.ESTestCase;
+import org.elasticsearch.xpack.core.deprecation.DeprecatedIndexPredicate;
 import org.elasticsearch.xpack.core.deprecation.DeprecationIssue;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
 import static java.util.Collections.singletonList;
-import static java.util.Collections.singletonMap;
+import static java.util.Map.entry;
+import static java.util.Map.ofEntries;
+import static org.elasticsearch.cluster.metadata.IndexMetadata.INDEX_IGNORE_DEPRECATION_WARNING_FOR_VERSION_KEY;
 import static org.elasticsearch.index.IndexModule.INDEX_STORE_TYPE_SETTING;
+import static org.elasticsearch.xpack.core.deprecation.DeprecatedIndexPredicate.MINIMUM_WRITEABLE_VERSION_AFTER_UPGRADE;
 import static org.elasticsearch.xpack.deprecation.DeprecationChecks.INDEX_SETTINGS_CHECKS;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.equalTo;
@@ -54,7 +58,10 @@ public void testOldIndicesCheck() {
             "https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking-changes-9.0.html",
             "This index has version: " + createdWith.toReleaseVersion(),
             false,
-            singletonMap("reindex_required", true)
+            ofEntries(
+                entry("reindex_required", true),
+                entry("minimum_writable_version_after_upgrade", DeprecatedIndexPredicate.MINIMUM_WRITEABLE_VERSION_AFTER_UPGRADE.id())
+            )
         );
         List<DeprecationIssue> issues = DeprecationChecks.filterChecks(INDEX_SETTINGS_CHECKS, c -> c.apply(indexMetadata, clusterState));
         assertEquals(singletonList(expected), issues);
@@ -116,6 +123,20 @@ public void testOldIndicesCheckSnapshotIgnored() {
         assertThat(issues, empty());
     }
 
+    public void testIgnoredIndex() {
+        IndexVersion createdWith = IndexVersion.fromId(7170099);
+        Settings.Builder settings = settings(createdWith);
+        settings.put(INDEX_IGNORE_DEPRECATION_WARNING_FOR_VERSION_KEY, MINIMUM_WRITEABLE_VERSION_AFTER_UPGRADE.id());
+        IndexMetadata indexMetadata = IndexMetadata.builder("test").settings(settings).numberOfShards(1).numberOfReplicas(0).build();
+        ClusterState clusterState = ClusterState.builder(ClusterState.EMPTY_STATE)
+            .metadata(Metadata.builder().put(indexMetadata, true))
+            .build();
+
+        List<DeprecationIssue> issues = DeprecationChecks.filterChecks(INDEX_SETTINGS_CHECKS, c -> c.apply(indexMetadata, clusterState));
+
+        assertThat(issues, empty());
+    }
+
     public void testTranslogRetentionSettings() {
         Settings.Builder settings = settings(IndexVersion.current());
         settings.put(IndexSettings.INDEX_TRANSLOG_RETENTION_AGE_SETTING.getKey(), randomPositiveTimeValue());