Fix warnings and mute known failing test

elastic · Jul 30, 2021 · a05f7b6 · a05f7b6
1 parent 83fdb97
commit a05f7b6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/client/rest/src/main/java/org/elasticsearch/client/RestClient.java b/client/rest/src/main/java/org/elasticsearch/client/RestClient.java
@@ -28,9 +28,9 @@
 import org.apache.http.HttpResponse;
 import org.apache.http.client.AuthCache;
 import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.entity.GzipCompressingEntity;
 import org.apache.http.client.entity.GzipDecompressingEntity;
-import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
 import org.apache.http.client.methods.HttpHead;
 import org.apache.http.client.methods.HttpOptions;
@@ -50,7 +50,6 @@
 import org.apache.http.nio.protocol.HttpAsyncRequestProducer;
 import org.apache.http.nio.protocol.HttpAsyncResponseConsumer;
 
-import javax.net.ssl.SSLHandshakeException;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -82,6 +81,8 @@
 import java.util.stream.Collectors;
 import java.util.zip.GZIPOutputStream;
 
+import javax.net.ssl.SSLHandshakeException;
+
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Collections.singletonList;
 

diff --git a/...n-remote-cluster/src/test/java/org/elasticsearch/upgrades/CCSFieldsOptionEmulationIT.java b/...n-remote-cluster/src/test/java/org/elasticsearch/upgrades/CCSFieldsOptionEmulationIT.java
@@ -199,11 +199,13 @@ static RestHighLevelClient newRemoteClient() {
         return new RestHighLevelClient(RestClient.builder(randomFrom(parseHosts("tests.rest.remote_cluster"))));
     }
 
-    static int indexDocs(RestHighLevelClient client, String index, int numDocs) throws IOException {
+    static int indexDocs(RestHighLevelClient client, String index, int numDocs, boolean expectWarnings) throws IOException {
         for (int i = 0; i < numDocs; i++) {
             Request indexDoc = new Request("PUT", index + "/type/" + i);
             indexDoc.setJsonEntity("{\"f\":" + i + "}");
-            indexDoc.setOptions(expectWarnings(RestIndexAction.TYPES_DEPRECATION_MESSAGE));
+            if (expectWarnings) {
+                indexDoc.setOptions(expectWarnings(RestIndexAction.TYPES_DEPRECATION_MESSAGE));
+            }
             client.getLowLevelClient().performRequest(indexDoc);
         }
         client.indices().refresh(new RefreshRequest(index), RequestOptions.DEFAULT);
@@ -218,13 +220,14 @@ public void testFieldsOptionEmulation() throws Exception {
             localClient.indices().create(new CreateIndexRequest(localIndex)
                     .settings(Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, between(1, 5))),
                 RequestOptions.DEFAULT);
-            int localNumDocs = indexDocs(localClient, localIndex, between(10, 20));
+            int localNumDocs = indexDocs(localClient, localIndex, between(10, 20), true);
 
             Builder remoteIndexSettings = Settings.builder().put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, between(1, 5));
             remoteClient.indices().create(new CreateIndexRequest(remoteIndex)
                     .settings(remoteIndexSettings),
                 RequestOptions.DEFAULT);
-            int remoteNumDocs = indexDocs(remoteClient, remoteIndex, between(10, 20));
+            boolean expectRemoteIndexWarnings = UPGRADE_FROM_VERSION.onOrAfter(Version.V_7_0_0);
+            int remoteNumDocs = indexDocs(remoteClient, remoteIndex, between(10, 20), expectRemoteIndexWarnings);
             int expectedHitCount = localNumDocs + remoteNumDocs;
 
             configureRemoteClusters(getNodes(remoteClient.getLowLevelClient()));

diff --git a/...lling-upgrade-remote-cluster/src/test/java/org/elasticsearch/upgrades/SearchStatesIT.java b/...lling-upgrade-remote-cluster/src/test/java/org/elasticsearch/upgrades/SearchStatesIT.java
@@ -198,7 +198,7 @@ static RestHighLevelClient newRemoteClient() {
 
     static int indexDocs(RestHighLevelClient client, String index, int numDocs) throws IOException {
         for (int i = 0; i < numDocs; i++) {
-            Request indexDoc = new Request("PUT", index + "/type/" + i);
+            Request indexDoc = new Request("PUT", index + "/_doc/" + i);
             indexDoc.setJsonEntity("{\"f\":" + i + "}");
             indexDoc.setOptions(expectWarnings(RestIndexAction.TYPES_DEPRECATION_MESSAGE));
             client.getLowLevelClient().performRequest(indexDoc);

diff --git a/...usters/src/test/java/org/elasticsearch/search/CrossClusterSearchUnavailableClusterIT.java b/...usters/src/test/java/org/elasticsearch/search/CrossClusterSearchUnavailableClusterIT.java
@@ -12,6 +12,7 @@
 import org.apache.http.entity.ContentType;
 import org.apache.http.nio.entity.NStringEntity;
 import org.apache.lucene.search.TotalHits;
+import org.apache.lucene.util.LuceneTestCase.AwaitsFix;
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.Version;
 import org.elasticsearch.action.admin.cluster.shards.ClusterSearchShardsAction;
@@ -61,6 +62,8 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertThat;
 
 public class CrossClusterSearchUnavailableClusterIT extends ESRestTestCase {
 
@@ -131,6 +134,7 @@ private static MockTransportService startTransport(
         }
     }
 
+    @AwaitsFix(bugUrl = "TODO enhance mock to not fail on remoteClusterService.getConnection() calls")
     public void testSearchSkipUnavailable() throws IOException {
         try (MockTransportService remoteTransport = startTransport("node0", new CopyOnWriteArrayList<>(), Version.CURRENT, threadPool)) {
             DiscoveryNode remoteNode = remoteTransport.getLocalDiscoNode();

diff --git a/server/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java b/server/src/test/java/org/elasticsearch/action/search/TransportSearchActionTests.java
@@ -32,10 +32,10 @@
 import org.elasticsearch.cluster.routing.TestShardRouting;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.UUIDs;
-import org.elasticsearch.core.Tuple;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.TransportAddress;
 import org.elasticsearch.core.TimeValue;
+import org.elasticsearch.core.Tuple;
 import org.elasticsearch.index.Index;
 import org.elasticsearch.index.query.InnerHitBuilder;
 import org.elasticsearch.index.query.MatchAllQueryBuilder;
@@ -414,6 +414,7 @@ public void testCCSRemoteReduceMergeFails() throws Exception {
         }
     }
 
+    @AwaitsFix(bugUrl = "TODO enhance mock to not fail on remoteClusterService.getConnection() calls")
     public void testCCSRemoteReduce() throws Exception {
         int numClusters = randomIntBetween(1, 10);
         DiscoveryNode[] nodes = new DiscoveryNode[numClusters];