Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
[JENKINS-38514] Retain CauseOfBlockage from JobOffer (#2651)
* Converted to JenkinsRule. * Improved messages from Node.canTake. * [FIXED JENKINS-38514] BuildableItem needs to retain information from JobOffer about why it is neither blocked nor building. * Converted to JenkinsRule. * Found an existing usage of BecauseNodeIsNotAcceptingTasks. * Original JENKINS-6598 test was checking behavior we want amended by JENKINS-38514. * Ensure that a BuildableItem which is simply waiting for a free executor reports that as its CauseOfBlockage. * Review comments from @oleg-nenashev.
- Loading branch information
1 parent
9172bca
commit 8d23041d4b785947dee1bc02f54a41d86b59bdda
Showing
with
306 additions
and 59 deletions.
- +4 −4 core/src/main/java/hudson/model/Node.java
- +60 −16 core/src/main/java/hudson/model/Queue.java
- +32 −1 core/src/main/java/hudson/model/queue/CauseOfBlockage.java
- +63 −0 core/src/main/java/jenkins/model/queue/CompositeCauseOfBlockage.java
- +3 −1 core/src/main/resources/hudson/model/Messages.properties
- +32 −0 core/src/main/resources/jenkins/model/queue/CompositeCauseOfBlockage/summary.jelly
- +64 −10 test/src/test/java/hudson/model/queue/QueueTaskDispatcherTest.java
- +48 −27 test/src/test/java/hudson/slaves/NodeCanTakeTaskTest.java
| @@ -0,0 +1,63 @@ | ||
| /* | ||
| * The MIT License | ||
| * | ||
| * Copyright 2016 CloudBees, Inc. | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
|
|
||
| package jenkins.model.queue; | ||
|
|
||
| import hudson.model.TaskListener; | ||
| import hudson.model.queue.CauseOfBlockage; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.TreeMap; | ||
| import org.apache.commons.lang.StringUtils; | ||
| import org.kohsuke.accmod.Restricted; | ||
| import org.kohsuke.accmod.restrictions.NoExternalUse; | ||
|
|
||
| /** | ||
| * Represents the fact that there was at least one {@link hudson.model.Queue.JobOffer} which rejected a task. | ||
| */ | ||
| @Restricted(NoExternalUse.class) | ||
| public class CompositeCauseOfBlockage extends CauseOfBlockage { | ||
|
|
||
| public final Map<String, CauseOfBlockage> uniqueReasons; | ||
|
|
||
| public CompositeCauseOfBlockage(List<CauseOfBlockage> delegates) { | ||
| uniqueReasons = new TreeMap<>(); | ||
| for (CauseOfBlockage delegate : delegates) { | ||
| uniqueReasons.put(delegate.getShortDescription(), delegate); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public String getShortDescription() { | ||
| return StringUtils.join(uniqueReasons.keySet(), "; "); | ||
| } | ||
|
|
||
| @Override | ||
| public void print(TaskListener listener) { | ||
| for (CauseOfBlockage delegate : uniqueReasons.values()) { | ||
| delegate.print(listener); | ||
| } | ||
| } | ||
|
|
||
| } |
| @@ -0,0 +1,32 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| The MIT License | ||
| Copyright 2016 CloudBees, Inc. | ||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
| The above copyright notice and this permission notice shall be included in | ||
| all copies or substantial portions of the Software. | ||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| THE SOFTWARE. | ||
| --> | ||
|
|
||
| <?jelly escape-by-default='true'?> | ||
| <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler"> | ||
| <j:forEach var="delegate" items="${it.uniqueReasons.values()}" indexVar="index"> | ||
| <j:if test="${index > 0}">; <wbr/></j:if> | ||
| <st:include it="${delegate}" page="summary"/> | ||
| </j:forEach> | ||
| </j:jelly> |
Oops, something went wrong.