Update http-core and http-client dependencies (#46549)

Relates to #45808
Closes #45577

buildSrc/version.properties

@@ -32,8 +32,8 @@ bouncycastle      = 1.61
 # test dependencies
 randomizedrunner  = 2.7.1
 junit             = 4.12
-httpclient        = 4.5.8
+httpclient        = 4.5.10
-httpcore          = 4.4.11
+httpcore          = 4.4.12
 httpasyncclient   = 4.1.4
 commonslogging    = 1.1.3
 commonscodec      = 1.11

client/rest-high-level/src/main/java/org/elasticsearch/client/IndexLifecycleClient.java

@@ -496,9 +496,9 @@ public class IndexLifecycleClient {
      * @param options the request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
      * @param listener the listener to be notified upon request completion
      */
-    public void getSnapshotLifecycleStatsAsync(GetSnapshotLifecycleStatsRequest request, RequestOptions options,
+    public Cancellable getSnapshotLifecycleStatsAsync(GetSnapshotLifecycleStatsRequest request, RequestOptions options,
                                                ActionListener<GetSnapshotLifecycleStatsResponse> listener) {
-        restHighLevelClient.performRequestAsyncAndParseEntity(request, IndexLifecycleRequestConverters::getSnapshotLifecycleStats,
+        return restHighLevelClient.performRequestAsyncAndParseEntity(request, IndexLifecycleRequestConverters::getSnapshotLifecycleStats,
             options, GetSnapshotLifecycleStatsResponse::fromXContent, listener, emptySet());
     }
 }

client/rest-high-level/src/main/java/org/elasticsearch/client/SecurityClient.java

@@ -1036,9 +1036,9 @@ public final class SecurityClient {
      * @param options the request options (e.g. headers), use {@link RequestOptions#DEFAULT} if nothing needs to be customized
      * @param listener the listener to be notified upon request completion
      */
-    public void delegatePkiAuthenticationAsync(DelegatePkiAuthenticationRequest request, RequestOptions options,
+    public Cancellable delegatePkiAuthenticationAsync(DelegatePkiAuthenticationRequest request, RequestOptions options,
             ActionListener<DelegatePkiAuthenticationResponse> listener) {
-        restHighLevelClient.performRequestAsyncAndParseEntity(request, SecurityRequestConverters::delegatePkiAuthentication, options,
+        return restHighLevelClient.performRequestAsyncAndParseEntity(request, SecurityRequestConverters::delegatePkiAuthentication, options,
                 DelegatePkiAuthenticationResponse::fromXContent, listener, emptySet());
     }
 }

client/rest/licenses/httpclient-4.5.10.jar.sha1

@@ -0,0 +1 @@
+7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5

client/rest/licenses/httpclient-4.5.8.jar.sha1

@@ -1 +0,0 @@
-c27c9d6f15435dc2b6947112027b418b0eef32b9

client/rest/licenses/httpcore-4.4.11.jar.sha1

@@ -1 +0,0 @@
-de748cf874e4e193b42eceea9fe5574fabb9d4df

client/rest/licenses/httpcore-4.4.12.jar.sha1

@@ -0,0 +1 @@
+21ebaf6d532bc350ba95bd81938fa5f0e511c132

client/rest/licenses/httpcore-nio-4.4.11.jar.sha1

@@ -1 +0,0 @@
-7d0a97d01d39cff9aa3e6db81f21fddb2435f4e6

client/rest/licenses/httpcore-nio-4.4.12.jar.sha1

@@ -0,0 +1 @@
+84cd29eca842f31db02987cfedea245af020198b

client/rest/src/test/java/org/elasticsearch/client/RestClientMultipleHostsIntegTests.java

@@ -74,6 +74,7 @@ public class RestClientMultipleHostsIntegTests extends RestClientTestCase {
         int numHttpServers = randomIntBetween(2, 4);
         httpServers = new HttpServer[numHttpServers];
         httpHosts = new HttpHost[numHttpServers];
+        waitForCancelHandler = new WaitForCancelHandler();
         for (int i = 0; i < numHttpServers; i++) {
             HttpServer httpServer = createHttpServer();
             httpServers[i] = httpServer;
@@ -98,24 +99,30 @@ public class RestClientMultipleHostsIntegTests extends RestClientTestCase {
         for (int statusCode : getAllStatusCodes()) {
             httpServer.createContext(pathPrefix + "/" + statusCode, new ResponseHandler(statusCode));
         }
-        waitForCancelHandler = new WaitForCancelHandler();
         httpServer.createContext(pathPrefix + "/wait", waitForCancelHandler);
         return httpServer;
     }
 
     private static class WaitForCancelHandler implements HttpHandler {
-        private CountDownLatch cancelHandlerLatch;
+        private volatile CountDownLatch requestCameInLatch;
+        private volatile CountDownLatch cancelHandlerLatch;
 
         void reset() {
             cancelHandlerLatch = new CountDownLatch(1);
+            requestCameInLatch = new CountDownLatch(1);
         }
 
         void cancelDone() {
             cancelHandlerLatch.countDown();
         }
 
+        void awaitRequest() throws InterruptedException {
+            requestCameInLatch.await();
+        }
+
         @Override
         public void handle(HttpExchange exchange) throws IOException {
+            requestCameInLatch.countDown();
             try {
                 cancelHandlerLatch.await();
             } catch (InterruptedException ignore) {
@@ -226,15 +233,12 @@ public class RestClientMultipleHostsIntegTests extends RestClientTestCase {
 
     public void testCancelAsyncRequests() throws Exception {
         int numRequests = randomIntBetween(5, 20);
-        final CountDownLatch latch = new CountDownLatch(numRequests);
         final List<Response> responses = new CopyOnWriteArrayList<>();
         final List<Exception> exceptions = new CopyOnWriteArrayList<>();
         for (int i = 0; i < numRequests; i++) {
+            CountDownLatch latch = new CountDownLatch(1);
             waitForCancelHandler.reset();
-            final String method = RestClientTestUtil.randomHttpMethod(getRandom());
+            Cancellable cancellable = restClient.performRequestAsync(new Request("GET", "/wait"), new ResponseListener() {
-            //we don't test status codes that are subject to retries as they interfere with hosts being stopped
-            final int statusCode = randomBoolean() ? randomOkStatusCode(getRandom()) : randomErrorNoRetryStatusCode(getRandom());
-            Cancellable cancellable = restClient.performRequestAsync(new Request(method, "/" + statusCode), new ResponseListener() {
                 @Override
                 public void onSuccess(Response response) {
                     responses.add(response);
@@ -247,10 +251,15 @@ public class RestClientMultipleHostsIntegTests extends RestClientTestCase {
                     latch.countDown();
                 }
             });
+            if (randomBoolean()) {
+                //we wait for the request to get to the server-side otherwise we almost always cancel
+                // the request artificially on the client-side before even sending it
+                waitForCancelHandler.awaitRequest();
+            }
             cancellable.cancel();
             waitForCancelHandler.cancelDone();
-        }
             assertTrue(latch.await(5, TimeUnit.SECONDS));
+        }
         assertEquals(0, responses.size());
         assertEquals(numRequests, exceptions.size());
         for (Exception exception : exceptions) {

client/rest/src/test/java/org/elasticsearch/client/RestClientSingleHostIntegTests.java

@@ -105,7 +105,7 @@ public class RestClientSingleHostIntegTests extends RestClientTestCase {
         return httpServer;
     }
 
-    private class WaitForCancelHandler implements HttpHandler {
+    private static class WaitForCancelHandler implements HttpHandler {
 
         private final CountDownLatch cancelHandlerLatch = new CountDownLatch(1);
 
@@ -259,6 +259,8 @@ public class RestClientSingleHostIntegTests extends RestClientTestCase {
     /**
      * This test verifies some assumptions that we rely upon around the way the async http client works when reusing the same request
      * throughout multiple retries, and the use of the {@link HttpRequestBase#abort()} method.
+     * In fact the low-level REST client reuses the same request instance throughout multiple retries, and relies on the http client
+     * to set the future ref to the request properly so that when abort is called, the proper future gets cancelled.
      */
     public void testRequestResetAndAbort() throws Exception {
         try (CloseableHttpAsyncClient client = HttpAsyncClientBuilder.create().build()) {
@@ -273,10 +275,15 @@ public class RestClientSingleHostIntegTests extends RestClientTestCase {
             {
                 httpGet.reset();
                 assertFalse(httpGet.isAborted());
-                httpGet.abort();//this has no effect on the next call (although isAborted will return true until the next reset)
+                httpGet.abort();
                 Future<HttpResponse> future = client.execute(httpHost, httpGet, null);
-                assertEquals(200, future.get().getStatusLine().getStatusCode());
+                try {
-                assertFalse(future.isCancelled());
+                    future.get();
+                    fail("expected cancellation exception");
+                } catch(CancellationException e) {
+                    //expected
+                }
+                assertTrue(future.isCancelled());
             }
             {
                 httpGet.reset();

client/sniffer/licenses/httpclient-4.5.10.jar.sha1

@@ -0,0 +1 @@
+7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5

client/sniffer/licenses/httpclient-4.5.8.jar.sha1

@@ -1 +0,0 @@
-c27c9d6f15435dc2b6947112027b418b0eef32b9

client/sniffer/licenses/httpcore-4.4.11.jar.sha1

@@ -1 +0,0 @@
-de748cf874e4e193b42eceea9fe5574fabb9d4df

client/sniffer/licenses/httpcore-4.4.12.jar.sha1

@@ -0,0 +1 @@
+21ebaf6d532bc350ba95bd81938fa5f0e511c132

plugins/discovery-azure-classic/licenses/httpclient-4.5.10.jar.sha1

@@ -0,0 +1 @@
+7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5

plugins/discovery-azure-classic/licenses/httpclient-4.5.8.jar.sha1

@@ -1 +0,0 @@
-c27c9d6f15435dc2b6947112027b418b0eef32b9

plugins/discovery-azure-classic/licenses/httpcore-4.4.11.jar.sha1

@@ -1 +0,0 @@
-de748cf874e4e193b42eceea9fe5574fabb9d4df

plugins/discovery-azure-classic/licenses/httpcore-4.4.12.jar.sha1

@@ -0,0 +1 @@
+21ebaf6d532bc350ba95bd81938fa5f0e511c132

plugins/discovery-ec2/licenses/httpclient-4.5.10.jar.sha1

@@ -0,0 +1 @@
+7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5

plugins/discovery-ec2/licenses/httpclient-4.5.8.jar.sha1

@@ -1 +0,0 @@
-c27c9d6f15435dc2b6947112027b418b0eef32b9

plugins/discovery-ec2/licenses/httpcore-4.4.11.jar.sha1

@@ -1 +0,0 @@
-de748cf874e4e193b42eceea9fe5574fabb9d4df

plugins/discovery-ec2/licenses/httpcore-4.4.12.jar.sha1

@@ -0,0 +1 @@
+21ebaf6d532bc350ba95bd81938fa5f0e511c132

plugins/discovery-gce/licenses/httpclient-4.5.10.jar.sha1

@@ -0,0 +1 @@
+7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5

plugins/discovery-gce/licenses/httpclient-4.5.8.jar.sha1

@@ -1 +0,0 @@
-c27c9d6f15435dc2b6947112027b418b0eef32b9

plugins/discovery-gce/licenses/httpcore-4.4.11.jar.sha1

@@ -1 +0,0 @@
-de748cf874e4e193b42eceea9fe5574fabb9d4df

plugins/discovery-gce/licenses/httpcore-4.4.12.jar.sha1

@@ -0,0 +1 @@
+21ebaf6d532bc350ba95bd81938fa5f0e511c132

plugins/repository-gcs/licenses/httpclient-4.5.10.jar.sha1

@@ -0,0 +1 @@
+7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5

plugins/repository-gcs/licenses/httpclient-4.5.8.jar.sha1

@@ -1 +0,0 @@
-c27c9d6f15435dc2b6947112027b418b0eef32b9

plugins/repository-gcs/licenses/httpcore-4.4.11.jar.sha1

@@ -1 +0,0 @@
-de748cf874e4e193b42eceea9fe5574fabb9d4df

plugins/repository-gcs/licenses/httpcore-4.4.12.jar.sha1

@@ -0,0 +1 @@
+21ebaf6d532bc350ba95bd81938fa5f0e511c132

plugins/repository-s3/licenses/httpclient-4.5.10.jar.sha1

@@ -0,0 +1 @@
+7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5

plugins/repository-s3/licenses/httpclient-4.5.8.jar.sha1

@@ -1 +0,0 @@
-c27c9d6f15435dc2b6947112027b418b0eef32b9

plugins/repository-s3/licenses/httpcore-4.4.11.jar.sha1

@@ -1 +0,0 @@
-de748cf874e4e193b42eceea9fe5574fabb9d4df

plugins/repository-s3/licenses/httpcore-4.4.12.jar.sha1

@@ -0,0 +1 @@
+21ebaf6d532bc350ba95bd81938fa5f0e511c132

x-pack/plugin/core/licenses/httpclient-4.5.10.jar.sha1

@@ -0,0 +1 @@
+7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5

x-pack/plugin/core/licenses/httpclient-4.5.8.jar.sha1

@@ -1 +0,0 @@
-c27c9d6f15435dc2b6947112027b418b0eef32b9

x-pack/plugin/core/licenses/httpcore-4.4.11.jar.sha1

@@ -1 +0,0 @@
-de748cf874e4e193b42eceea9fe5574fabb9d4df

x-pack/plugin/core/licenses/httpcore-4.4.12.jar.sha1

@@ -0,0 +1 @@
+21ebaf6d532bc350ba95bd81938fa5f0e511c132

x-pack/plugin/core/licenses/httpcore-nio-4.4.11.jar.sha1

@@ -1 +0,0 @@
-7d0a97d01d39cff9aa3e6db81f21fddb2435f4e6

x-pack/plugin/core/licenses/httpcore-nio-4.4.12.jar.sha1

@@ -0,0 +1 @@
+84cd29eca842f31db02987cfedea245af020198b

x-pack/plugin/security/licenses/httpclient-cache-4.5.10.jar.sha1

@@ -0,0 +1 @@
+b195778247a21e980cb9f80c41364dc0c38feaef

x-pack/plugin/security/licenses/httpclient-cache-4.5.8.jar.sha1

@@ -1 +0,0 @@
-bb984b73da2153285b660f3e278498abd94ccbb5

x-pack/snapshot-tool/licenses/httpclient-4.5.10.jar.sha1

@@ -0,0 +1 @@
+7ca2e4276f4ef95e4db725a8cd4a1d1e7585b9e5

x-pack/snapshot-tool/licenses/httpclient-4.5.8.jar.sha1

@@ -1 +0,0 @@
-c27c9d6f15435dc2b6947112027b418b0eef32b9

x-pack/snapshot-tool/licenses/httpcore-4.4.11.jar.sha1

@@ -1 +0,0 @@
-de748cf874e4e193b42eceea9fe5574fabb9d4df

x-pack/snapshot-tool/licenses/httpcore-4.4.12.jar.sha1

@@ -0,0 +1 @@
+21ebaf6d532bc350ba95bd81938fa5f0e511c132