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

Reduce test load in TaskManagerTests

This commit is contained in:
Nhat Nguyen 2020-05-13 23:51:31 -04:00
parent 87a10806ab
commit ac432f6612
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/test/java/org/elasticsearch/tasks/TaskManagerTests.java
View File

@ -45,6 +45,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.Phaser; import java.util.concurrent.Phaser;
import java.util.concurrent.TimeUnit;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@ -115,7 +116,7 @@ public class TaskManagerTests extends ESTestCase {
expectedCancelledTasks.add(task); expectedCancelledTasks.add(task);
} }
} }
assertBusy(() -> assertThat(cancelledTasks, equalTo(expectedCancelledTasks))); assertBusy(() -> assertThat(cancelledTasks, equalTo(expectedCancelledTasks)), 30, TimeUnit.SECONDS);
for (FakeTcpChannel channel : channels) { for (FakeTcpChannel channel : channels) {
channel.close(); channel.close();
} }
@ -132,7 +133,7 @@ public class TaskManagerTests extends ESTestCase {
} }
}); });
Set<Task> expectedCancelledTasks = ConcurrentCollections.newConcurrentSet(); Set<Task> expectedCancelledTasks = ConcurrentCollections.newConcurrentSet();
FakeTcpChannel[] channels = new FakeTcpChannel[randomIntBetween(2, 20)]; FakeTcpChannel[] channels = new FakeTcpChannel[randomIntBetween(1, 10)];
for (int i = 0; i < channels.length; i++) { for (int i = 0; i < channels.length; i++) {
channels[i] = new FakeTcpChannel(); channels[i] = new FakeTcpChannel();
} }
@ -142,7 +143,7 @@ public class TaskManagerTests extends ESTestCase {
String threadName = "thread-" + t; String threadName = "thread-" + t;
threads[t] = new Thread(() -> { threads[t] = new Thread(() -> {
phaser.arriveAndAwaitAdvance(); phaser.arriveAndAwaitAdvance();
int iterations = randomIntBetween(100, 1000); int iterations = randomIntBetween(50, 500);
for (int i = 0; i < iterations; i++) { for (int i = 0; i < iterations; i++) {
final FakeTcpChannel channel = randomFrom(channels); final FakeTcpChannel channel = randomFrom(channels);
final Task task = taskManager.register("transport", "test", new CancellableRequest(threadName + ":" + i)); final Task task = taskManager.register("transport", "test", new CancellableRequest(threadName + ":" + i));
@ -161,7 +162,7 @@ public class TaskManagerTests extends ESTestCase {
for (Thread thread : threads) { for (Thread thread : threads) {
thread.join(); thread.join();
} }
assertBusy(() -> assertThat(cancelledTasks, equalTo(expectedCancelledTasks))); assertBusy(() -> assertThat(cancelledTasks, equalTo(expectedCancelledTasks)), 1, TimeUnit.MINUTES);
assertThat(taskManager.numberOfChannelPendingTaskTrackers(), equalTo(0)); assertThat(taskManager.numberOfChannelPendingTaskTrackers(), equalTo(0));
} }