openstack/oslo.messaging
Code Issues Proposed changes

Merge "[AMQP 1.0] if RPC call is configured as presettled ignore acks"

Browse Source
This commit is contained in:
Jenkins 2017-05-17 05:02:52 +00:00 committed by Gerrit Code Review
commit db01a0eec0
2 changed files with 4 additions and 3 deletions
oslo_messaging/_drivers
amqp1_driver
controller.py
impl_amqp1.py

4
oslo_messaging/_drivers/amqp1_driver/controller.py

@ -190,9 +190,9 @@ class RPCCallTask(SendTask):
"""Performs an RPC Call. Sends the request and waits for a response from """Performs an RPC Call. Sends the request and waits for a response from
the destination. the destination.
""" """
def __init__(self, target, message, deadline, retry): def __init__(self, target, message, deadline, retry, wait_for_ack):
super(RPCCallTask, self).__init__("RPC Call", message, target, super(RPCCallTask, self).__init__("RPC Call", message, target,
deadline, retry, wait_for_ack=True) deadline, retry, wait_for_ack)
self._reply_link = None self._reply_link = None
self._reply_msg = None self._reply_msg = None
self._msg_id = None self._msg_id = None

3
oslo_messaging/_drivers/impl_amqp1.py

@ -303,7 +303,8 @@ class ProtonDriver(base.BaseDriver):
expire = compute_timeout(self._default_send_timeout) expire = compute_timeout(self._default_send_timeout)
if wait_for_reply: if wait_for_reply:
ack = not self._pre_settle_call ack = not self._pre_settle_call
task = controller.RPCCallTask(target, request, expire, retry) task = controller.RPCCallTask(target, request, expire, retry,
wait_for_ack=ack)
else: else:
ack = not self._pre_settle_cast ack = not self._pre_settle_cast
task = controller.SendTask("RPC Cast", request, target, expire, task = controller.SendTask("RPC Cast", request, target, expire,