Guarantee executable OCF mysql_monitor file

Closes-Bug: #1890470
Change-Id: Iee0aa8b1ae0f364d01d30a61381af222a264b090
This commit is contained in:
David Ames 2020-08-06 11:52:05 -07:00 committed by Liam Young
parent f2916a4f09
commit 7eddd6074d
3 changed files with 7 additions and 1 deletions

View File

@ -205,6 +205,7 @@ def install():
apt_update(fatal=True)
install_percona_xtradb_cluster()
install_mysql_ocf()
def render_config(hosts=None):
@ -935,6 +936,7 @@ def shared_db_changed(relation_id=None, unit=None):
@hooks.hook('ha-relation-joined')
def ha_relation_joined(relation_id=None):
install_mysql_ocf()
sstpsswd = sst_password()
_relation_data = {
'resources': {
@ -969,6 +971,7 @@ def ha_relation_joined(relation_id=None):
@hooks.hook('ha-relation-changed')
def ha_relation_changed():
install_mysql_ocf()
update_client_db_relations()

View File

@ -442,6 +442,8 @@ def install_mysql_ocf():
else:
log("'{}' already exists, skipping"
.format(dest_file), level='INFO')
# Always set to executable
os.chmod(dest_file, 0o755)
def get_wsrep_value(key):

View File

@ -51,7 +51,8 @@ TO_PATCH = ['log', 'config',
'peer_retrieve_by_prefix',
'client_node_is_ready',
'relation_set',
'relation_get']
'relation_get',
'install_mysql_ocf']
class TestSharedDBRelation(CharmTestCase):