Branch: refs/heads/master
  Home:   https://github.com/jenkinsci/jenkins
  Commit: 35b8f13dc7af521139008f8c09d19b5201450903
      
https://github.com/jenkinsci/jenkins/commit/35b8f13dc7af521139008f8c09d19b5201450903
  Author: Kohsuke Kawaguchi <k...@kohsuke.org>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M assembly-src.xml

  Log Message:
  -----------
  exclude more of the generated files


  Commit: 8e9d60855eeac4eb666d44e81fbee20c19b5e4d0
      
https://github.com/jenkinsci/jenkins/commit/8e9d60855eeac4eb666d44e81fbee20c19b5e4d0
  Author: Kohsuke Kawaguchi <k...@kohsuke.org>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M core/src/main/java/hudson/slaves/ComputerListener.java
  M core/src/main/java/jenkins/model/Jenkins.java

  Log Message:
  -----------
  doc changes


  Commit: 1ac4872ecdc500c63c0dbfce5e4beb5ce78369e5
      
https://github.com/jenkinsci/jenkins/commit/1ac4872ecdc500c63c0dbfce5e4beb5ce78369e5
  Author: Kohsuke Kawaguchi <k...@kohsuke.org>
  Date:   2012-02-13 (Mon, 13 Feb 2012)

  Changed paths:
    M core/src/main/java/hudson/model/Queue.java

  Log Message:
  -----------
  maintain() should assign buildable stuff to executors.

This came out of the conversation with Nicolas.

When QueueTaskDispatcher vetos the assignment, a buildable item might
stay buildable and unexecuted. Ane he found that it doesn't get retried,
despite the MaintainTask class that attempts to do so.

The issue is that the maintain() method actually doesn't try to assign
buildable tasks to executors. That happens inside the pop() method.
I think this goes against the original design of the maintain() method,
which is a giant synchronized block that moves all the relevant actors
from one state to another.

So I'm moving this code into the maintain method. In this way,
MaintainTask will automatically reattempt to assign buildable items
to executors, and scheduleMaintenance() and maintain() will really
do the same thing, and it solves the original problem.


Compare: https://github.com/jenkinsci/jenkins/compare/dd75293...1ac4872

Reply via email to