openstack
/
charm-rabbitmq-server
Code Issues Proposed changes

Polish series upgrade 

Handle stray cluster-relation-changed hooks.
Handle config-changed with old cloud pocket.

Change-Id: I48a562a8051b78dfbaca8400f46ae5b0b53373cc
This commit is contained in:
David Ames 2018-09-19 13:07:46 +00:00
parent 2d4fba0360
commit cb2a7f415c
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hooks/rabbit_utils.py
View File

@ -459,6 +459,10 @@ def join_cluster(node):
def cluster_with():
if is_unit_paused_set():
log("Do not run cluster_with while unit is paused", "WARNING")
return
log('Clustering with new node')
# check the leader and try to cluster with it

5
hooks/rabbitmq_server_relations.py
View File

@ -752,8 +752,9 @@ def config_changed():
interface=rabbit.CLUSTER_INTERFACE):
rabbit.get_unit_hostname()})
# Add archive source if provided
add_source(config('source'), config('key'))
# Add archive source if provided and not in the upgrade process
if not leader_get("cluster_series_upgrading"):
add_source(config('source'), config('key'))
# Copy in defaults file for updated ulimits
shutil.copyfile(
'templates/rabbitmq-server',

16
unit_tests/test_rabbit_utils.py
View File

@ -228,6 +228,7 @@ class UtilsTests(CharmTestCase):
self.assertEqual(rabbit_utils.leader_node(),
'rabbit@juju-devel3-machine-15')
@mock.patch('rabbit_utils.is_unit_paused_set')
@mock.patch('rabbit_utils.cluster_wait')
@mock.patch('rabbit_utils.relation_set')
@mock.patch('rabbit_utils.wait_app')
@ -243,7 +244,9 @@ class UtilsTests(CharmTestCase):
mock_running_nodes, mock_time,
mock_check_output, mock_check_call,
mock_wait_app,
mock_relation_set, mock_cluster_wait):
mock_relation_set, mock_cluster_wait,
mock_is_unit_paused_set):
mock_is_unit_paused_set.return_value = False
mock_cmp_pkgrevno.return_value = True
mock_clustered.return_value = False
mock_leader_node.return_value = 'rabbit@juju-devel7-machine-11'
@ -255,6 +258,7 @@ class UtilsTests(CharmTestCase):
'rabbit@juju-devel7-machine-11'],
stderr=-2)
@mock.patch('rabbit_utils.is_unit_paused_set')
@mock.patch('rabbit_utils.relation_get')
@mock.patch('rabbit_utils.relation_id')
@mock.patch('rabbit_utils.peer_retrieve')
@ -269,7 +273,9 @@ class UtilsTests(CharmTestCase):
mock_leader_node, mock_running_nodes,
mock_time, mock_check_output,
mock_check_call, mock_peer_retrieve,
mock_relation_id, mock_relation_get):
mock_relation_id, mock_relation_get,
mock_is_unit_paused_set):
mock_is_unit_paused_set.return_value = False
mock_clustered.return_value = True
mock_peer_retrieve.return_value = 'juju-devel7-machine-11'
mock_leader_node.return_value = 'rabbit@juju-devel7-machine-11'
@ -297,6 +303,7 @@ class UtilsTests(CharmTestCase):
rabbit_utils.cluster_with()
self.assertEqual(0, mock_check_output.call_count)
@mock.patch('rabbit_utils.is_unit_paused_set')
@mock.patch('time.time')
@mock.patch('rabbit_utils.relation_set')
@mock.patch('rabbit_utils.get_unit_hostname')
@ -308,8 +315,9 @@ class UtilsTests(CharmTestCase):
mock_running_nodes, mock_relation_id,
mock_relation_get,
mock_get_unit_hostname,
mock_relation_set, mock_time):
mock_relation_set, mock_time,
mock_is_unit_paused_set):
mock_is_unit_paused_set.return_value = False
mock_peer_retrieve.return_value = 'localhost'
mock_running_nodes.return_value = ['rabbit@localhost']
mock_relation_id.return_value = 'cluster:1'