starlingx/openstack-armada-app
Code Issues Proposed changes

Disallow application-apply when vim_progress_status is not enabled

Browse Source 
This fix is specific for AIO-SX because when node is unlocked/enabled/
available the vim_progress_status could still be services-disabled.
The status need a few more seconds to become services-enabled.

Add a pre-check in openstack-armada-app/lifecycle_openstack.py to check
AIO-SX node stable state before perform_app_apply. It prevents
stx-openstack apply being triggered manually during initialization
stage after node unlock.

Closes-bug: 1929775
Signed-off-by: Yvonne Ding <yvonne.ding@windriver.com>
Change-Id: I563f77f617a68092b59f6cb38f5fb436a7933498
This commit is contained in:
Yvonne Ding 2021-05-21 15:54:25 -04:00
parent 650a2d260d
commit 4379649008
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
python-k8sapp-openstack/k8sapp_openstack/k8sapp_openstack/lifecycle/lifecycle_openstack.py
View File

@ -10,6 +10,7 @@
from eventlet import greenthread from eventlet import greenthread
from oslo_log import log as logging from oslo_log import log as logging
from sysinv.api.controllers.v1 import utils
from sysinv.common import constants from sysinv.common import constants
from sysinv.common import exception from sysinv.common import exception
from sysinv.helm import common from sysinv.helm import common
@ -78,6 +79,10 @@ class OpenstackAppLifecycleOperator(base.AppLifecycleOperator):
if hook_info.mode == constants.APP_LIFECYCLE_MODE_AUTO and \ if hook_info.mode == constants.APP_LIFECYCLE_MODE_AUTO and \
hook_info.operation == constants.APP_EVALUATE_REAPPLY_OP: hook_info.operation == constants.APP_EVALUATE_REAPPLY_OP:
return self._semantic_check_evaluate_app_reapply(app_op, app, hook_info) return self._semantic_check_evaluate_app_reapply(app_op, app, hook_info)
elif hook_info.mode == constants.APP_LIFECYCLE_MODE_MANUAL and \
hook_info.operation == constants.APP_APPLY_OP and \
hook_info.relative_timing == constants.APP_LIFECYCLE_TIMING_PRE:
return self._pre_manual_apply_check(conductor_obj, app, hook_info)
# Default behavior # Default behavior
super(OpenstackAppLifecycleOperator, self).app_lifecycle_actions(context, conductor_obj, app_op, app, super(OpenstackAppLifecycleOperator, self).app_lifecycle_actions(context, conductor_obj, app_op, app,
@ -280,3 +285,24 @@ class OpenstackAppLifecycleOperator(base.AppLifecycleOperator):
"Trigger type {} expects {} to be true".format( "Trigger type {} expects {} to be true".format(
trigger[LifecycleConstants.TRIGGER_TYPE], trigger[LifecycleConstants.TRIGGER_TYPE],
LifecycleConstants.TRIGGER_CONFIGURE_REQUIRED)) LifecycleConstants.TRIGGER_CONFIGURE_REQUIRED))
def _pre_manual_apply_check(self, conductor_obj, app, hook_info):
"""Semantic check for evaluating app manual apply
:param conductor_obj: conductor object
:param app: AppOperator.Application object
:param hook_info: LifecycleHookInfo object
"""
# Check AIO-SX node stable state
active_controller = utils.HostHelper.get_active_controller(conductor_obj.dbapi)
if (utils.is_host_simplex_controller(active_controller) and
not active_controller.vim_progress_status.startswith(
constants.VIM_SERVICES_ENABLED)):
LOG.info("%s requires application-apply, but some VIM services "
"are not at services-enabled state on node %s. "
"Application-apply rejected." % (app.name, active_controller.hostname))
raise exception.LifecycleSemanticCheckException(
"Application-apply rejected: operation is not allowed "
"while the node {} not in {} state.".format(
active_controller.hostname, constants.VIM_SERVICES_ENABLED))