commit 4ab54b2d593443b2a686f6a51f5199d62bf29e34
author Zuul <zuul@review.openstack.org> Fri Oct 13 23:31:27 2017 +0000
committer Gerrit Code Review <review@openstack.org> Fri Oct 13 23:31:27 2017 +0000
tree 73ed0261c88248984a6ff43bf709eb41b19a21f4
parent d0164bd8c7955bc7c316112e0307d90d9752ade3
parent 4f1731ba86b747df25c380a66a17796c50a3bdd1

Merge "Emit some nodepool stats" into feature/zuulv3

requirements.txt

diff --git a/requirements.txt b/requirements.txt
index b718827..4b8be3c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
 
 # pull from master until https://github.com/sigmavirus24/github3.py/pull/671
 # is in a release
--e git+https://github.com/sigmavirus24/github3.py.git@develop#egg=Github3.py
+git+https://github.com/sigmavirus24/github3.py.git@develop#egg=Github3.py
 PyYAML>=3.1.0
 Paste
 WebOb>=1.2.3
@@ -11,7 +11,7 @@
 # release.
 # https://github.com/gitpython-developers/GitPython/pull/682
 # https://github.com/gitpython-developers/GitPython/pull/686
--e git+https://github.com/jeblair/GitPython.git@zuul#egg=GitPython
+git+https://github.com/jeblair/GitPython.git@zuul#egg=GitPython
 python-daemon>=2.0.4,<2.1.0
 extras
 statsd>=1.0.0,<3.0

zuul/scheduler.py

diff --git a/zuul/scheduler.py b/zuul/scheduler.py
index f356030..e5924f8 100644
--- a/zuul/scheduler.py
+++ b/zuul/scheduler.py
@@ -855,8 +855,12 @@
             try:
                 self.nodepool.holdNodeSet(nodeset, autohold_key)
             except Exception:
-                self.log.exception("Unable to process autohold for %s",
+                self.log.exception("Unable to process autohold for %s:",
                                    autohold_key)
+                if autohold_key in self.autohold_requests:
+                    self.log.debug("Removing autohold %s due to exception",
+                                   autohold_key)
+                    del self.autohold_requests[autohold_key]
 
             self.nodepool.returnNodeSet(nodeset)
         except Exception:

zuul/zk.py

diff --git a/zuul/zk.py b/zuul/zk.py
index 2fca749..ede78be 100644
--- a/zuul/zk.py
+++ b/zuul/zk.py
@@ -269,6 +269,9 @@
         for nodeid in nodes:
             node_path = '%s/%s' % (self.NODE_ROOT, nodeid)
             node_data, node_stat = self.client.get(node_path)
+            if not node_data:
+                self.log.warning("Node ID %s has no data", nodeid)
+                continue
             node_data = self._strToDict(node_data)
             if (node_data['state'] == zuul.model.STATE_HOLD and
                     node_data.get('hold_job') == identifier):