From e7bf396555fd89ebc53ee060c9e6f41ee06f9fca Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Mon, 25 Jun 2018 17:12:13 -0400 Subject: [PATCH] JENKINS-52159: Queue.maintain - tolerate misbehaving sorter.sortBuildableItems() Any plugin that implements the sort step could throw an exception which would break the maintain() step. As sorting is really an optional step, it really should not be fatal. Instead, we wrap the step in a try block, log it, and move on with life. (cherry picked from commit 1083a3f5c648e87464e25815779690eed1fb3296) --- core/src/main/java/hudson/model/Queue.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index 8aad4b0acc..0556b1c318 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -1569,8 +1569,15 @@ public class Queue extends ResourceController implements Saveable { } } - if (s != null) - s.sortBuildableItems(buildables); + if (s != null) { + try { + s.sortBuildableItems(buildables); + } catch (Throwable e) { + // We don't really care if the sort doesn't sort anything, we still should + // continue to do our job. We'll complain about it and continue. + LOGGER.log(Level.WARNING, "s.sortBuildableItems() threw Throwable: {0}", e); + } + } // Ensure that identification of blocked tasks is using the live state: JENKINS-27708 & JENKINS-27871 updateSnapshot();