wassname/ray
1
0
Fork 0
mirror of https://github.com/wassname/ray.git synced 2026-06-28 02:30:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix java UT about multi-threading (#8014)

Browse Source
This commit is contained in:
Kai Yang
2020-04-27 15:11:22 +08:00
committed by GitHub
parent 7ec2223c84
commit 1d5bceddf0
2 changed files with 80 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/runtime/src/main/java/io/ray/runtime/task/LocalModeTaskSubmitter.java
+14 -7
View File
@@ -36,6 +36,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.RejectedExecutionException;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -227,21 +228,27 @@ public class LocalModeTaskSubmitter implements TaskSubmitter {
if (unreadyObjects.isEmpty()) {
// If all dependencies are ready, execute this task.
ExecutorService executorService;
if (taskSpec.getType() == TaskType.ACTOR_CREATION_TASK) {
ExecutorService actorExecutorService = Executors.newSingleThreadExecutor();
executorService = Executors.newSingleThreadExecutor();
synchronized (actorTaskExecutorServices) {
actorTaskExecutorServices.put(getActorId(taskSpec), actorExecutorService);
actorTaskExecutorServices.put(getActorId(taskSpec), executorService);
}
actorExecutorService.submit(runnable);
} else if (taskSpec.getType() == TaskType.ACTOR_TASK) {
synchronized (actorTaskExecutorServices) {
ExecutorService actorExecutorService =
actorTaskExecutorServices.get(getActorId(taskSpec));
actorExecutorService.submit(runnable);
executorService = actorTaskExecutorServices.get(getActorId(taskSpec));
}
} else {
// Normal task.
normalTaskExecutorService.submit(runnable);
executorService = normalTaskExecutorService;
}
try {
executorService.submit(runnable);
} catch (RejectedExecutionException e) {
if (executorService.isShutdown()) {
LOGGER.warn("Ignore task submission due to the ExecutorService is shutdown. Task: {}",
taskSpec);
}
}
} else {
// If some dependencies aren't ready yet, put this task in waiting list.