提交 55bf8832 编写于 作者: S Stephen Connolly

If every node is restricted to tied jobs only, Matrix build jobs can never start.

上级 503c3bd2
......@@ -75,6 +75,8 @@ Upcoming changes</a>
<li class=bug>
Deadlock during Maven builds Parsing POM step
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-15846">issue 15846</a>)
<li class=bug>
If every node is restricted to tied jobs only, Matrix build jobs can never start.
</ul>
</div><!--=END=-->
<h3><a name=v1.521>What's new in 1.521</a> (2013/07/02)</h3>
......
......@@ -325,8 +325,16 @@ public abstract class Node extends AbstractModelObject implements Reconfigurable
if(l!=null && !l.contains(this))
return CauseOfBlockage.fromMessage(Messages._Node_LabelMissing(getNodeName(),l)); // the task needs to be executed on label that this node doesn't have.
if(l==null && getMode()== Mode.EXCLUSIVE)
return CauseOfBlockage.fromMessage(Messages._Node_BecauseNodeIsReserved(getNodeName())); // this node is reserved for tasks that are tied to it
if(l==null && getMode()== Mode.EXCLUSIVE) {
// flyweight tasks need to get executed somewhere, if every node
if (!(item.task instanceof Queue.FlyweightTask && (
this instanceof Jenkins
|| Jenkins.getInstance().getNumExecutors() < 1
|| Jenkins.getInstance().getMode() == Mode.EXCLUSIVE)
)) {
return CauseOfBlockage.fromMessage(Messages._Node_BecauseNodeIsReserved(getNodeName())); // this node is reserved for tasks that are tied to it
}
}
Authentication identity = item.authenticate();
if (!getACL().hasPermission(identity,Computer.BUILD)) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册