diff options
| author | Zuul <zuul@review.opendev.org> | 2020-05-16 15:27:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-05-16 15:27:24 +0000 |
| commit | 41225744e67c8106a21a709a622fda4df5cce93f (patch) | |
| tree | e95566243f940c18b60a8ad56d0c6aa58ae7eab5 | |
| parent | ea1d3b7d72268d906ed981d5421ee2b218332aab (diff) | |
| parent | d6beb77397f596dbd333975d31b6f3af02ea8f6d (diff) | |
| download | zuul-41225744e67c8106a21a709a622fda4df5cce93f.tar.gz | |
Merge "Enhance some logging messages"
| -rw-r--r-- | tests/base.py | 13 | ||||
| -rw-r--r-- | zuul/executor/server.py | 2 | ||||
| -rw-r--r-- | zuul/lib/gearworker.py | 6 |
3 files changed, 14 insertions, 7 deletions
diff --git a/tests/base.py b/tests/base.py index ba5e68342..6d369133d 100644 --- a/tests/base.py +++ b/tests/base.py @@ -2685,8 +2685,11 @@ class RecordingExecutorServer(zuul.executor.server.ExecutorServer): """ builds = self.running_builds[:] - self.log.debug("Releasing build %s (%s)" % (regex, - len(self.running_builds))) + if len(builds) == 0: + self.log.debug('No running builds to release') + return + + self.log.debug("Releasing build %s (%s)" % (regex, len(builds))) for build in builds: if not regex or re.match(regex, build.name): self.log.debug("Releasing build %s" % @@ -2696,7 +2699,7 @@ class RecordingExecutorServer(zuul.executor.server.ExecutorServer): self.log.debug("Not releasing build %s" % (build.parameters['zuul']['build'])) self.log.debug("Done releasing builds %s (%s)" % - (regex, len(self.running_builds))) + (regex, len(builds))) def executeJob(self, job): build = FakeBuild(self, job) @@ -4687,6 +4690,10 @@ class ZuulTestCase(BaseTestCase): completed. """ + if not self.history: + self.log.debug("Build history: no builds ran") + return + self.log.debug("Build history:") for build in self.history: self.log.debug(build) diff --git a/zuul/executor/server.py b/zuul/executor/server.py index 27cbcf98d..041bc7b69 100644 --- a/zuul/executor/server.py +++ b/zuul/executor/server.py @@ -2679,7 +2679,7 @@ class ExecutorServer(BaseMergeServer): self.command_thread.daemon = True self.command_thread.start() - self.log.debug("Starting workers") + self.log.debug("Starting %s update workers" % self.update_workers) for i in range(self.update_workers): update_thread = threading.Thread(target=self._updateLoop, name='update') diff --git a/zuul/lib/gearworker.py b/zuul/lib/gearworker.py index 1bffbd4de..1e1433692 100644 --- a/zuul/lib/gearworker.py +++ b/zuul/lib/gearworker.py @@ -51,18 +51,18 @@ class ZuulGearWorker: self.ssl_cert, self.ssl_ca, keepalive=True, tcp_keepidle=60, tcp_keepintvl=30, tcp_keepcnt=5) - self.log.debug('Waiting for server') + self.log.debug('Waiting for gearman') self.gearman.waitForServer() self.register() self.thread.start() def register(self): - self.log.debug('Registering jobs') + self.log.debug('Registering %s jobs' % len(self.jobs)) for job in self.jobs: self.gearman.registerFunction(job) def unregister(self): - self.log.debug('Unregistering jobs') + self.log.debug('Unregistering all jobs (%s)' % len(self.jobs)) for job in self.jobs: self.gearman.unRegisterFunction(job) |