commit 7be337f50d7b14205c56ec75d86bd9a7e835fbe5
author Janak Ramakrishnan <janakr@google.com> Thu Jan 05 20:21:35 2017 +0000
committer John Cater <jcater@google.com> Thu Jan 05 21:10:56 2017 +0000
tree 6518a43eba7679bd5f339d82d11f0f1c234aa6e9
parent bf51766b1ec67159b1c55889ac55a2e37faeeb02

Rollback of commit 70c5790e4fb01db382d61d457596a46b68ba8d13.

(Tests kept.)

*** Reason for rollback ***

[]

*** Original change description ***

When --experimental_oom_more_eagerly is enabled, tell Bazel to exit with an OutOfMemoryError and have the JVM send Bazel a SIGUSR2 when it detects an OOM. This should help in certain pathological cases when Bazel GC thrashes for some time after an OOM has been detected.

--
PiperOrigin-RevId: 143694970
MOS_MIGRATED_REVID=143694970

src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java

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 74c49f4..532923c 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
@@ -698,7 +698,7 @@
 
     new InterruptSignalHandler() {
       @Override
-      protected void onSignal() {
+      public void run() {
         LOG.info("User interrupt");
         OutErr.SYSTEM_OUT_ERR.printErrLn("Blaze received an interrupt");
         mainThread.interrupt();
@@ -764,13 +764,14 @@
       final RPCServer blazeServer = createBlazeRPCServer(modules, Arrays.asList(args));
 
       // Register the signal handler.
-       sigintHandler = new InterruptSignalHandler() {
-        @Override
-        protected void onSignal() {
-          LOG.severe("User interrupt");
-          blazeServer.interrupt();
-        }
-      };
+      sigintHandler =
+          new InterruptSignalHandler() {
+            @Override
+            public void run() {
+              LOG.severe("User interrupt");
+              blazeServer.interrupt();
+            }
+          };
 
       blazeServer.serve();
       return ExitCode.SUCCESS.getNumericExitCode();
@@ -902,9 +903,6 @@
     if (startupOptions.oomMoreEagerlyThreshold != 100) {
       new RetainedHeapLimiter(startupOptions.oomMoreEagerlyThreshold).install();
     }
-    if (startupOptions.oomMoreEagerly) {
-      new OomSignalHandler();
-    }
     PathFragment workspaceDirectory = startupOptions.workspaceDirectory;
     PathFragment installBase = startupOptions.installBase;
     PathFragment outputBase = startupOptions.outputBase;