openstack/deb-python-oslo.messaging
Code Issues Proposed changes

[zmq] Fix cinder create volume hangs

Browse Source 
Cinder create volume hangs in default deployment devstack+zmq.

* Fix general topic resolution in matchmaker
* Fix matchmaker redis to use set instead of list

Change-Id: I25d623eb4bb0a827daa8a316a0ddcb4a473f8694
Closes-Bug: #1546106
This commit is contained in:
Oleksii Zamiatin
2016-02-22 13:47:02 +02:00
parent 82bfad9662
commit 8600f081e7
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
oslo_messaging/_drivers/zmq_driver/matchmaker/matchmaker_redis.py
View File

@@ -114,11 +114,11 @@ class RedisMatchMaker(base.MatchMakerBase):
def register_publisher(self, hostname): def register_publisher(self, hostname):
host_str = ",".join(hostname) host_str = ",".join(hostname)
if host_str not in self._get_hosts_by_key(_PUBLISHERS_KEY): if host_str not in self._get_hosts_by_key(_PUBLISHERS_KEY):
self._redis.lpush(_PUBLISHERS_KEY, host_str) self._redis.sadd(_PUBLISHERS_KEY, host_str)
def unregister_publisher(self, hostname): def unregister_publisher(self, hostname):
host_str = ",".join(hostname) host_str = ",".join(hostname)
self._redis.lrem(_PUBLISHERS_KEY, 0, host_str) self._redis.srem(_PUBLISHERS_KEY, host_str)
def get_publishers(self): def get_publishers(self):
hosts = [] hosts = []
@@ -128,13 +128,12 @@ class RedisMatchMaker(base.MatchMakerBase):
return hosts return hosts
def _get_hosts_by_key(self, key): def _get_hosts_by_key(self, key):
return self._redis.lrange(key, 0, -1) return self._redis.smembers(key)
def register(self, target, hostname, listener_type, expire=-1): def register(self, target, hostname, listener_type, expire=-1):
def register_key(key): def register_key(key):
if hostname not in self._get_hosts_by_key(key): self._redis.sadd(key, hostname)
self._redis.lpush(key, hostname)
if expire > 0: if expire > 0:
self._redis.expire(key, expire) self._redis.expire(key, expire)
@@ -146,17 +145,18 @@ class RedisMatchMaker(base.MatchMakerBase):
key = zmq_address.prefix_str(target.topic, listener_type) key = zmq_address.prefix_str(target.topic, listener_type)
register_key(key) register_key(key)
if target.server:
key = zmq_address.prefix_str(target.server, listener_type)
register_key(key)
def unregister(self, target, hostname, listener_type): def unregister(self, target, hostname, listener_type):
key = zmq_address.target_to_key(target, listener_type) key = zmq_address.target_to_key(target, listener_type)
self._redis.lrem(key, 0, hostname) self._redis.srem(key, hostname)
def get_hosts(self, target, listener_type): def get_hosts(self, target, listener_type):
LOG.debug("[Redis] get_hosts for target %s", target) LOG.debug("[Redis] get_hosts for target %s", target)
hosts = [] hosts = []
key = zmq_address.target_to_key(target, listener_type) key = zmq_address.target_to_key(target, listener_type)
hosts.extend(self._get_hosts_by_key(key)) hosts.extend(self._get_hosts_by_key(key))
if not hosts and target.topic and target.server:
key = zmq_address.prefix_str(target.topic, listener_type)
hosts.extend(self._get_hosts_by_key(key))
return hosts return hosts

2
oslo_messaging/_drivers/zmq_driver/zmq_address.py
View File

@@ -46,8 +46,6 @@ def target_to_key(target, listener_type):
return prefix(key) return prefix(key)
if target.topic: if target.topic:
return prefix(target.topic) return prefix(target.topic)
if target.server:
return prefix(target.server)
def target_to_subscribe_filter(target): def target_to_subscribe_filter(target):