Merge pull request #19 from jglick/suspendAll-JENKINS-34281

[JENKINS-34281] Lost FlowExecutionList entries
jenkinsci · Jun 9, 2016 · 22d28c2 · 22d28c2
2 parents 865c21b + d20d2b3
commit 22d28c2
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java
@@ -103,9 +103,9 @@
 import java.beans.Introspector;
 import java.util.LinkedHashMap;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import javax.annotation.CheckForNull;
 import javax.annotation.concurrent.GuardedBy;
+import jenkins.security.NotReallyRoleSensitiveCallable;
 
 import org.acegisecurity.Authentication;
 import org.acegisecurity.userdetails.UsernameNotFoundException;
@@ -885,19 +885,24 @@ public String getNextScriptName(String path) {
     }
 
     @Restricted(DoNotUse.class)
-    @Terminator public static void suspendAll() throws InterruptedException, ExecutionException, TimeoutException {
-        LOGGER.fine("starting to suspend all executions");
-        for (FlowExecution execution : FlowExecutionList.get()) {
-            if (execution instanceof CpsFlowExecution) {
-                LOGGER.log(Level.FINE, "waiting to suspend {0}", execution);
-                CpsFlowExecution exec = (CpsFlowExecution) execution;
-                // Like waitForSuspension but with a timeout:
-                if (exec.programPromise != null) {
-                    exec.programPromise.get(1, TimeUnit.MINUTES).scheduleRun().get(1, TimeUnit.MINUTES);
+    @Terminator public static void suspendAll() throws Exception {
+        ACL.impersonate(ACL.SYSTEM, new NotReallyRoleSensitiveCallable<Void,Exception>() { // TODO Jenkins 2.1+ remove JENKINS-34281 workaround
+            @Override public Void call() throws Exception {
+                LOGGER.fine("starting to suspend all executions");
+                for (FlowExecution execution : FlowExecutionList.get()) {
+                    if (execution instanceof CpsFlowExecution) {
+                        LOGGER.log(Level.FINE, "waiting to suspend {0}", execution);
+                        CpsFlowExecution exec = (CpsFlowExecution) execution;
+                        // Like waitForSuspension but with a timeout:
+                        if (exec.programPromise != null) {
+                            exec.programPromise.get(1, TimeUnit.MINUTES).scheduleRun().get(1, TimeUnit.MINUTES);
+                        }
+                    }
                 }
+                LOGGER.fine("finished suspending all executions");
+                return null;
             }
-        }
-        LOGGER.fine("finished suspending all executions");
+        });
     }
 
     // TODO: write a custom XStream Converter so that while we are writing CpsFlowExecution, it holds that lock