commit fcefd1e4b1e5db3d8e10e2836c5a0fa2a79aadc0
author Tobias Werth <twerth@google.com> Mon Nov 16 11:37:01 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Nov 16 11:38:52 2020 -0800
tree a6a582777c4bd7270077e81272d2d0f55ff21375
parent 26c3f50cd7e3a6171d36ffa5e35c3ab817fcb44b

Stop profilers in clean command test.

This became necessary after d5f96eb44a1fd70048a6bfb42b3e0f308b2dcb88
changed how we handle crashes.

```
bazel test --test_output=streamed --test_filter=CleanCommandRecommendsAsyncTest //src/test/java/com/google/devtools/build/lib:runtime-tests
```
passes now.

Closes #12494.

PiperOrigin-RevId: 342682889

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

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
index 7e43f37..a379166 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
@@ -44,6 +44,7 @@
 import com.google.devtools.build.lib.events.PrintingEventHandler;
 import com.google.devtools.build.lib.events.Reporter;
 import com.google.devtools.build.lib.events.StoredEventHandler;
+import com.google.devtools.build.lib.profiler.MemoryProfiler;
 import com.google.devtools.build.lib.profiler.Profiler;
 import com.google.devtools.build.lib.profiler.SilentCloseable;
 import com.google.devtools.build.lib.runtime.proto.InvocationPolicyOuterClass.InvocationPolicy;
@@ -621,6 +622,15 @@
           logger.atWarning().log("afterCommand yielded different result: %s %s", result, newResult);
         }
       }
+
+      try {
+        Profiler.instance().stop();
+        MemoryProfiler.instance().stop();
+      } catch (IOException e) {
+        env.getReporter()
+            .handle(Event.error("Error while writing profile file: " + e.getMessage()));
+      }
+
       // Swallow IOException, as we are already in a finally clause
       Flushables.flushQuietly(outErr.getOutputStream());
       Flushables.flushQuietly(outErr.getErrorStream());

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 3ad29cb..e6e7a61 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
@@ -677,13 +677,6 @@
       }
     }
 
-    try {
-      Profiler.instance().stop();
-      MemoryProfiler.instance().stop();
-    } catch (IOException e) {
-      env.getReporter().handle(Event.error("Error while writing profile file: " + e.getMessage()));
-    }
-
     env.getReporter().clearEventBus();
     retainedHeapLimiter.resetEventHandler();
     actionKeyContext.clear();