openstack/charm-interface-rabbitmq
Code Issues Proposed changes

Differentiate connected and ready hosts

Browse Source 
rabbitmq_hosts is used to check which hosts are connected and also
which are ready. Split these into two different methods and update
the existing rabbitmq_hosts to be a wrapper around
rabbitmq_ready_hosts so that when charms build their contexts they
do not include rabbit units which are not ready for client
connections.

Change-Id: Ic8b669fedfef74ed24db733e01c5dfc0fd079abd
Closes-Bug: #1796886
This commit is contained in:
Liam Young 2020-06-25 07:26:54 +00:00
parent 337e9ee8fd
commit 571f4864c2
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
requires.py
View File

@ -47,7 +47,7 @@ class RabbitMQRequires(RelationBase):
else:
self.remove_state('{relation_name}.available')
self.remove_state('{relation_name}.available.ssl')
if not self.rabbitmq_hosts():
if not self.rabbitmq_connected_hosts():
self.remove_state('{relation_name}.connected')
@hook('{requires:rabbitmq}-relation-changed')
@ -124,8 +124,26 @@ class RabbitMQRequires(RelationBase):
values.append(value)
return list(set(values))
def rabbitmq_connected_hosts(self):
"""Return list of connected rabbit units."""
return self.get_remote_all('private-address')
def rabbitmq_ready_hosts(self):
"""Return list of rabbit units ready to accept client connections."""
hosts = []
for conversation in self.conversations():
for relation_id in conversation.relation_ids:
for unit in hookenv.related_units(relation_id):
rdata = hookenv.relation_get(unit=unit, rid=relation_id)
if rdata.get('password') and rdata.get('private-address'):
hosts.append(rdata['private-address'])
return sorted(hosts)
def rabbitmq_hosts(self):
return sorted(self.get_remote_all('private-address'))
"""
DEPRECATED: Use rabbitmq_connected_hosts or rabbitmq_ready_hosts
Return list of rabbit units ready to accept client connections."""
return self.rabbitmq_ready_hosts()
def get_ssl_cert(self):
"""Return decoded CA cert from rabbit or None if no CA present"""