diff options
author | Michajlo Matijkiw <michajlo@google.com> | 2016-08-25 21:03:47 +0000 |
---|---|---|
committer | John Cater <jcater@google.com> | 2016-08-26 18:38:31 +0000 |
commit | e1f6380e5d80a2a98b159e4025c338e344a6c824 (patch) | |
tree | 161bde164804096f9f8ea4ed2d92a85fc3a728a1 | |
parent | f988a43bade16b81dfc7bcc2f50fc716a935eeb6 (diff) |
GRPC server waits for termination after clean command
There's a race between sending the finished message and shutdownNow. Use
shutdown instead to let the finished message send.
My IDE also auto-deleted some unnecessary casts, hope that drive by change is
ok.
--
MOS_MIGRATED_REVID=131328436
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java b/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java index 934206963a..cdd2fb4216 100644 --- a/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java +++ b/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java @@ -232,7 +232,7 @@ public class GrpcServerImpl extends RPCServer { random.nextBytes(bytes); StringBuilder result = new StringBuilder(); for (byte b : bytes) { - result.append(Integer.toHexString(((int) b) + 128)); + result.append(Integer.toHexString(b + 128)); } return result.toString(); @@ -276,8 +276,7 @@ public class GrpcServerImpl extends RPCServer { while (true) { if (!wasIdle && idle) { - shutdownTime = BlazeClock.nanoTime() - + ((long) maxIdleSeconds) * 1000L * NANOSECONDS_IN_MS; + shutdownTime = BlazeClock.nanoTime() + maxIdleSeconds * 1000L * NANOSECONDS_IN_MS; } try { @@ -444,12 +443,12 @@ public class GrpcServerImpl extends RPCServer { break; case CLEAN: - server.shutdownNow(); + server.shutdown(); break; case EXPUNGE: disableShutdownHooks(); - server.shutdownNow(); + server.shutdown(); break; } } |