honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Hendrik Muhs 2019-09-05 21:59:37 +02:00
parent 327da31db4
commit 78824cce81
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
x-pack/plugin/data-frame/src/test/java/org/elasticsearch/xpack/dataframe/checkpoint/DataFrameTransformCheckpointServiceNodeTests.java
View File

@ -50,7 +50,7 @@ import org.elasticsearch.xpack.core.dataframe.transforms.DataFrameTransformProgr
import org.elasticsearch.xpack.dataframe.DataFrameSingleNodeTestCase; import org.elasticsearch.xpack.dataframe.DataFrameSingleNodeTestCase;
import org.elasticsearch.xpack.dataframe.notifications.DataFrameAuditor; import org.elasticsearch.xpack.dataframe.notifications.DataFrameAuditor;
import org.elasticsearch.xpack.dataframe.persistence.DataFrameTransformsConfigManager; import org.elasticsearch.xpack.dataframe.persistence.DataFrameTransformsConfigManager;
import org.junit.After; import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import java.nio.file.Path; import java.nio.file.Path;
@ -67,8 +67,12 @@ import static org.mockito.Mockito.when;
public class DataFrameTransformCheckpointServiceNodeTests extends DataFrameSingleNodeTestCase { 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 DataFrameTransformsConfigManager transformsConfigManager;
private MockClientForCheckpointing mockClientForCheckpointing;
private DataFrameTransformsCheckpointService transformsCheckpointService; private DataFrameTransformsCheckpointService transformsCheckpointService;
private class MockClientForCheckpointing extends NoOpClient { private class MockClientForCheckpointing extends NoOpClient {
@ -121,18 +125,22 @@ public class DataFrameTransformCheckpointServiceNodeTests extends DataFrameSingl
@Before @Before
public void createComponents() { 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()); transformsConfigManager = new DataFrameTransformsConfigManager(client(), xContentRegistry());
// use a mock for the checkpoint service // use a mock for the checkpoint service
mockClientForCheckpointing = new MockClientForCheckpointing(getTestName());
DataFrameAuditor mockAuditor = mock(DataFrameAuditor.class); DataFrameAuditor mockAuditor = mock(DataFrameAuditor.class);
transformsCheckpointService = new DataFrameTransformsCheckpointService(mockClientForCheckpointing, transformsCheckpointService = new DataFrameTransformsCheckpointService(mockClientForCheckpointing,
transformsConfigManager, transformsConfigManager,
mockAuditor); mockAuditor);
} }
@After @AfterClass
public void tearDownClient() { public static void tearDownClient() {
mockClientForCheckpointing.close(); mockClientForCheckpointing.close();
} }