From 4a0c110f7d633df0abb3b02dd2387d43d4ee5eba Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Mon, 18 Apr 2016 16:59:21 -0700 Subject: [PATCH] Merge pull request #1687 from grpc/java_qps_take_two Fix QpsWorker shutdown properly --- .../java/io/grpc/benchmarks/driver/LoadWorker.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/benchmarks/src/main/java/io/grpc/benchmarks/driver/LoadWorker.java b/benchmarks/src/main/java/io/grpc/benchmarks/driver/LoadWorker.java index 7938e808d0..c34e4f64cf 100644 --- a/benchmarks/src/main/java/io/grpc/benchmarks/driver/LoadWorker.java +++ b/benchmarks/src/main/java/io/grpc/benchmarks/driver/LoadWorker.java @@ -31,6 +31,8 @@ package io.grpc.benchmarks.driver; +import com.google.common.util.concurrent.ThreadFactoryBuilder; + import io.grpc.Status; import io.grpc.benchmarks.proto.Control; import io.grpc.benchmarks.proto.WorkerServiceGrpc; @@ -55,7 +57,11 @@ public class LoadWorker { LoadWorker(int driverPort, int serverPort) throws Exception { this.serverPort = serverPort; - NioEventLoopGroup singleThreadGroup = new NioEventLoopGroup(1); + NioEventLoopGroup singleThreadGroup = new NioEventLoopGroup(1, + new ThreadFactoryBuilder() + .setDaemon(true) + .setNameFormat("load-worker-%d") + .build()); this.driverServer = NettyServerBuilder.forPort(driverPort) .directExecutor() .workerEventLoopGroup(singleThreadGroup) @@ -119,9 +125,7 @@ public class LoadWorker { log.log(Level.INFO, "DriverServer has terminated."); // Allow enough time for quitWorker to deliver OK status to the driver. - // Also make sure this process actually exits (see #1685). Thread.sleep(3000); - System.exit(0); } /**