From fd7f53e21e996f92175673e065d02141167efddf Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 22 Jun 2017 12:43:52 -0700 Subject: [PATCH] Use private attribute lookup interanlly in builder.py Builder threads have an internal _running attribute which is exposed publicly via the running property. We were using a mix of checking against the _running name and the running name internally. This was somewhat confusing. Switch to using _running for all internal checks and only using running externally. Change-Id: Ifeda16168547cf69e91c55e937616a745c9fc50e --- nodepool/builder.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nodepool/builder.py b/nodepool/builder.py index 054ca7003..f2be99400 100644 --- a/nodepool/builder.py +++ b/nodepool/builder.py @@ -524,7 +524,7 @@ class BuildWorker(BaseWorker): for diskimage in self._config.diskimages.values(): # Check if we've been told to shutdown # or if ZK connection is suspended - if not self.running or self._zk.suspended or self._zk.lost: + if not self._running or self._zk.suspended or self._zk.lost: return try: self._checkImageForScheduledImageUpdates(diskimage) @@ -591,7 +591,7 @@ class BuildWorker(BaseWorker): for diskimage in self._config.diskimages.values(): # Check if we've been told to shutdown # or if ZK connection is suspended - if not self.running or self._zk.suspended or self._zk.lost: + if not self._running or self._zk.suspended or self._zk.lost: return try: self._checkImageForManualBuildRequest(diskimage) @@ -892,7 +892,7 @@ class UploadWorker(BaseWorker): # Check if we've been told to shutdown # or if ZK connection is suspended - if not self.running or self._zk.suspended or self._zk.lost: + if not self._running or self._zk.suspended or self._zk.lost: return try: uploaded = self._checkProviderImageUpload(provider, image)