[FIXED JENKINS-22941] AsynchronousExecution.blocksRestart

jenkinsci · Mar 24, 2015 · 8589b21 · 8589b21
1 parent d073f79
commit 8589b21
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 7 deletions.
diff --git a/core/src/main/java/hudson/model/Executor.java b/core/src/main/java/hudson/model/Executor.java
@@ -413,6 +413,14 @@ public boolean isActive() {
         return !started || asynchronousExecution != null || isAlive();
     }
 
+    /**
+     * If currently running in asynchronous mode, returns that handle.
+     * @since TODO
+     */
+    public @CheckForNull AsynchronousExecution getAsynchronousExecution() {
+        return asynchronousExecution;
+    }
+
     /**
      * Returns true if this executor is waiting for a task to execute.
      */

diff --git a/core/src/main/java/hudson/model/RestartListener.java b/core/src/main/java/hudson/model/RestartListener.java
@@ -6,6 +6,7 @@
 import jenkins.model.Jenkins;
 
 import java.io.IOException;
+import jenkins.model.queue.AsynchronousExecution;
 
 /**
  * Extension point that allows plugins to veto the restart.
@@ -46,12 +47,39 @@ public static boolean isAllReady() throws IOException, InterruptedException {
 
     /**
      * Default logic. Wait for all the executors to become idle.
+     * @see AsynchronousExecution#blocksRestart
      */
     @Extension
     public static class Default extends RestartListener {
         @Override
         public boolean isReadyToRestart() throws IOException, InterruptedException {
-            return new ComputerSet().getBusyExecutors() == 0;
+            for (Computer c : Jenkins.getInstance().getComputers()) {
+                if (c.isOnline()) {
+                    for (Executor e : c.getExecutors()) {
+                        if (blocksRestart(e)) {
+                            return false;
+                        }
+                    }
+                    for (Executor e : c.getOneOffExecutors()) {
+                        if (blocksRestart(e)) {
+                            return false;
+                        }
+                    }
+                }
+            }
+            return true;
+        }
+        private static boolean blocksRestart(Executor e) {
+            if (e.isBusy()) {
+                AsynchronousExecution execution = e.getAsynchronousExecution();
+                if (execution != null) {
+                    return execution.blocksRestart();
+                } else {
+                    return true;
+                }
+            } else {
+                return false;
+            }
         }
     }
 }
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
@@ -252,7 +252,6 @@
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
-import java.io.FileFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
@@ -3492,16 +3491,13 @@ public void run() {
                     LOGGER.severe(String.format("Shutting down VM as requested by %s from %s",
                                                 exitUser, exitAddr));
                     // Wait 'til we have no active executors.
-                    while (isQuietingDown
-                           && (overallLoad.computeTotalExecutors() > overallLoad.computeIdleExecutors())) {
-                        Thread.sleep(5000);
-                    }
+                    doQuietDown(true, 0);
                     // Make sure isQuietingDown is still true.
                     if (isQuietingDown) {
                         cleanUp();
                         System.exit(0);
                     }
-                } catch (InterruptedException e) {
+                } catch (Exception e) {
                     LOGGER.log(Level.WARNING, "Failed to shutdown Hudson",e);
                 }
             }

diff --git a/core/src/main/java/jenkins/model/queue/AsynchronousExecution.java b/core/src/main/java/jenkins/model/queue/AsynchronousExecution.java
@@ -65,6 +65,15 @@ protected AsynchronousExecution() {}
      */
     public abstract void interrupt(boolean forShutdown);
 
+    /**
+     * Allows an executable to indicate whether it is currently doing something which should prevent Jenkins from being shut down safely.
+     * You may return false if it is fine for an administrator to exit/restart Jenkins despite this executable still being running.
+     * (If so, {@link #interrupt} will be passed {@code forShutdown=true}.)
+     * @return traditionally always true
+     * @see hudson.model.RestartListener.Default#isReadyToRestart
+     */
+    public abstract boolean blocksRestart();
+
     /**
      * Obtains the associated executor.
      */