Merge lp:~codehelp/lava-dispatcher/wait-all into lp:lava-dispatcher/multinode

Proposed by Neil Williams
Status: Merged
Approved by: Neil Williams
Approved revision: 675
Merged at revision: 675
Proposed branch: lp:~codehelp/lava-dispatcher/wait-all
Merge into: lp:lava-dispatcher/multinode
Prerequisite: lp:~codehelp/lava-dispatcher/xmlrpc-results
Diff against target: 21 lines (+2/-2)
1 file modified
lava/dispatcher/node.py (+2/-2)
To merge this branch: bzr merge lp:~codehelp/lava-dispatcher/wait-all
Reviewer Review Type Date Requested Status
Fu Wei Approve
Review via email: mp+178768@code.launchpad.net

Description of the change

The main changes for the fix for wait_all are in the coordinator:
http://people.linaro.org/~neil.williams/lava/pool/main/l/lava-coordinator/lava-coordinator_0.1.3-1_all.deb

This change in node needs to be with this version of coordinator (or a higher version).

git code for lava-coordinator: https://git.linaro.org/gitweb?p=people/neilwilliams/lava-group.git;a=summary

This branch needs to be merged after the xmlrpc-results branch (which in turn needs the merge for lava-dashboard) but the change itself is already running on multinode01.validation.linaro.org for testing.

To post a comment you must log in.
Revision history for this message
Fu Wei (fu-wei) wrote :

Good! Thank you very much!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lava/dispatcher/node.py'
2--- lava/dispatcher/node.py 2013-08-06 14:35:42 +0000
3+++ lava/dispatcher/node.py 2013-08-06 14:35:42 +0000
4@@ -311,7 +311,7 @@
5 reply_str = self.request_wait(messageID)
6 elif json_data['request'] == 'lava_wait_all':
7 logging.info("requesting lava_wait_all %s" % json.dumps(json_data))
8- if 'role' in json_data:
9+ if 'role' in json_data and json_data['role'] is not None:
10 reply_str = self.request_wait_all(messageID, json_data['role'])
11 else:
12 reply_str = self.request_wait_all(messageID)
13@@ -362,7 +362,7 @@
14 if role:
15 return self._send({"request": "lava_wait_all",
16 "messageID": messageID,
17- "role": role})
18+ "waitrole": role})
19 else:
20 return self._send({"request": "lava_wait_all",
21 "messageID": messageID})

Subscribers

People subscribed via source and target branches

to status/vote changes: