diff options
| author | Neil Williams <neil.williams@linaro.org> | 2015-07-23 10:59:32 +0100 |
|---|---|---|
| committer | Senthil Kumaran <senthil.kumaran@linaro.org> | 2015-08-13 07:53:57 +0000 |
| commit | 05d119426f53bcd941e5bac37fe963a07440b5d5 (patch) | |
| tree | ecf384883fcfe36dc374fe696e5793a80e4c3d8a | |
| parent | 02a83fed4dcb73990c21b661d2a560e2541341b6 (diff) | |
Send the wait-all role reply
Use the send queue, not the wait queue as when lava-wait-all is
used with a role, the specified role is using lava-send, not
lava-wait.
Change-Id: I30330335fdd5e1cf02bca184185fa17368e1774d
Reviewed-on: https://review.linaro.org/7144
Reviewed-by: Senthil Kumaran <senthil.kumaran@linaro.org>
| -rw-r--r-- | lava/coordinator.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lava/coordinator.py b/lava/coordinator.py index 92a60ff..36461b1 100644 --- a/lava/coordinator.py +++ b/lava/coordinator.py @@ -389,8 +389,9 @@ class LavaCoordinator(object): self._waitResponse() return if expected and expected in self.group['waits'][messageID]: + # Need to add the message to the receiving role logging.debug("Replying that %s has sent %s" % (client_name, messageID)) - self._sendWaitMessage(client_name, messageID) + self._sendMessage(client_name, messageID) return if client not in self.group['waits'][messageID]: logging.debug("FIXME: %s not in waits for %s: %s" % ( @@ -455,7 +456,7 @@ class LavaCoordinator(object): if messageID not in self.group['messages'][client_name]: self.group['messages'][client_name][messageID] = {} self.group['messages'][client_name][messageID].update(msg_hash) - logging.debug("message %s for %s" % (json.dumps(self.group['messages'][client_name][messageID]), client_name)) + logging.debug("message ID %s %s for %s" % (messageID, json.dumps(self.group['messages'][client_name][messageID]), client_name)) # now broadcast the message into the other clients in this group for client in self.group['clients']: if client not in self.group['messages']: @@ -463,7 +464,7 @@ class LavaCoordinator(object): if messageID not in self.group['messages'][client]: self.group['messages'][client][messageID] = {} self.group['messages'][client][messageID].update(msg_hash) - logging.debug("broadcast %s for %s" % (json.dumps(self.group['messages'][client][messageID]), client)) + logging.debug("broadcast ID %s %s for %s" % (messageID, json.dumps(self.group['messages'][client][messageID]), client)) # separate the waits from the messages for wait-all support if messageID not in self.group['waits']: self.group['waits'][messageID] = {} |