zuul
/
zuul
Code Issues Proposed changes

Merge "Add details to waitUntilSettled() debug log"

This commit is contained in:
Zuul 2020-05-16 15:35:58 +00:00 committed by Gerrit Code Review
parent 41225744e6 15bc66b027
commit ff1d7fe6d6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/base.py
View File

@ -4401,7 +4401,9 @@ class ZuulTestCase(BaseTestCase):
def waitUntilSettled(self, msg="", matcher=None) -> None: def waitUntilSettled(self, msg="", matcher=None) -> None:
self.log.debug("Waiting until settled... (%s)", msg) self.log.debug("Waiting until settled... (%s)", msg)
start = time.time() start = time.time()
i = 0
while True: while True:
i = i + 1
if time.time() - start > self.wait_timeout: if time.time() - start > self.wait_timeout:
self.log.error("Timeout waiting for Zuul to settle") self.log.error("Timeout waiting for Zuul to settle")
self.log.error("Queue status:") self.log.error("Queue status:")
@ -4418,9 +4420,10 @@ class ZuulTestCase(BaseTestCase):
self.log.error("[Sched: %s] Merge client jobs: %s" % self.log.error("[Sched: %s] Merge client jobs: %s" %
(app.sched, app.sched.merger.jobs,)) (app.sched, app.sched.merger.jobs,))
raise Exception("Timeout waiting for Zuul to settle") raise Exception("Timeout waiting for Zuul to settle")
# Make sure no new events show up while we're checking
# Make sure no new events show up while we're checking
self.executor_server.lock.acquire() self.executor_server.lock.acquire()
# have all build states propogated to zuul? # have all build states propogated to zuul?
if self.__haveAllBuildsReported(matcher): if self.__haveAllBuildsReported(matcher):
# Join ensures that the queue is empty _and_ events have been # Join ensures that the queue is empty _and_ events have been
@ -4441,7 +4444,8 @@ class ZuulTestCase(BaseTestCase):
self.scheds.execute( self.scheds.execute(
lambda app: app.sched.run_handler_lock.release()) lambda app: app.sched.run_handler_lock.release())
self.executor_server.lock.release() self.executor_server.lock.release()
self.log.debug("...settled. (%s)", msg) self.log.debug("...settled after %.3f ms / %s loops (%s)",
time.time() - start, i, msg)
self.logState() self.logState()
return return
self.scheds.execute( self.scheds.execute(