commit d46a35351bcab14166b5541b471a477b1a8809ae
author Edwin Kempin <ekempin@google.com> Mon Jul 26 14:08:16 2021 +0200
committer Edwin Kempin <ekempin@google.com> Fri Jul 30 10:14:18 2021 +0200
tree 52e9e1c1d6c1a426366e0fbfdeae6ebf6f5ee7c7
parent 6c6212b3453d57ed1085d6223be2d7433ef04345

TraceTimer: Check at start and end whether the request is cancelled

TraceTimer is being used to measure and log execution times of important
and potentially long-running computations, as well as sub steps of these
operations. Hence the start/end of TraceTimer is a good place to check
whether the request is cancelled, and abort it if yes.

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I8111b39d889811ad66d54a37f304187943d0b196

java/com/google/gerrit/server/logging/BUILD

diff --git a/java/com/google/gerrit/server/logging/BUILD b/java/com/google/gerrit/server/logging/BUILD
index c60af0d..ee0168c 100644
--- a/java/com/google/gerrit/server/logging/BUILD
+++ b/java/com/google/gerrit/server/logging/BUILD
@@ -9,6 +9,7 @@
     deps = [
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/server/cancellation",
         "//java/com/google/gerrit/server/util/time",
         "//lib:gson",
         "//lib:guava",

java/com/google/gerrit/server/logging/TraceContext.java

diff --git a/java/com/google/gerrit/server/logging/TraceContext.java b/java/com/google/gerrit/server/logging/TraceContext.java
index 2fc19b5..681dfbc 100644
--- a/java/com/google/gerrit/server/logging/TraceContext.java
+++ b/java/com/google/gerrit/server/logging/TraceContext.java
@@ -24,6 +24,7 @@
 import com.google.common.collect.Table;
 import com.google.common.flogger.FluentLogger;
 import com.google.gerrit.common.Nullable;
+import com.google.gerrit.server.cancellation.RequestStateContext;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
@@ -208,6 +209,7 @@
     }
 
     private TraceTimer(Runnable startLogFn, Consumer<Long> doneLogFn) {
+      RequestStateContext.abortIfCancelled();
       startLogFn.run();
       this.doneLogFn = doneLogFn;
       this.stopwatch = Stopwatch.createStarted();
@@ -217,6 +219,7 @@
     public void close() {
       stopwatch.stop();
       doneLogFn.accept(stopwatch.elapsed(TimeUnit.MILLISECONDS));
+      RequestStateContext.abortIfCancelled();
     }
   }