openstack/oslo.messaging
Code Issues Proposed changes

Merge "[sentinel] Move master/slave discovering from __init__"

Browse Source
This commit is contained in:
Jenkins 2016-11-24 15:36:04 +00:00 committed by Gerrit Code Review
commit fbfb0812e3
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
oslo_messaging/_drivers/zmq_driver/matchmaker/zmq_matchmaker_redis.py
View File

@ -362,18 +362,33 @@ class MatchmakerSentinel(MatchmakerRedisBase):
def __init__(self, conf, *args, **kwargs): def __init__(self, conf, *args, **kwargs):
super(MatchmakerSentinel, self).__init__(conf, *args, **kwargs) super(MatchmakerSentinel, self).__init__(conf, *args, **kwargs)
socket_timeout = self.conf.matchmaker_redis.socket_timeout / 1000.
self._sentinel_hosts, password, master_group = \ self._sentinel_hosts, self._password, self._master_group = \
self._extract_sentinel_hosts() self._extract_sentinel_hosts()
self._sentinel = redis_sentinel.Sentinel( self._sentinel = redis_sentinel.Sentinel(
sentinels=self._sentinel_hosts, sentinels=self._sentinel_hosts,
socket_timeout=self.conf.matchmaker_redis.socket_timeout / 1000., socket_timeout=socket_timeout,
password=password password=self._password)
) self._slave = self._master = None
self._redis_master = self._sentinel.master_for(master_group) @property
self._redis_slave = self._sentinel.slave_for(master_group) def _redis_master(self):
try:
if not self._master:
self._master = self._sentinel.master_for(self._master_group)
return self._master
except redis_sentinel.MasterNotFoundError:
raise zmq_matchmaker_base.MatchmakerUnavailable()
@property
def _redis_slave(self):
try:
if not self._slave:
self._slave = self._sentinel.slave_for(self._master_group)
except redis_sentinel.SlaveNotFoundError:
# use the master as slave (temporary)
return self._redis_master
return self._slave
def _extract_sentinel_hosts(self): def _extract_sentinel_hosts(self):