Skip to content

Commit fa1361f

Browse files
authored
Revert "[JENKINS-75152] Update hudson.model.Queue for long buildableItem queue cycle acceleration" (#10331)
1 parent 3f22a1d commit fa1361f

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1615,9 +1615,6 @@ public void maintain() {
16151615
// Ensure that identification of blocked tasks is using the live state: JENKINS-27708 & JENKINS-27871
16161616
updateSnapshot();
16171617

1618-
// JENKINS-75152. Save the label and blockage reasons of items that have no candidates into this map.
1619-
// It is used to speed up the judgement of other buildable items with the same label.
1620-
Map<Label, List<CauseOfBlockage>> noCandidateLabelsMap = new HashMap<>();
16211618
// allocate buildable jobs to executors
16221619
for (BuildableItem p : new ArrayList<>(
16231620
buildables)) { // copy as we'll mutate the list in the loop
@@ -1644,13 +1641,6 @@ public void maintain() {
16441641
updateSnapshot();
16451642
}
16461643
} else {
1647-
// JENKINS-75152. Skip the remaining steps if the label of this item has been determined
1648-
// to have no candidate executors in the previous allocation process.
1649-
Label itemLabel = p.getAssignedLabel();
1650-
if (noCandidateLabelsMap.containsKey(itemLabel)) {
1651-
p.transientCausesOfBlockage = noCandidateLabelsMap.get(itemLabel);
1652-
continue;
1653-
}
16541644

16551645
List<JobOffer> candidates = new ArrayList<>(parked.size());
16561646
Map<Node, CauseOfBlockage> reasonMap = new HashMap<>();
@@ -1683,11 +1673,6 @@ public void maintain() {
16831673
new Object[]{p, candidates, parked.values()});
16841674
List<CauseOfBlockage> reasons = reasonMap.values().stream().filter(Objects::nonNull).collect(Collectors.toList());
16851675
p.transientCausesOfBlockage = reasons.isEmpty() ? null : reasons;
1686-
// If no candidates, save the label and blockage reasons.
1687-
if (candidates.isEmpty()) {
1688-
noCandidateLabelsMap.put(itemLabel, p.transientCausesOfBlockage);
1689-
LOGGER.log(Level.FINEST, "{0} changes to the state of no candidate executor", itemLabel);
1690-
}
16911676
continue;
16921677
}
16931678

0 commit comments

Comments
 (0)