Fix for multiple status-set - related to bug 1588462
This change fixes the obvious race for a status_set() between check_optional_interfaces() and assess_status() as the later calls the former which calls status_set(), returns the status, which is then potentially set again by the assess_status() function. This cleans up the code so that only a single status_set() is performed when calling assess_status(). Change-Id: I928f60967e4a7588df2b25136525391c283cda14 Related-Bug:#1588462
This commit is contained in:
parent
5bb765851d
commit
61047ac055
|
@ -51,7 +51,6 @@ from charmhelpers.contrib.openstack.utils import (
|
|||
git_pip_venv_dir,
|
||||
os_release,
|
||||
save_script_rc as _save_script_rc,
|
||||
set_os_workload_status,
|
||||
pause_unit,
|
||||
resume_unit,
|
||||
is_unit_paused_set,
|
||||
|
@ -86,7 +85,6 @@ from charmhelpers.core.hookenv import (
|
|||
DEBUG,
|
||||
INFO,
|
||||
WARNING,
|
||||
status_get,
|
||||
)
|
||||
|
||||
from charmhelpers.fetch import (
|
||||
|
@ -2143,7 +2141,27 @@ def git_post_install(projects_yaml):
|
|||
service_restart(keystone_service())
|
||||
|
||||
|
||||
def get_optional_interfaces():
|
||||
"""Return the optional interfaces that should be checked if the relavent
|
||||
relations have appeared.
|
||||
:returns: {general_interface: [specific_int1, specific_int2, ...], ...}
|
||||
"""
|
||||
optional_interfaces = {}
|
||||
if relation_ids('ha'):
|
||||
optional_interfaces = {'ha': ['cluster']}
|
||||
return optional_interfaces
|
||||
|
||||
|
||||
def check_optional_relations(configs):
|
||||
"""Check that if we have a relation_id for high availability that we can
|
||||
get the hacluster config. If we can't then we are blocked. This function
|
||||
is called from assess_status/set_os_workload_status as the charm_func and
|
||||
needs to return either "unknown", "" if there is no problem or the status,
|
||||
message if there is a problem.
|
||||
|
||||
:param configs: an OSConfigRender() instance.
|
||||
:return 2-tuple: (string, string) = (status, message)
|
||||
"""
|
||||
if relation_ids('ha'):
|
||||
try:
|
||||
get_hacluster_config()
|
||||
|
@ -2151,11 +2169,9 @@ def check_optional_relations(configs):
|
|||
return ('blocked',
|
||||
'hacluster missing configuration: '
|
||||
'vip, vip_iface, vip_cidr')
|
||||
required_interfaces = {'ha': ['cluster']}
|
||||
set_os_workload_status(configs, required_interfaces)
|
||||
return status_get()
|
||||
else:
|
||||
return 'unknown', 'No optional relations'
|
||||
# return 'unknown' as the lowest priority to not clobber an existing
|
||||
# status.
|
||||
return 'unknown', ''
|
||||
|
||||
|
||||
def assess_status(configs):
|
||||
|
@ -2182,12 +2198,20 @@ def assess_status_func(configs):
|
|||
Used directly by assess_status() and also for pausing and resuming
|
||||
the unit.
|
||||
|
||||
NOTE: REQUIRED_INTERFACES is augmented with the optional interfaces
|
||||
depending on the current config before being passed to the
|
||||
make_assess_status_func() function.
|
||||
|
||||
@param configs: a templating.OSConfigRenderer() object
|
||||
@return f() -> None : a function that assesses the unit's workload status
|
||||
"""
|
||||
required_interfaces = REQUIRED_INTERFACES.copy()
|
||||
required_interfaces.update(get_optional_interfaces())
|
||||
return make_assess_status_func(
|
||||
configs, REQUIRED_INTERFACES, charm_func=check_optional_relations,
|
||||
services=services(), ports=determine_ports())
|
||||
configs, required_interfaces,
|
||||
charm_func=check_optional_relations,
|
||||
services=services(),
|
||||
ports=determine_ports())
|
||||
|
||||
|
||||
def get_admin_domain_id():
|
||||
|
|
|
@ -811,6 +811,7 @@ class TestKeystoneUtils(CharmTestCase):
|
|||
asf.assert_called_once_with('test-config')
|
||||
callee.assert_called_once_with()
|
||||
|
||||
@patch.object(utils, 'get_optional_interfaces')
|
||||
@patch.object(utils, 'REQUIRED_INTERFACES')
|
||||
@patch.object(utils, 'check_optional_relations')
|
||||
@patch.object(utils, 'services')
|
||||
|
@ -821,12 +822,16 @@ class TestKeystoneUtils(CharmTestCase):
|
|||
determine_ports,
|
||||
services,
|
||||
check_optional_relations,
|
||||
REQUIRED_INTERFACES):
|
||||
REQUIRED_INTERFACES,
|
||||
get_optional_interfaces):
|
||||
services.return_value = 's1'
|
||||
determine_ports.return_value = 'p1'
|
||||
REQUIRED_INTERFACES.copy.return_value = {'int': ['test 1']}
|
||||
get_optional_interfaces.return_value = {'opt': ['test 2']}
|
||||
utils.assess_status_func('test-config')
|
||||
make_assess_status_func.assert_called_once_with(
|
||||
'test-config', REQUIRED_INTERFACES,
|
||||
'test-config',
|
||||
{'int': ['test 1'], 'opt': ['test 2']},
|
||||
charm_func=check_optional_relations, services='s1', ports='p1')
|
||||
|
||||
def test_pause_unit_helper(self):
|
||||
|
|
Loading…
Reference in New Issue