Merge remote-tracking branch 'elastic/master' into concurrent-ccr-res…

…tore
elastic · Feb 7, 2019 · 0730ea4 · 0730ea4
2 parents 0217c91 + 3bf8e24
commit 0730ea4
Show file tree

Hide file tree

Showing 103 changed files with 1,292 additions and 1,380 deletions.
diff --git a/build.gradle b/build.gradle
@@ -159,8 +159,8 @@ task verifyVersions {
  * the enabled state of every bwc task. It should be set back to true
  * after the backport of the backcompat code is complete.
  */
-final boolean bwc_tests_enabled = false
-final String bwc_tests_disabled_issue = "https://github.com/elastic/elasticsearch/pull/38435" /* place a PR link here when committing bwc changes */
+final boolean bwc_tests_enabled = true
+final String bwc_tests_disabled_issue = "" /* place a PR link here when committing bwc changes */
 if (bwc_tests_enabled == false) {
   if (bwc_tests_disabled_issue.isEmpty()) {
     throw new GradleException("bwc_tests_disabled_issue must be set when bwc_tests_enabled == false")

diff --git a/client/rest/src/main/java/org/elasticsearch/client/ResponseException.java b/client/rest/src/main/java/org/elasticsearch/client/ResponseException.java
@@ -39,16 +39,6 @@ public ResponseException(Response response) throws IOException {
         this.response = response;
     }
 
-    /**
-     * Wrap a {@linkplain ResponseException} with another one with the current
-     * stack trace. This is used during synchronous calls so that the caller
-     * ends up in the stack trace of the exception thrown.
-     */
-    ResponseException(ResponseException e) throws IOException {
-        super(e.getMessage(), e);
-        this.response = e.getResponse();
-    }
-
     static String buildMessage(Response response) throws IOException {
         String message = String.format(Locale.ROOT,
             "method [%s], host [%s], URI [%s], status line [%s]",

diff --git a/client/rest/src/main/java/org/elasticsearch/client/RestClient.java b/client/rest/src/main/java/org/elasticsearch/client/RestClient.java
diff --git a/client/rest/src/main/java/org/elasticsearch/client/RestClientBuilder.java b/client/rest/src/main/java/org/elasticsearch/client/RestClientBuilder.java
@@ -42,14 +42,12 @@
 public final class RestClientBuilder {
     public static final int DEFAULT_CONNECT_TIMEOUT_MILLIS = 1000;
     public static final int DEFAULT_SOCKET_TIMEOUT_MILLIS = 30000;
-    public static final int DEFAULT_MAX_RETRY_TIMEOUT_MILLIS = DEFAULT_SOCKET_TIMEOUT_MILLIS;
     public static final int DEFAULT_MAX_CONN_PER_ROUTE = 10;
     public static final int DEFAULT_MAX_CONN_TOTAL = 30;
 
     private static final Header[] EMPTY_HEADERS = new Header[0];
 
     private final List<Node> nodes;
-    private int maxRetryTimeout = DEFAULT_MAX_RETRY_TIMEOUT_MILLIS;
     private Header[] defaultHeaders = EMPTY_HEADERS;
     private RestClient.FailureListener failureListener;
     private HttpClientConfigCallback httpClientConfigCallback;
@@ -102,20 +100,6 @@ public RestClientBuilder setFailureListener(RestClient.FailureListener failureLi
         return this;
     }
 
-    /**
-     * Sets the maximum timeout (in milliseconds) to honour in case of multiple retries of the same request.
-     * {@link #DEFAULT_MAX_RETRY_TIMEOUT_MILLIS} if not specified.
-     *
-     * @throws IllegalArgumentException if {@code maxRetryTimeoutMillis} is not greater than 0
-     */
-    public RestClientBuilder setMaxRetryTimeoutMillis(int maxRetryTimeoutMillis) {
-        if (maxRetryTimeoutMillis <= 0) {
-            throw new IllegalArgumentException("maxRetryTimeoutMillis must be greater than 0");
-        }
-        this.maxRetryTimeout = maxRetryTimeoutMillis;
-        return this;
-    }
-
     /**
      * Sets the {@link HttpClientConfigCallback} to be used to customize http client configuration
      *
@@ -208,7 +192,7 @@ public CloseableHttpAsyncClient run() {
                 return createHttpClient();
             }
         });
-        RestClient restClient = new RestClient(httpClient, maxRetryTimeout, defaultHeaders, nodes,
+        RestClient restClient = new RestClient(httpClient, defaultHeaders, nodes,
                 pathPrefix, failureListener, nodeSelector, strictDeprecationMode);
         httpClient.start();
         return restClient;

diff --git a/client/rest/src/test/java/org/elasticsearch/client/RestClientBuilderTests.java b/client/rest/src/test/java/org/elasticsearch/client/RestClientBuilderTests.java
@@ -82,14 +82,6 @@ public void testBuild() throws IOException {
             assertNotNull(restClient);
         }
 
-        try {
-            RestClient.builder(new HttpHost("localhost", 9200))
-                    .setMaxRetryTimeoutMillis(randomIntBetween(Integer.MIN_VALUE, 0));
-            fail("should have failed");
-        } catch(IllegalArgumentException e) {
-            assertEquals("maxRetryTimeoutMillis must be greater than 0", e.getMessage());
-        }
-
         try {
             RestClient.builder(new HttpHost("localhost", 9200)).setDefaultHeaders(null);
             fail("should have failed");
@@ -156,12 +148,9 @@ public RequestConfig.Builder customizeRequestConfig(RequestConfig.Builder reques
             builder.setDefaultHeaders(headers);
         }
         if (randomBoolean()) {
-            builder.setMaxRetryTimeoutMillis(randomIntBetween(1, Integer.MAX_VALUE));
-        }
-        if (randomBoolean()) {
-            String pathPrefix = (randomBoolean() ? "/" : "") + randomAsciiOfLengthBetween(2, 5);
+            String pathPrefix = (randomBoolean() ? "/" : "") + randomAsciiLettersOfLengthBetween(2, 5);
             while (pathPrefix.length() < 20 && randomBoolean()) {
-                pathPrefix += "/" + randomAsciiOfLengthBetween(3, 6);
+                pathPrefix += "/" + randomAsciiLettersOfLengthBetween(3, 6);
             }
             builder.setPathPrefix(pathPrefix + (randomBoolean() ? "/" : ""));
         }

diff --git a/client/rest/src/test/java/org/elasticsearch/client/RestClientMultipleHostsIntegTests.java b/client/rest/src/test/java/org/elasticsearch/client/RestClientMultipleHostsIntegTests.java
@@ -199,7 +199,7 @@ public void onFailure(Exception exception) {
      * Test host selector against a real server <strong>and</strong>
      * test what happens after calling
      */
-    public void testNodeSelector() throws IOException {
+    public void testNodeSelector() throws Exception {
         try (RestClient restClient = buildRestClient(firstPositionNodeSelector())) {
             Request request = new Request("GET", "/200");
             int rounds = between(1, 10);
@@ -210,7 +210,7 @@ public void testNodeSelector() throws IOException {
                  */
                 if (stoppedFirstHost) {
                     try {
-                        restClient.performRequest(request);
+                        RestClientSingleHostTests.performRequestSyncOrAsync(restClient, request);
                         fail("expected to fail to connect");
                     } catch (ConnectException e) {
                         // Windows isn't consistent here. Sometimes the message is even null!
@@ -219,7 +219,7 @@ public void testNodeSelector() throws IOException {
                         }
                     }
                 } else {
-                    Response response = restClient.performRequest(request);
+                    Response response = RestClientSingleHostTests.performRequestSyncOrAsync(restClient, request);
                     assertEquals(httpHosts[0], response.getHost());
                 }
             }