[FIXED JENKINS-28446] - Calculate only tasks without assigned labels

This implementation does not create new methods in API, hence it can be backported. (cherry picked from commit 294ce77)
jenkinsci · Jun 8, 2015 · ece651d · ece651d
1 parent 56fc386
commit ece651d
Showing 1 changed file with 16 additions and 1 deletion.
diff --git a/core/src/main/java/jenkins/model/UnlabeledLoadStatistics.java b/core/src/main/java/jenkins/model/UnlabeledLoadStatistics.java
@@ -31,9 +31,11 @@
 import hudson.model.Queue;
 import hudson.model.Queue.Task;
 import hudson.model.queue.SubTask;
+import hudson.model.queue.Tasks;
 import hudson.util.Iterators;
 
 import java.util.Iterator;
+import java.util.List;
 
 /**
  * {@link LoadStatistics} that track the "free roam" jobs (whose {@link Task#getAssignedLabel()} is null)
@@ -78,7 +80,20 @@ public int computeTotalExecutors() {
 
     @Override
     public int computeQueueLength() {
-        return Jenkins.getInstance().getQueue().countBuildableItemsFor(null);
+        final Jenkins j = Jenkins.getInstance();
+        if (j == null) { // Consider queue as empty when Jenkins is inactive
+            return 0;
+        }
+
+        int result = 0;
+        final List<Queue.BuildableItem> buildableItems = j.getQueue().getBuildableItems();
+        for (Queue.BuildableItem item : buildableItems) {
+            for (SubTask st : Tasks.getSubTasksOf(item.task)) {
+                    if (item.getAssignedLabelFor(st) == null)
+                        result++;
+            }
+        }
+        return result; 
     }
 
     @Override