Make DocValueOnlyFieldsIT work for V7x

Author: cbuescher

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java

@@ -10,7 +10,6 @@
 package org.elasticsearch.test.rest;
 
 import io.netty.handler.codec.http.HttpMethod;
-
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
@@ -87,6 +86,7 @@
 import org.junit.AfterClass;
 import org.junit.Before;
 
+import javax.net.ssl.SSLContext;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -118,14 +118,13 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
-import javax.net.ssl.SSLContext;
-
 import static java.util.Collections.sort;
 import static java.util.Collections.unmodifiableList;
 import static org.elasticsearch.client.RestClient.IGNORE_RESPONSE_CODES_PARAM;
@@ -408,6 +407,10 @@ protected static boolean has(ProductFeature feature) {
     }
 
     protected List<HttpHost> parseClusterHosts(String hostsString) {
+        return parseClusterHosts(hostsString, this::buildHttpHost);
+    }
+
+    public static List<HttpHost> parseClusterHosts(String hostsString, BiFunction<String, Integer, HttpHost> httpHostSupplier) {
         String[] stringUrls = hostsString.split(",");
         List<HttpHost> hosts = new ArrayList<>(stringUrls.length);
         for (String stringUrl : stringUrls) {
@@ -417,7 +420,7 @@ protected List<HttpHost> parseClusterHosts(String hostsString) {
             }
             String host = stringUrl.substring(0, portSeparator);
             int port = Integer.valueOf(stringUrl.substring(portSeparator + 1));
-            hosts.add(buildHttpHost(host, port));
+            hosts.add(httpHostSupplier.apply(host, port));
         }
         return unmodifiableList(hosts);
     }

x-pack/qa/repository-old-versions-7x/src/javaRestTest/java/org/elasticsearch/oldrepos7x/DocValueOnlyFieldsIT.java

@@ -29,6 +29,7 @@
 import org.junit.rules.TestRule;
 
 import java.io.IOException;
+import java.util.List;
 
 /**
  * Tests doc-value-based searches against indices imported from clusters older than N-1.
@@ -43,7 +44,7 @@
 public class DocValueOnlyFieldsIT extends ESClientYamlSuiteTestCase {
 
     static final Version oldVersion = Version.fromString(System.getProperty("tests.old_cluster_version"));
-    static boolean setupDone;
+    static boolean repoRestored;
 
     public static TemporaryFolder repoDirectory = new TemporaryFolder();
 
@@ -54,8 +55,6 @@ public class DocValueOnlyFieldsIT extends ESClientYamlSuiteTestCase {
         .setting("xpack.license.self_generated.type", "trial")
         .setting("xpack.ml.enabled", "false")
         .setting("path.repo", () -> repoDirectory.getRoot().getPath())
-        .setting("xpack.searchable.snapshot.shared_cache.size", "16MB")
-        .setting("xpack.searchable.snapshot.shared_cache.region_size", "256KB")
         .build();
 
     public static ElasticsearchCluster oldCluster = ElasticsearchCluster.local()
@@ -73,7 +72,6 @@ public class DocValueOnlyFieldsIT extends ESClientYamlSuiteTestCase {
     private static final String REPO_NAME = "doc_values_repo";
     private static final String INDEX_NAME = "test";
     private static final String snapshotName = "snap";
-
     private static String repoLocation;
 
     public DocValueOnlyFieldsIT(@Name("yaml") ClientYamlTestCandidate testCandidate) {
@@ -111,9 +109,8 @@ public static void setupSnapshot() throws IOException {
             "keyword",
             "ip",
             "geo_point" }; // date is manually added as it need further configuration
-
-        int oldEsPort = Integer.parseInt(System.getProperty("tests.es.port"));
-        try (RestClient oldEs = RestClient.builder(new HttpHost("127.0.0.1", oldEsPort)).build()) {
+        List<HttpHost> oldClusterHosts = parseClusterHosts(oldCluster.getHttpAddresses(), (host, port) -> new HttpHost(host, port));
+        try (RestClient oldEs = RestClient.builder(oldClusterHosts.toArray(new HttpHost[oldClusterHosts.size()])).build();) {
             Request createIndex = new Request("PUT", "/" + INDEX_NAME);
             int numberOfShards = randomIntBetween(1, 3);
 
@@ -133,7 +130,7 @@ public static void setupSnapshot() throws IOException {
             createIndex.setJsonEntity(Strings.toString(settingsBuilder));
             assertOK(oldEs.performRequest(createIndex));
 
-            Request doc1 = new Request("PUT", "/" + INDEX_NAME + "/" + "doc" + "/" + "1");
+            Request doc1 = new Request("PUT", "/" + INDEX_NAME + "/" + "_doc" + "/" + "1");
             doc1.addParameter("refresh", "true");
             XContentBuilder bodyDoc1 = XContentFactory.jsonBuilder()
                 .startObject()
@@ -153,7 +150,7 @@ public static void setupSnapshot() throws IOException {
             doc1.setJsonEntity(Strings.toString(bodyDoc1));
             assertOK(oldEs.performRequest(doc1));
 
-            Request doc2 = new Request("PUT", "/" + INDEX_NAME + "/" + "doc" + "/" + "2");
+            Request doc2 = new Request("PUT", "/" + INDEX_NAME + "/" + "_doc" + "/" + "2");
             doc2.addParameter("refresh", "true");
             XContentBuilder bodyDoc2 = XContentFactory.jsonBuilder()
                 .startObject()
@@ -191,7 +188,7 @@ public static void setupSnapshot() throws IOException {
     public void registerAndRestoreRepo() throws IOException {
         // The following is bit of a hack. While we wish we could make this an @BeforeClass, it does not work because the client() is only
         // initialized later, so we do it when running the first test
-        if (setupDone = false) {
+        if (repoRestored == false) {
             // register repo on new ES and restore snapshot
             Request createRepoRequest2 = new Request("PUT", "/_snapshot/" + REPO_NAME);
             createRepoRequest2.setJsonEntity(Strings.format("""
@@ -204,7 +201,13 @@ public void registerAndRestoreRepo() throws IOException {
             createRestoreRequest.setJsonEntity("{\"indices\":\"" + INDEX_NAME + "\"}");
             assertOK(client().performRequest(createRestoreRequest));
 
-            setupDone = true;
+            repoRestored = true;
         }
+        logger.info("repo [" + REPO_NAME + "] restored");
+    }
+
+    @Override
+    protected String getTestRestCluster() {
+        return currentCluster.getHttpAddresses();
     }
 }

x-pack/qa/repository-old-versions-7x/src/javaRestTest/java/org/elasticsearch/oldrepos7x/OldMappingsIT.java

@@ -30,13 +30,11 @@
 import org.junit.rules.TestRule;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static java.util.Collections.unmodifiableList;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.hasKey;
 import static org.hamcrest.Matchers.hasSize;
@@ -103,7 +101,7 @@ public static void setupOldRepo() throws IOException {
         repoName = "old_mappings_repo";
         snapshotName = "snap";
 
-        List<HttpHost> oldClusterHosts = parseOldClusterHosts(oldCluster.getHttpAddresses());
+        List<HttpHost> oldClusterHosts = parseClusterHosts(oldCluster.getHttpAddresses(), (host, port) -> new HttpHost(host, port));
         try (RestClient oldEsClient = RestClient.builder(oldClusterHosts.toArray(new HttpHost[oldClusterHosts.size()])).build();) {
             assertOK(oldEsClient.performRequest(createIndex("filebeat", "filebeat.json")));
 
@@ -200,21 +198,6 @@ public void registerAndRestoreRepo() throws IOException {
         }
     }
 
-    private static List<HttpHost> parseOldClusterHosts(String hostsString) {
-        String[] stringUrls = hostsString.split(",");
-        List<HttpHost> hosts = new ArrayList<>(stringUrls.length);
-        for (String stringUrl : stringUrls) {
-            int portSeparator = stringUrl.lastIndexOf(':');
-            if (portSeparator < 0) {
-                throw new IllegalArgumentException("Illegal cluster url [" + stringUrl + "]");
-            }
-            String host = stringUrl.substring(0, portSeparator);
-            int port = Integer.valueOf(stringUrl.substring(portSeparator + 1));
-            hosts.add(new HttpHost(host, port));
-        }
-        return unmodifiableList(hosts);
-    }
-
     public void testFileBeatApache2MappingOk() throws IOException {
         Request mappingRequest = new Request("GET", "/" + "filebeat" + "/_mapping");
         Map<String, Object> mapping = entityAsMap(client().performRequest(mappingRequest));

x-pack/qa/repository-old-versions-7x/src/javaRestTest/java/org/elasticsearch/oldrepos7x/OldRepositoryAccessIT.java

@@ -44,7 +44,6 @@
 import org.junit.rules.TestRule;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -54,7 +53,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static java.util.Collections.unmodifiableList;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.empty;
@@ -106,7 +104,7 @@ public class OldRepositoryAccessIT extends ESRestTestCase {
     @BeforeClass
     public static void setupOldRepo() throws IOException {
         String repoLocationBase = repoDirectory.getRoot().getPath();
-        List<HttpHost> oldClusterHosts = parseOldClusterHosts(oldCluster.getHttpAddresses());
+        List<HttpHost> oldClusterHosts = parseClusterHosts(oldCluster.getHttpAddresses(), (host, port) -> new HttpHost(host, port));
         Version oldVersion = Version.fromString(System.getProperty("tests.old_cluster_version"));
         try (RestClient oldEs = RestClient.builder(oldClusterHosts.toArray(new HttpHost[oldClusterHosts.size()])).build()) {
             checkClusterVersion(oldEs, oldVersion);
@@ -524,19 +522,4 @@ private static void closeIndex(RestClient client, String index) throws IOExcepti
         ObjectPath doc = ObjectPath.createFromResponse(client.performRequest(request));
         assertTrue(doc.evaluate("shards_acknowledged"));
     }
-
-    private static List<HttpHost> parseOldClusterHosts(String hostsString) {
-        String[] stringUrls = hostsString.split(",");
-        List<HttpHost> hosts = new ArrayList<>(stringUrls.length);
-        for (String stringUrl : stringUrls) {
-            int portSeparator = stringUrl.lastIndexOf(':');
-            if (portSeparator < 0) {
-                throw new IllegalArgumentException("Illegal cluster url [" + stringUrl + "]");
-            }
-            String host = stringUrl.substring(0, portSeparator);
-            int port = Integer.valueOf(stringUrl.substring(portSeparator + 1));
-            hosts.add(new HttpHost(host, port));
-        }
-        return unmodifiableList(hosts);
-    }
 }