Skip to content

TESTS: Remove Static Threadpool in TaskManagerTest #36976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
original-brownbear merged 1 commit into from
Jan 3, 2019
Merged

TESTS: Remove Static Threadpool in TaskManagerTest #36976

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions .../src/test/java/org/elasticsearch/action/admin/cluster/node/tasks/TaskManagerTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@
import org.elasticsearch.transport.TransportService;
import org.elasticsearch.transport.nio.MockNioTransport;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Before;

import java.io.IOException;
import java.util.Collections;
Expand All @@ -73,18 +72,17 @@
*/
public abstract class TaskManagerTestCase extends ESTestCase {

protected static ThreadPool threadPool;
public static final Settings CLUSTER_SETTINGS = Settings.builder().put("cluster.name", "test-cluster").build();
Copy link
Contributor Author

@original-brownbear original-brownbear Dec 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was just unused

protected ThreadPool threadPool;
protected TestNode[] testNodes;
protected int nodesCount;

@BeforeClass
public static void beforeClass() {
@Before
public void setupThreadPool() {
threadPool = new TestThreadPool(TransportTasksActionTests.class.getSimpleName());
}

@AfterClass
public static void afterClass() {
@After
public void tearDownThreadPool() {
ThreadPool.terminate(threadPool, 30, TimeUnit.SECONDS);
threadPool = null;
}
Expand Down