Test: Remove leftover static bwc test case (#26584)

This test case was leftover from the static bwc tests. There was still
one use for checking we do not load old indices, but this PR moves the
legacy code needed for that directly into the test. I also opened a
follow up issue to completely remove the unsupported test: #26583.

Author: rjernst

core/src/test/java/org/elasticsearch/bwcompat/RecoveryWithUnsupportedIndicesIT.java

@@ -18,11 +18,70 @@
  */
 package org.elasticsearch.bwcompat;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.DirectoryStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.TestUtil;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.env.Environment;
+import org.elasticsearch.env.NodeEnvironment;
+import org.elasticsearch.test.ESIntegTestCase;
 
 import static org.hamcrest.Matchers.containsString;
 
-public class RecoveryWithUnsupportedIndicesIT extends StaticIndexBackwardCompatibilityIT {
+@LuceneTestCase.SuppressCodecs("*")
+@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, minNumDataNodes = 0, maxNumDataNodes = 0)
+public class RecoveryWithUnsupportedIndicesIT extends ESIntegTestCase {
+
+    /**
+     * Return settings that could be used to start a node that has the given zipped home directory.
+     */
+    protected Settings prepareBackwardsDataDir(Path backwardsIndex, Object... settings) throws IOException {
+        Path indexDir = createTempDir();
+        Path dataDir = indexDir.resolve("data");
+        try (InputStream stream = Files.newInputStream(backwardsIndex)) {
+            TestUtil.unzip(stream, indexDir);
+        }
+        assertTrue(Files.exists(dataDir));
+
+        // list clusters in the datapath, ignoring anything from extrasfs
+        final Path[] list;
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(dataDir)) {
+            List<Path> dirs = new ArrayList<>();
+            for (Path p : stream) {
+                if (!p.getFileName().toString().startsWith("extra")) {
+                    dirs.add(p);
+                }
+            }
+            list = dirs.toArray(new Path[0]);
+        }
+
+        if (list.length != 1) {
+            StringBuilder builder = new StringBuilder("Backwards index must contain exactly one cluster\n");
+            for (Path line : list) {
+                builder.append(line.toString()).append('\n');
+            }
+            throw new IllegalStateException(builder.toString());
+        }
+        Path src = list[0].resolve(NodeEnvironment.NODES_FOLDER);
+        Path dest = dataDir.resolve(NodeEnvironment.NODES_FOLDER);
+        assertTrue(Files.exists(src));
+        Files.move(src, dest);
+        assertFalse(Files.exists(src));
+        assertTrue(Files.exists(dest));
+        Settings.Builder builder = Settings.builder()
+            .put(settings)
+            .put(Environment.PATH_DATA_SETTING.getKey(), dataDir.toAbsolutePath());
+
+        return builder.build();
+    }
+
     public void testUpgradeStartClusterOn_0_20_6() throws Exception {
         String indexName = "unsupported-0.20.6";
 

core/src/test/java/org/elasticsearch/bwcompat/StaticIndexBackwardCompatibilityIT.java

@@ -27,7 +27,6 @@
 import org.apache.lucene.search.Sort;
 import org.apache.lucene.util.IOUtils;
 import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.TestUtil;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.action.ActionListener;
@@ -143,7 +142,6 @@
 import org.junit.BeforeClass;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
@@ -153,7 +151,6 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.URL;
-import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
@@ -2115,48 +2112,7 @@ protected String routingKeyForShard(String index, int shard) {
         return internalCluster().routingKeyForShard(resolveIndex(index), shard, random());
     }
 
-    /**
-     * Return settings that could be used to start a node that has the given zipped home directory.
-     */
-    protected Settings prepareBackwardsDataDir(Path backwardsIndex, Object... settings) throws IOException {
-        Path indexDir = createTempDir();
-        Path dataDir = indexDir.resolve("data");
-        try (InputStream stream = Files.newInputStream(backwardsIndex)) {
-            TestUtil.unzip(stream, indexDir);
-        }
-        assertTrue(Files.exists(dataDir));
-
-        // list clusters in the datapath, ignoring anything from extrasfs
-        final Path[] list;
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(dataDir)) {
-            List<Path> dirs = new ArrayList<>();
-            for (Path p : stream) {
-                if (!p.getFileName().toString().startsWith("extra")) {
-                    dirs.add(p);
-                }
-            }
-            list = dirs.toArray(new Path[0]);
-        }
-
-        if (list.length != 1) {
-            StringBuilder builder = new StringBuilder("Backwards index must contain exactly one cluster\n");
-            for (Path line : list) {
-                builder.append(line.toString()).append('\n');
-            }
-            throw new IllegalStateException(builder.toString());
-        }
-        Path src = list[0].resolve(NodeEnvironment.NODES_FOLDER);
-        Path dest = dataDir.resolve(NodeEnvironment.NODES_FOLDER);
-        assertTrue(Files.exists(src));
-        Files.move(src, dest);
-        assertFalse(Files.exists(src));
-        assertTrue(Files.exists(dest));
-        Settings.Builder builder = Settings.builder()
-            .put(settings)
-            .put(Environment.PATH_DATA_SETTING.getKey(), dataDir.toAbsolutePath());
 
-        return builder.build();
-    }
 
     @Override
     protected NamedXContentRegistry xContentRegistry() {