LAVA Dispatcher

Merge lp:~fu-wei/lava-dispatcher/multinode into lp:lava-dispatcher/multinode

  1. multinode
  2. Merge into multinode
Proposed by Fu Wei
Status: Merged
Approved by: Neil Williams
Approved revision: no longer in the source branch.
Merged at revision: 670
Proposed branch: lp:~fu-wei/lava-dispatcher/multinode
Merge into: lp:lava-dispatcher/multinode
Diff against target: 24 lines (+10/-3)
1 file modified
lava_dispatcher/signals/__init__.py (+10/-3)
To merge this branch: bzr merge lp:~fu-wei/lava-dispatcher/multinode
Reviewer Review Type Date Requested Status
Neil Williams Pending
Review via email: mp+177870@code.launchpad.net

Description of the change

fix lava-sync bug for message delivery

To post a comment you must log in.
lp:~fu-wei/lava-dispatcher/multinode updated
670. By Neil Williams

Fu Wei 2013-07-31 fix lava-sync bug for message delivery

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lava_dispatcher/signals/__init__.py'
2--- lava_dispatcher/signals/__init__.py 2013-07-31 11:59:10 +0000
3+++ lava_dispatcher/signals/__init__.py 2013-07-31 15:06:08 +0000
4@@ -209,10 +209,17 @@
5 msg = {"request": "lava_sync", "messageID": message_id, "message": None}
6 reply = self.context.transport(json.dumps(msg))
7 logging.debug("Node transport replied with %s" % reply)
8- ret = self.connection.sendline("<LAVA_SYNC_COMPLETE %s>" % json.dumps(reply))
9+ message_str = ""
10+ if reply == "nack":
11+ raise FailedCall("LAVA_SYNC nack")
12+ message_str = " nack"
13+# elif reply == "TIMEOUT":
14+# raise FailedCall("LAVA_SYNC TIMEOUT")
15+# message_str = " TIMEOUT"
16+ else:
17+ message_str = ""
18+ ret = self.connection.sendline("<LAVA_SYNC_COMPLETE%s>" % message_str)
19 logging.debug("runner._connection.sendline wrote %d bytes" % ret)
20- if reply == "nack":
21- raise FailedCall("LAVA_SYNC nack")
22
23 def _on_WAIT(self, message_id):
24 if not self.connection:

Subscribers

People subscribed via source and target branches

to status/vote changes: