Merge pull request #100 from jglick/Timer

[JENKINS-40613] Report a blocked Timer
jenkinsci · Jan 26, 2017 · b7c48db · b7c48db
2 parents b131f68 + aac29d0
commit b7c48db
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/src/main/java/com/cloudbees/jenkins/support/impl/ThreadDumps.java b/src/main/java/com/cloudbees/jenkins/support/impl/ThreadDumps.java
@@ -36,10 +36,12 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import jenkins.util.Timer;
 
 /**
  * Thread dumps from the nodes.
@@ -77,6 +79,17 @@ public void writeTo(OutputStream os) throws IOException {
                         } finally {
                             out.flush();
                         }
+                        try {
+                            Timer.get().submit(new Runnable() {
+                                @Override
+                                public void run() {/* OK */}
+                            }).get(10, TimeUnit.SECONDS);
+                        } catch (ExecutionException | InterruptedException x) {
+                            logger.log(Level.WARNING, null, x);
+                        } catch (TimeoutException x) {
+                            ScheduledThreadPoolExecutor timer = (ScheduledThreadPoolExecutor) Timer.get();
+                            out.println("*WARNING*: jenkins.util.Timer is unresponsive; pool size " + timer.getPoolSize() + " vs. active count " + timer.getActiveCount());
+                        }
                         try {
                             threadDump(os);
                         } finally {