Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/235487
Change subject: Bump Nodepool 0.1.1 ...................................................................... Bump Nodepool 0.1.1 Bug: T107266 Change-Id: Ie591c41d39ae78d0c15d2ffe724c7ccad14bdb87 --- M debian/changelog R debian/patches/0001-Stop-all-threads-on-SIGUSR1.patch D debian/patches/0001-Support-spaces-in-Gearman-functions-names.patch M debian/patches/series 4 files changed, 11 insertions(+), 45 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/nodepool refs/changes/87/235487/1 diff --git a/debian/changelog b/debian/changelog index 002bf79..f84dbae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nodepool (0.1.1-wmf1) jessie-wikimedia; urgency=medium + + * Bump to upstream 0.1.0 + * Patch "Support spaces in Gearman functions names" merged upstream + + -- Antoine Musso <[email protected]> Wed, 02 Sep 2015 15:36:49 +0000 + nodepool (0.1.0-wmf1) jessie-wikimedia; urgency=medium * Bump to upstream 0.1.0 diff --git a/debian/patches/0002-Stop-all-threads-on-SIGUSR1.patch b/debian/patches/0001-Stop-all-threads-on-SIGUSR1.patch similarity index 96% rename from debian/patches/0002-Stop-all-threads-on-SIGUSR1.patch rename to debian/patches/0001-Stop-all-threads-on-SIGUSR1.patch index 8b6de8b..084a6fa 100644 --- a/debian/patches/0002-Stop-all-threads-on-SIGUSR1.patch +++ b/debian/patches/0001-Stop-all-threads-on-SIGUSR1.patch @@ -53,10 +53,10 @@ return self.exit_handler(signal.SIGINT, None) diff --git a/nodepool/nodepool.py b/nodepool/nodepool.py -index cec2dc8..b2745b2 100644 +index 2ea428a..691f35f 100644 --- a/nodepool/nodepool.py +++ b/nodepool/nodepool.py -@@ -732,13 +732,23 @@ class DiskImageBuilder(threading.Thread): +@@ -742,13 +742,23 @@ class DiskImageBuilder(threading.Thread): def __init__(self, nodepool): threading.Thread.__init__(self, name='DiskImageBuilder queue') @@ -80,7 +80,7 @@ try: self.buildImage(image_id) except Exception: -@@ -1175,15 +1185,34 @@ class NodePool(threading.Thread): +@@ -1186,15 +1196,34 @@ class NodePool(threading.Thread): self._image_builder_thread = None def stop(self): diff --git a/debian/patches/0001-Support-spaces-in-Gearman-functions-names.patch b/debian/patches/0001-Support-spaces-in-Gearman-functions-names.patch deleted file mode 100644 index a6124c4..0000000 --- a/debian/patches/0001-Support-spaces-in-Gearman-functions-names.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Antoine Musso <[email protected]> -Date: Tue, 21 Apr 2015 11:52:25 +0200 -Subject: Support spaces in Gearman functions names - -Jenkins allow spaces in its job names, when splitting the Gearman status -flow, nodepool uses split() which includes both spaces and tabs. That -causes an exception: - - ... - File "nodepool/nodepool.py", line 1565, in getNeededNodes - label_demand = self.gearman_client.getNeededWorkers() - File "nodepool/nodepool.py", line 255, in getNeededWorkers - queued = int(parts[1]) - int(parts[2]) - ValueError: invalid literal for int() with base 10: 'Dashboard' - -That is caused by a job named 'Global-Dev Dashboard Data' with the -status output being: - - build:Global-Dev Dashboard Data<TAB>0<TAB>0<TAB>23 - -Since Gearman uses tab separated fields, explicitly split on tabs. - -Change-Id: I72c49409808251ce87a55f8b6f444b6f57120550 ---- - nodepool/nodepool.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/nodepool/nodepool.py b/nodepool/nodepool.py -index fdca19d..cec2dc8 100644 ---- a/nodepool/nodepool.py -+++ b/nodepool/nodepool.py -@@ -245,7 +245,7 @@ class GearmanClient(gear.Client): - self._lostConnection(connection) - continue - for line in req.response.split('\n'): -- parts = [x.strip() for x in line.split()] -+ parts = [x.strip() for x in line.split('\t')] - if not parts or parts[0] == '.': - continue - if not parts[0].startswith('build:'): diff --git a/debian/patches/series b/debian/patches/series index d7f20b9..2117df4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -0001-Support-spaces-in-Gearman-functions-names.patch -0002-Stop-all-threads-on-SIGUSR1.patch +0001-Stop-all-threads-on-SIGUSR1.patch -- To view, visit https://gerrit.wikimedia.org/r/235487 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie591c41d39ae78d0c15d2ffe724c7ccad14bdb87 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/nodepool Gerrit-Branch: debian Gerrit-Owner: Hashar <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
