reuse mock client to avoid probles with thread context closed errors (#…

…46398)
elastic · Sep 6, 2019 · 78824cc · 78824cc
1 parent 327da31
commit 78824cc
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/...lasticsearch/xpack/dataframe/checkpoint/DataFrameTransformCheckpointServiceNodeTests.java b/...lasticsearch/xpack/dataframe/checkpoint/DataFrameTransformCheckpointServiceNodeTests.java
@@ -50,7 +50,7 @@
 import org.elasticsearch.xpack.dataframe.DataFrameSingleNodeTestCase;
 import org.elasticsearch.xpack.dataframe.notifications.DataFrameAuditor;
 import org.elasticsearch.xpack.dataframe.persistence.DataFrameTransformsConfigManager;
-import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
 
 import java.nio.file.Path;
@@ -67,8 +67,12 @@
 
 public class DataFrameTransformCheckpointServiceNodeTests extends DataFrameSingleNodeTestCase {
 
+    // re-use the mock client for the whole test suite as the underlying thread pool and the
+    // corresponding context if recreated cause unreliable test execution
+    // see https://github.com/elastic/elasticsearch/issues/45238 and https://github.com/elastic/elasticsearch/issues/42577
+    private static MockClientForCheckpointing mockClientForCheckpointing = null;
+
     private DataFrameTransformsConfigManager transformsConfigManager;
-    private MockClientForCheckpointing mockClientForCheckpointing;
     private DataFrameTransformsCheckpointService transformsCheckpointService;
 
     private class MockClientForCheckpointing extends NoOpClient {
@@ -121,18 +125,22 @@ void doExecute(ActionType<Response> action, Request request, ActionListener<Resp
 
     @Before
     public void createComponents() {
+        // it's not possible to run it as @BeforeClass as clients aren't initialized
+        if (mockClientForCheckpointing == null) {
+            mockClientForCheckpointing = new MockClientForCheckpointing("DataFrameTransformCheckpointServiceNodeTests");
+        }
+
         transformsConfigManager = new DataFrameTransformsConfigManager(client(), xContentRegistry());
 
         // use a mock for the checkpoint service
-        mockClientForCheckpointing = new MockClientForCheckpointing(getTestName());
         DataFrameAuditor mockAuditor = mock(DataFrameAuditor.class);
         transformsCheckpointService = new DataFrameTransformsCheckpointService(mockClientForCheckpointing,
                                                                                transformsConfigManager,
                                                                                mockAuditor);
     }
 
-    @After
-    public void tearDownClient() {
+    @AfterClass
+    public static void tearDownClient() {
         mockClientForCheckpointing.close();
     }