Merge pull request #540 from jglick/CpsVmExecutorService.shutdown

Call `CpsVmExecutorService.shutdown` from `CpsFlowExecution.suspendAll`

Author: dwnusbaum

src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java

@@ -1649,6 +1649,15 @@ public void pause(final boolean v) throws IOException {
                             }
                         }
                         cpsExec.checkpoint(true);
+                        cpsExec.runInCpsVmThread(new FutureCallback<CpsThreadGroup>() {
+                            @Override public void onSuccess(CpsThreadGroup g) {
+                                LOGGER.fine(() -> "shutting down CPS VM threadin for " + cpsExec);
+                                g.shutdown();
+                            }
+                            @Override public void onFailure(Throwable t) {
+                                LOGGER.log(Level.WARNING, null, t);
+                            }
+                        });
                     }
                 } catch (Exception ex) {
                     LOGGER.log(Level.WARNING, "Error persisting Pipeline execution at shutdown: "+((CpsFlowExecution) execution).owner, ex);

src/main/java/org/jenkinsci/plugins/workflow/cps/CpsStepContext.java

@@ -430,12 +430,9 @@ public void onSuccess(CpsThreadGroup g) {
                     }
                     outcome = new Outcome(null, new AlreadyCompleted());
                 }
-
-                /**
-                 * Program state failed to load.
-                 */
                 @Override
                 public void onFailure(Throwable t) {
+                    LOGGER.log(Level.WARNING, "Failed to proceed after " + CpsStepContext.this, t);
                 }
             });
         } catch (IOException x) {

src/main/java/org/jenkinsci/plugins/workflow/cps/CpsThreadGroup.java

@@ -640,6 +640,10 @@ private void propagateErrorToWorkflow(Throwable t) {
         }
     }
 
+    void shutdown() {
+        runner.shutdown();
+    }
+
     private static final Logger LOGGER = Logger.getLogger(CpsThreadGroup.class.getName());
 
     private static final long serialVersionUID = 1L;

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);