openstack/charm-cinder
Code Issues Proposed changes

Ensure that migration only occurs when unit can assure that mysql has granted it permissions to access the database

Browse Source
This commit is contained in:
James Page 2015-04-21 16:01:57 +01:00
parent 8a9d1d2a69
commit b147c1a84b
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hooks/cinder_hooks.py
View File

@ -195,11 +195,12 @@ def db_changed():
# acl entry has been added. So, if the db supports passing a list of # acl entry has been added. So, if the db supports passing a list of
# permitted units then check if we're in the list. # permitted units then check if we're in the list.
allowed_units = relation_get('allowed_units') allowed_units = relation_get('allowed_units')
if allowed_units and local_unit() not in allowed_units.split(): if allowed_units and local_unit() in allowed_units.split():
juju_log('Allowed_units list provided and this unit not present')
return
juju_log('Cluster leader, performing db sync') juju_log('Cluster leader, performing db sync')
migrate_database() migrate_database()
else:
juju_log('allowed_units either not presented, or local unit '
'not in acl list: %s' % allowed_units)
@hooks.hook('pgsql-db-relation-changed') @hooks.hook('pgsql-db-relation-changed')

9
unit_tests/test_cinder_hooks.py
View File

@ -244,6 +244,15 @@ class TestChangedHooks(CharmTestCase):
hooks.hooks.execute(['hooks/shared-db-relation-changed']) hooks.hooks.execute(['hooks/shared-db-relation-changed'])
self.assertFalse(self.migrate_database.called) self.assertFalse(self.migrate_database.called)
def test_db_changed_relation_db_missing_acls(self):
'It does not migration when acl list is not present'
self.relation_get.return_value = None
self.local_unit.return_value = 'cinder/0'
self.CONFIGS.complete_contexts.return_value = ['shared-db']
self.eligible_leader.return_value = True
hooks.hooks.execute(['hooks/shared-db-relation-changed'])
self.assertFalse(self.migrate_database.called)
def test_pgsql_db_changed_relation_incomplete(self): def test_pgsql_db_changed_relation_incomplete(self):
'It does not write out cinder.conf with incomplete pgsql-db rel' 'It does not write out cinder.conf with incomplete pgsql-db rel'
hooks.hooks.execute(['hooks/pgsql-db-relation-changed']) hooks.hooks.execute(['hooks/pgsql-db-relation-changed'])