[FIXED JENKINS-35160] - Job deletion: Wait up to 15 seconds for interrupted builds to complete

core/src/main/java/hudson/model/Job.java

@@ -24,6 +24,7 @@
 package hudson.model;
 
 import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+import hudson.AbortException;
 import hudson.BulkChange;
 import hudson.EnvVars;
 import hudson.Extension;
@@ -36,6 +37,7 @@
 import hudson.model.Fingerprint.RangeSet;
 import hudson.model.PermalinkProjectAction.Permalink;
 import hudson.model.listeners.ItemListener;
+import hudson.model.queue.WorkUnit;
 import hudson.search.QuickSilver;
 import hudson.search.SearchIndex;
 import hudson.search.SearchIndexBuilder;
@@ -70,10 +72,13 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.GregorianCalendar;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.SortedMap;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.annotation.CheckForNull;
@@ -262,20 +267,6 @@ public void onCopied(Item src, Item item) {
         }
     }
 
-    @Override
-    protected void performDelete() throws IOException, InterruptedException {
-        // if a build is in progress. Cancel it.
-        RunT lb = getLastBuild();
-        if (lb != null) {
-            Executor e = lb.getExecutor();
-            if (e != null) {
-                e.interrupt();
-                // should we block until the build is cancelled?
-            }
-        }
-        super.performDelete();
-    }
-
     /*package*/ TextFile getNextBuildNumberFile() {
         return new TextFile(new File(this.getRootDir(), "nextBuildNumber"));
     }
@@ -679,7 +670,54 @@ public void movedTo(DirectlyModifiableTopLevelItemGroup destination, AbstractIte
         }
     }
 
-    @Override public void delete() throws IOException, InterruptedException {
+    @Override
+    public void delete() throws IOException, InterruptedException {
+        checkPermission(DELETE);
+        // if a build is in progress. Cancel it.
+        if (this instanceof Queue.Task) {
+            // clear any items in the queue so they do not get picket up
+            Queue.getInstance().cancel((Queue.Task) this);
+            // interrupt any builds in progress
+            Map<Queue.Executable, Executor> building = new LinkedHashMap<>();
+            for (Computer c : Jenkins.getInstance().getComputers()) {
+                for (Executor e : c.getOneOffExecutors()) {
+                    WorkUnit workUnit = e.getCurrentWorkUnit();
+                    if (workUnit != null && (workUnit.work == this || workUnit.work.getOwnerTask() == this)) {
+                        building.put(e.getCurrentExecutable(), e);
+                        e.interrupt();
+                    }
+                }
+                for (Executor e : c.getExecutors()) {
+                    WorkUnit workUnit = e.getCurrentWorkUnit();
+                    if (workUnit != null && (workUnit.work == this || workUnit.work.getOwnerTask() == this)) {
+                        building.put(e.getCurrentExecutable(), e);
+                        e.interrupt();
+                    }
+                }
+            }
+            if (!building.isEmpty()) {
+                // give them 15 seconds or so to respond to the interrupt
+                long expiration = System.nanoTime() + TimeUnit.SECONDS.toNanos(15);
+                // comparison with executor.getCurrentExecutable() == computation currently should always be true
+                // as we no longer recycle Executors, but safer to future-proof in case we ever revisit recycling
+                while (!building.isEmpty() && expiration - System.nanoTime() > 0L) {
+                    for (Iterator<Map.Entry<Queue.Executable, Executor>> iterator = building.entrySet().iterator();
+                         iterator.hasNext(); ) {
+                        Map.Entry<Queue.Executable, Executor> entry = iterator.next();
+                        // comparison with executor.getCurrentExecutable() == executable currently should always be true
+                        // as we no longer recycle Executors, but safer to future-proof in case we ever revisit recycling
+
+                        if (!entry.getValue().isAlive() || entry.getKey() != entry.getValue().getCurrentExecutable()) {
+                            iterator.remove();
+                        }
+                    }
+                    Thread.sleep(50L);
+                }
+                if (!building.isEmpty()) {
+                    throw new AbortException(Messages.Job_FailureToStopBuilds(building.size(), getFullDisplayName()));
+                }
+            }
+        }
         super.delete();
         Util.deleteRecursive(getBuildDir());
     }

core/src/main/resources/hudson/model/Messages.properties

@@ -179,6 +179,7 @@ Job.Pronoun=Project
 Job.minutes=mins
 
 Job.you_must_use_the_save_button_if_you_wish=You must use the Save button if you wish to rename a job.
+Job.FailureToStopBuilds=Failed to interrupt and stop {0,choice,1#{0,number,integer} build|1<{0,number,integer} builds} of {0}
 Label.GroupOf=group of {0}
 Label.InvalidLabel=invalid label
 Label.ProvisionedFrom=Provisioned from {0}