logTimings was being incorrectly called on a running build during Jenkins shutdown

jglick · jglick · commit 960a3f736534 · 2022-05-20T13:14:46.000-04:00
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorService.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsVmExecutorService.java
@@ -166,7 +166,7 @@ private void tearDown(ThreadContext context) {
         cpsThreadGroup.busy = false;
         context.restore();
         CpsFlowExecution execution = cpsThreadGroup.getExecution();
-        if (isShutdown()) {
+        if (isShutdown() && /* build completed, not just after suspendAll */!cpsThreadGroup.getThreads().iterator().hasNext()) {
             execution.logTimings();
         }
         CpsCallableInvocation.registerMismatchHandler(null);

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ private void tearDown(ThreadContext context) {`
`166`	`166`	`cpsThreadGroup.busy = false;`
`167`	`167`	`context.restore();`
`168`	`168`	`CpsFlowExecution execution = cpsThreadGroup.getExecution();`
`169`		`- if (isShutdown()) {`
	`169`	`+ if (isShutdown() && /* build completed, not just after suspendAll */!cpsThreadGroup.getThreads().iterator().hasNext()) {`
`170`	`170`	`execution.logTimings();`
`171`	`171`	`}`
`172`	`172`	`CpsCallableInvocation.registerMismatchHandler(null);`