openstack
/
charm-mysql-innodb-cluster
Code Issues Proposed changes

Enable prefix aware get_allowed_units 

Related CH change: https://github.com/juju/charm-helpers/pull/531
Closes-Bug: #1904610
Change-Id: I49ad33797fb91ecbc5312709481e9236cfa4d840
This commit is contained in:
David Ames 2020-11-17 19:04:26 +00:00
parent 14d69d2411
commit b1e5ad5a97
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/charm/openstack/mysql_innodb_cluster.py
View File

@ -1093,7 +1093,7 @@ class MySQLInnoDBClusterCharm(charms_openstack.charm.OpenStackCharm):
# TODO: Generalize and move to mysql charmhelpers
def get_allowed_units(self, database, username, relation_id,
db_helper=None):
db_helper=None, prefix=None):
"""Get Allowed Units.
Call MySQL8Helper.get_allowed_units and return space delimited list of
@ -1107,13 +1107,17 @@ class MySQLInnoDBClusterCharm(charms_openstack.charm.OpenStackCharm):
:type username: str
:param relation_id: Relation ID
:type relation_id: str
:param db_helper: DB Helper instnace
:type db_helper: MySQLDB8Helper instance
:param prefix: Prefix for db request
:type prefix: str
:returns: Space delimited list of unit names
:rtype: str
"""
if not db_helper:
db_helper = self.get_db_helper()
allowed_units = db_helper.get_allowed_units(
database, username, relation_id=relation_id)
database, username, relation_id=relation_id, prefix=prefix)
allowed_units = sorted(
allowed_units, key=lambda a: int(a.split('/')[-1]))
allowed_units = ' '.join(allowed_units)
@ -1158,7 +1162,8 @@ class MySQLInnoDBClusterCharm(charms_openstack.charm.OpenStackCharm):
allowed_units = self.get_allowed_units(
database, username,
unit.relation.relation_id,
db_helper=db_helper)
db_helper=db_helper,
prefix=prefix)
if prefix in self._unprefixed:
prefix = None

1
src/wheelhouse.txt
View File

@ -1,3 +1,4 @@
mysqlclient
psutil
tenacity
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers