[Buildbot-commits] [buildbot/buildbot] 74b0b4: Do not catch GeneratorExit exception

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: 74b0b421b89099e9759bee3664aefd785086c623
      https://github.com/buildbot/buildbot/commit/74b0b421b89099e9759bee3664aefd785086c623
  Author: chantra <chantra at fb.com>
  Date:   2014-01-30 (Thu, 30 Jan 2014)

  Changed paths:
    M master/buildbot/process/buildstep.py

  Log Message:
  -----------
  Do not catch GeneratorExit exception

On buildbot 0.8.8 in rare conditions, we hit:

File "/data/buildbot/twisted/internet/threads.py", line 49, in deferToThreadPool
      threadpool.callInThreadWithCallback(onResult, f, *args, **kwargs)
    File "/data/buildbot/twisted/python/threadpool.py", line 148, in callInThreadWithCallb
ack
      self.q.put(o)
    File "//usr/lib/python2.7/Queue.py", line 138, in put
      self.not_empty.notify()
    File "//usr/lib/python2.7/threading.py", line 392, in notify
      for waiter in waiters:
  --- <exception caught here> ---
    File "/data/buildbot/buildbot/process/buildstep.py", line 605, in _startStep_3
      result = yield defer.maybeDeferred(self.start)
  exceptions.GeneratorExit:

this applies the fix from http://trac.buildbot.net/ticket/2395#comment:10 to master/buildbot/process/buildstep.py


  Commit: 54efd81f3cefb6525fe90917b13b373f96184d45
      https://github.com/buildbot/buildbot/commit/54efd81f3cefb6525fe90917b13b373f96184d45
  Author: Dustin J. Mitchell <dustin at mozilla.com>
  Date:   2014-01-31 (Fri, 31 Jan 2014)

  Changed paths:
    M master/buildbot/process/buildstep.py

  Log Message:
  -----------
  Merge chantra/buildbot:fb-master (PR #1063)


Compare: https://github.com/buildbot/buildbot/compare/5e4fff8e79ad...54efd81f3cef