x/python-ganttclient
Code Issues Proposed changes

change the behavior of calling a multicall

Browse Source
This commit is contained in:
termie
2011-05-25 15:43:04 -07:00
parent 22e1bdcda6
commit bb5e80112b
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nova/rpc.py
View File

@@ -236,6 +236,9 @@ class AdapterConsumer(Consumer):
# This final None tells multicall that it is done. # This final None tells multicall that it is done.
msg_reply(msg_id, None, None) msg_reply(msg_id, None, None)
elif hasattr(rval, 'send'):
# NOTE(vish): this iterates through the generator
list(rval)
except Exception as e: except Exception as e:
logging.exception('Exception during message handling') logging.exception('Exception during message handling')
if msg_id: if msg_id:
@@ -530,9 +533,8 @@ class MulticallWaiter(object):
def call(context, topic, msg): def call(context, topic, msg):
"""Sends a message on a topic and wait for a response.""" """Sends a message on a topic and wait for a response."""
rv = multicall(context, topic, msg) rv = multicall(context, topic, msg)
for x in rv: # NOTE(vish): return the last result from the multicall
rv.close() return list(rv)[-1]
return x
def cast(context, topic, msg): def cast(context, topic, msg):

4
nova/tests/test_rpc.py
View File

@@ -51,14 +51,14 @@ class RpcTestCase(test.TestCase):
value = 42 value = 42
result = rpc.call(self.context, 'test', {"method": "echo_three_times", result = rpc.call(self.context, 'test', {"method": "echo_three_times",
"args": {"value": value}}) "args": {"value": value}})
self.assertEqual(value, result) self.assertEqual(value + 2, result)
def test_call_succeed_despite_multiple_returns_yield(self): def test_call_succeed_despite_multiple_returns_yield(self):
value = 42 value = 42
result = rpc.call(self.context, 'test', result = rpc.call(self.context, 'test',
{"method": "echo_three_times_yield", {"method": "echo_three_times_yield",
"args": {"value": value}}) "args": {"value": value}})
self.assertEqual(value, result) self.assertEqual(value + 2, result)
def test_multicall_succeed_once(self): def test_multicall_succeed_once(self):
value = 42 value = 42