From b40e7b4228a6a5979fa484b2d2b15259bfab0ff5 Mon Sep 17 00:00:00 2001 From: Robert Elliot Date: Thu, 3 Mar 2011 23:40:04 +0000 Subject: [PATCH] [FIXED JENKINS-8929] Changed the definition of a building downstream project to one that is Building, Waiting, Pending or Buildable but NOT blocked. This prevents the deadlock condition where upstream project A is blocked on downstream project B, which is blocked on upstream project A - now in this scenario B will remain blocked but A will build, eventually freeing up B. --- .../main/java/hudson/model/AbstractProject.java | 6 ++++-- core/src/main/java/hudson/model/Queue.java | 14 +++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index a3aff920f5..5d8e237ca3 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -100,6 +100,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.HashSet; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -1082,9 +1083,10 @@ public abstract class AbstractProject

,R extends A protected AbstractProject getBuildingDownstream() { DependencyGraph graph = Hudson.getInstance().getDependencyGraph(); Set tups = graph.getTransitiveDownstream(this); - tups.add(this); + Queue queue = Hudson.getInstance().getQueue(); + for (AbstractProject tup : tups) { - if(tup!=this && (tup.isBuilding() || tup.isInQueue())) + if(tup.isBuilding() || queue.getUnblockedItems().containsKey(tup)) return tup; } return null; diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index cab37a93aa..03f5b60049 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -77,6 +77,7 @@ import java.util.Collections; import java.util.GregorianCalendar; import java.util.HashMap; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.NoSuchElementException; @@ -633,6 +634,17 @@ public class Queue extends ResourceController implements Saveable { return new ArrayList(pendings.values()); } + /** + * Gets all items that are in the queue but not blocked + */ + synchronized ItemList getUnblockedItems() { + ItemList queuedNotBlocked = new ItemList(); + queuedNotBlocked.addAll(waitingList); + queuedNotBlocked.addAll(pendings); + queuedNotBlocked.addAll(buildables); + return queuedNotBlocked; + } + /** * Is the given task currently pending execution? */ @@ -1557,7 +1569,7 @@ public class Queue extends ResourceController implements Saveable { /** * {@link ArrayList} of {@link Item} with more convenience methods. */ - private static class ItemList extends ArrayList { + static class ItemList extends ArrayList { public T get(Task task) { for (T item: this) { if (item.task == task) {