Move BlazeRuntime/BlazeCommandDispatcher shutdown to where they are created.
RELNOTES: None.
PiperOrigin-RevId: 184692000
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
index 459e558..83c339d 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
@@ -618,8 +618,7 @@
* @param requestStrings
* @return the filtered request to write to the log.
*/
- @VisibleForTesting
- static String getRequestLogString(List<String> requestStrings) {
+ public static String getRequestLogString(List<String> requestStrings) {
StringBuilder buf = new StringBuilder();
buf.append('[');
String sep = "";
@@ -848,7 +847,27 @@
private static int serverMain(Iterable<BlazeModule> modules, OutErr outErr, String[] args) {
InterruptSignalHandler sigintHandler = null;
try {
- final RPCServer blazeServer = createBlazeRPCServer(modules, Arrays.asList(args));
+ final RPCServer[] rpcServer = new RPCServer[1];
+ Runnable prepareForAbruptShutdown = () -> rpcServer[0].prepareForAbruptShutdown();
+ BlazeRuntime runtime = newRuntime(modules, Arrays.asList(args), prepareForAbruptShutdown);
+ BlazeCommandDispatcher dispatcher = new BlazeCommandDispatcher(runtime);
+ CommandExecutor commandExecutor = new CommandExecutor(dispatcher);
+ BlazeServerStartupOptions startupOptions =
+ runtime.getStartupOptionsProvider().getOptions(BlazeServerStartupOptions.class);
+ try {
+ // This is necessary so that Bazel kind of works during bootstrapping, at which time the
+ // gRPC server is not compiled in so that we don't need gRPC for bootstrapping.
+ Class<?> factoryClass = Class.forName(
+ "com.google.devtools.build.lib.server.GrpcServerImpl$Factory");
+ RPCServer.Factory factory = (RPCServer.Factory) factoryClass.getConstructor().newInstance();
+ rpcServer[0] = factory.create(commandExecutor, runtime.getClock(),
+ startupOptions.commandPort,
+ runtime.getWorkspace().getWorkspace(),
+ runtime.getServerDirectory(),
+ startupOptions.maxIdleSeconds);
+ } catch (ReflectiveOperationException | IllegalArgumentException e) {
+ throw new AbruptExitException("gRPC server not compiled in", ExitCode.BLAZE_INTERNAL_ERROR);
+ }
// Register the signal handler.
sigintHandler =
@@ -856,11 +875,13 @@
@Override
public void run() {
logger.severe("User interrupt");
- blazeServer.interrupt();
+ rpcServer[0].interrupt();
}
};
- blazeServer.serve();
+ rpcServer[0].serve();
+ runtime.shutdown();
+ dispatcher.shutdown();
return ExitCode.SUCCESS.getNumericExitCode();
} catch (OptionsParsingException e) {
outErr.printErr(e.getMessage());
@@ -896,40 +917,6 @@
}
/**
- * Creates and returns a new Blaze RPCServer. Call {@link RPCServer#serve()} to start the server.
- */
- @SuppressWarnings("LiteralClassName") // bootstrap binary does not have gRPC
- private static RPCServer createBlazeRPCServer(
- Iterable<BlazeModule> modules, List<String> args)
- throws IOException, OptionsParsingException, AbruptExitException {
- final RPCServer[] rpcServer = new RPCServer[1];
- Runnable prepareForAbruptShutdown = () -> rpcServer[0].prepareForAbruptShutdown();
-
- BlazeRuntime runtime = newRuntime(modules, args, prepareForAbruptShutdown);
- BlazeCommandDispatcher dispatcher = new BlazeCommandDispatcher(runtime);
- CommandExecutor commandExecutor = new CommandExecutor(runtime, dispatcher);
-
- BlazeServerStartupOptions startupOptions =
- runtime.getStartupOptionsProvider().getOptions(BlazeServerStartupOptions.class);
- try {
- // This is necessary so that Bazel kind of works during bootstrapping, at which time the
- // gRPC server is not compiled in so that we don't need gRPC for bootstrapping.
- Class<?> factoryClass = Class.forName(
- "com.google.devtools.build.lib.server.GrpcServerImpl$Factory");
- RPCServer.Factory factory = (RPCServer.Factory) factoryClass.getConstructor().newInstance();
- rpcServer[0] = factory.create(commandExecutor, runtime.getClock(),
- startupOptions.commandPort,
- runtime.getWorkspace().getWorkspace(),
- runtime.getServerDirectory(),
- startupOptions.maxIdleSeconds);
- return rpcServer[0];
- } catch (ReflectiveOperationException | IllegalArgumentException e) {
- throw new AbruptExitException("gRPC server not compiled in", ExitCode.BLAZE_INTERNAL_ERROR);
- }
-
- }
-
- /**
* Parses the command line arguments into a {@link OptionsParser} object.
*
* <p>This function needs to parse the --option_sources option manually so that the real option
