Branch: refs/heads/flyweight-master-JENKINS-7291
Home: https://github.com/jenkinsci/jenkins
Commit: 2c5b57fcc1f39ed39057254e802f4183db5aa0dc
https://github.com/jenkinsci/jenkins/commit/2c5b57fcc1f39ed39057254e802f4183db5aa0dc
Author: Kohsuke Kawaguchi <k...@kohsuke.org>
Date: 2013-03-25 (Mon, 25 Mar 2013)
Changed paths:
M core/src/main/java/hudson/model/AbstractCIBase.java
M core/src/main/java/hudson/model/Computer.java
M core/src/main/java/hudson/model/Queue.java
M core/src/main/java/hudson/slaves/SlaveComputer.java
M core/src/main/java/jenkins/model/Jenkins.java
M core/src/main/resources/lib/hudson/executors.jelly
Log Message:
-----------
Always adding Computer for master as a fallback
The original proposed fix for JENKINS-7291 creates a Computer object
transitively. This seems unwise as it violates the design of Computer
as stated in the javadoc, and for example we can end up creating two
Computers for the master.
I think a better fix is to create a Computer for the master all the
time, even if there's no executors configured. The discrimination in
Queue.makeBuildable would ensure that such phantom Computer is only used
as a last resort.
I've also tweaked executors.jelly a bit. I simplified it somewhat
based on the idea that "if there's only one computer to show, the
context is likely making it obvious".
(I must be missing the intricacy in the current code.)
--
You received this message because you are subscribed to the Google Groups
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to jenkinsci-commits+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
