From a42ded9ef46fa31f7ff5f6756c956a2d14b478c5 Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Mon, 21 Oct 2019 10:59:39 +0200 Subject: [PATCH 1/5] Reenable azure repository tests and lower down max error per request --- .../repositories/azure/AzureBlobStoreRepositoryTests.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureBlobStoreRepositoryTests.java b/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureBlobStoreRepositoryTests.java index a43a96a438d03..d3c8e8be10039 100644 --- a/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureBlobStoreRepositoryTests.java +++ b/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureBlobStoreRepositoryTests.java @@ -82,7 +82,7 @@ protected Map createHttpHandlers() { @Override protected HttpHandler createErroneousHttpHandler(final HttpHandler delegate) { - return new AzureErroneousHttpHandler(delegate, randomIntBetween(2, 3)); + return new AzureErroneousHttpHandler(delegate, 2); } @Override @@ -265,10 +265,4 @@ protected String requestUniqueId(final HttpExchange exchange) { + (range != null ? " " + range : ""); } } - - @Override - @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/47948") - public void testIndicesDeletedFromRepository() throws Exception { - - } } From e8e961042c3817341ed2e1a3c6885e55786035d3 Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Mon, 21 Oct 2019 11:33:21 +0200 Subject: [PATCH 2/5] Use Executor service --- .../ESMockAPIBasedRepositoryIntegTestCase.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java index e47bdeee3c225..173d67b9109c0 100644 --- a/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java @@ -41,6 +41,9 @@ import java.net.InetSocketAddress; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; @@ -54,11 +57,14 @@ public abstract class ESMockAPIBasedRepositoryIntegTestCase extends ESBlobStoreRepositoryIntegTestCase { private static HttpServer httpServer; + private static ExecutorService executorService; private Map handlers; @BeforeClass public static void startHttpServer() throws Exception { + executorService = Executors.newCachedThreadPool(); httpServer = MockHttpServer.createHttp(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0); + httpServer.setExecutor(executorService); httpServer.start(); } @@ -75,9 +81,11 @@ public void setUpHttpServer() { } @AfterClass - public static void stopHttpServer() { + public static void stopHttpServer() throws Exception { httpServer.stop(0); httpServer = null; + executorService.shutdown(); + assertTrue(executorService.awaitTermination(10L, TimeUnit.SECONDS)); } @After From d587675443e9a2f28ebf4f93c7118eff76a1a47f Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Mon, 21 Oct 2019 17:56:14 +0200 Subject: [PATCH 3/5] Revert "Use Executor service" This reverts commit e8e961042c3817341ed2e1a3c6885e55786035d3. --- .../ESMockAPIBasedRepositoryIntegTestCase.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java index 173d67b9109c0..e47bdeee3c225 100644 --- a/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java @@ -41,9 +41,6 @@ import java.net.InetSocketAddress; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; @@ -57,14 +54,11 @@ public abstract class ESMockAPIBasedRepositoryIntegTestCase extends ESBlobStoreRepositoryIntegTestCase { private static HttpServer httpServer; - private static ExecutorService executorService; private Map handlers; @BeforeClass public static void startHttpServer() throws Exception { - executorService = Executors.newCachedThreadPool(); httpServer = MockHttpServer.createHttp(new InetSocketAddress(InetAddress.getLoopbackAddress(), 0), 0); - httpServer.setExecutor(executorService); httpServer.start(); } @@ -81,11 +75,9 @@ public void setUpHttpServer() { } @AfterClass - public static void stopHttpServer() throws Exception { + public static void stopHttpServer() { httpServer.stop(0); httpServer = null; - executorService.shutdown(); - assertTrue(executorService.awaitTermination(10L, TimeUnit.SECONDS)); } @After From af9718bb31d5f8df61456a7beb6498cf58ae159f Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Mon, 21 Oct 2019 17:56:56 +0200 Subject: [PATCH 4/5] Restore randomIntBetween(2, 3) --- .../repositories/azure/AzureBlobStoreRepositoryTests.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureBlobStoreRepositoryTests.java b/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureBlobStoreRepositoryTests.java index d3c8e8be10039..28993bd475a06 100644 --- a/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureBlobStoreRepositoryTests.java +++ b/plugins/repository-azure/src/test/java/org/elasticsearch/repositories/azure/AzureBlobStoreRepositoryTests.java @@ -82,7 +82,7 @@ protected Map createHttpHandlers() { @Override protected HttpHandler createErroneousHttpHandler(final HttpHandler delegate) { - return new AzureErroneousHttpHandler(delegate, 2); + return new AzureErroneousHttpHandler(delegate, randomIntBetween(2, 3)); } @Override From 26a490ac6ecb78053a029fb1e30a91d14033380f Mon Sep 17 00:00:00 2001 From: Tanguy Leroux Date: Mon, 21 Oct 2019 17:58:09 +0200 Subject: [PATCH 5/5] Remove randomBoolean() --- .../blobstore/ESMockAPIBasedRepositoryIntegTestCase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java b/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java index e47bdeee3c225..4876f64301204 100644 --- a/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java +++ b/test/framework/src/main/java/org/elasticsearch/repositories/blobstore/ESMockAPIBasedRepositoryIntegTestCase.java @@ -157,7 +157,7 @@ public void handle(final HttpExchange exchange) throws IOException { final boolean canFailRequest = canFailRequest(exchange); final int count = requests.computeIfAbsent(requestId, req -> new AtomicInteger(0)).incrementAndGet(); - if (count >= maxErrorsPerRequest || canFailRequest == false || randomBoolean()) { + if (count >= maxErrorsPerRequest || canFailRequest == false) { requests.remove(requestId); delegate.handle(exchange); } else {