openstack/oslo.messaging
Code Issues Proposed changes

[zmq] Second router proxy doesn't dispatch messages properly

Browse Source 
Fixed consumers identity generation, so that single identity
to be generated per socket object.

Change-Id: Ibbc004fed87ac47430fcad0a3782cdaf27e4c926
Closes-Bug: #1578867
This commit is contained in:
ozamiatin 2016-05-06 03:07:01 +03:00 committed by Oleksii Zamiatin
parent 90e7b26016
commit e65539bb70
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
oslo_messaging/_drivers/zmq_driver/broker/zmq_queue_proxy.py
View File

@ -78,7 +78,7 @@ class UniversalQueueProxy(object):
def _redirect_message(self, multipart_message):
envelope = multipart_message[zmq_names.MULTIPART_IDX_ENVELOPE]
LOG.debug("<-> Route message: %s", envelope)
LOG.debug("<-> Dispatch message: %s", envelope)
response_binary = multipart_message[zmq_names.MULTIPART_IDX_BODY]
self.router_socket.send(envelope.routing_key, zmq.SNDMORE)

14
oslo_messaging/_drivers/zmq_driver/zmq_socket.py
View File

@ -42,7 +42,7 @@ class ZmqSocket(object):
if self.conf.rpc_cast_timeout > 0:
self.close_linger = self.conf.rpc_cast_timeout * 1000
self.handle.setsockopt(zmq.LINGER, self.close_linger)
self.handle.identity = six.b(str(uuid.uuid4()))
self.connections = set()
def type_name(self):
@ -98,14 +98,10 @@ class ZmqSocket(object):
def connect_to_address(self, address):
stype = zmq_names.socket_type_str(self.socket_type)
try:
LOG.info(_LI("Connecting %(stype)s to %(address)s"),
{"stype": stype, "address": address})
if six.PY3:
self.setsockopt_string(zmq.IDENTITY, str(uuid.uuid1()))
else:
self.handle.identity = str(uuid.uuid1())
LOG.info(_LI("Connecting %(stype)s id %(id)s to %(address)s"),
{"stype": stype,
"id": self.handle.identity,
"address": address})
self.connect(address)
except zmq.ZMQError as e:
errmsg = _LE("Failed connecting %(stype) to %(address)s: %(e)s")\