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

[Fu Wei]

fix lava-sync bug for message delivery

[lp:~fu-wei/lava-dispatcher/multinode]

670. By Neil Williams on 2013-08-01

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

=== modified file 'lava_dispatcher/signals/__init__.py'
--- lava_dispatcher/signals/__init__.py	2013-07-31 11:59:10 +0000
+++ lava_dispatcher/signals/__init__.py	2013-07-31 15:06:08 +0000
@@ -209,10 +209,17 @@
         msg = {"request": "lava_sync", "messageID": message_id, "message": None}
         reply = self.context.transport(json.dumps(msg))
         logging.debug("Node transport replied with %s" % reply)
-        ret = self.connection.sendline("<LAVA_SYNC_COMPLETE %s>" % json.dumps(reply))
+        message_str = ""
+        if reply == "nack":
+            raise FailedCall("LAVA_SYNC nack")
+            message_str = " nack"
+#        elif reply == "TIMEOUT":
+#            raise FailedCall("LAVA_SYNC TIMEOUT")
+#            message_str = " TIMEOUT"
+        else:
+            message_str = ""
+        ret = self.connection.sendline("<LAVA_SYNC_COMPLETE%s>" % message_str)
         logging.debug("runner._connection.sendline wrote %d bytes" % ret)
-        if reply == "nack":
-            raise FailedCall("LAVA_SYNC nack")
 
     def _on_WAIT(self, message_id):
         if not self.connection: