starlingx/update
Code Issues Proposed changes

Merge "Manual recovery for USM states"

Browse Source
This commit is contained in:
Zuul
2024-09-06 19:56:00 +00:00
committed by Gerrit Code Review
parent f23e5cf445 82c22ff33f
commit 027c7fb222
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
software/software/deploy_host_state.py
View File

@@ -19,7 +19,8 @@ deploy_host_state_transition = {
DEPLOY_HOST_STATES.DEPLOYING: [DEPLOY_HOST_STATES.DEPLOYED, DEPLOY_HOST_STATES.FAILED],
DEPLOY_HOST_STATES.FAILED: [DEPLOY_HOST_STATES.DEPLOYING, DEPLOY_HOST_STATES.ROLLBACK_DEPLOYED,
DEPLOY_HOST_STATES.ROLLBACK_PENDING, DEPLOY_HOST_STATES.FAILED],
DEPLOY_HOST_STATES.DEPLOYED: [DEPLOY_HOST_STATES.ROLLBACK_PENDING],
DEPLOY_HOST_STATES.DEPLOYED: [DEPLOY_HOST_STATES.ROLLBACK_PENDING,
DEPLOY_HOST_STATES.FAILED], # manual recovery scenario
DEPLOY_HOST_STATES.ROLLBACK_PENDING: [DEPLOY_HOST_STATES.ROLLBACK_DEPLOYING],
DEPLOY_HOST_STATES.ROLLBACK_DEPLOYING: [DEPLOY_HOST_STATES.ROLLBACK_DEPLOYED,
DEPLOY_HOST_STATES.ROLLBACK_FAILED],
@@ -104,6 +105,10 @@ class DeployHostState(object):
else:
self.transform(DEPLOY_HOST_STATES.ROLLBACK_FAILED)
def failed(self):
"""Transform deploy host state to failed without rollback logic."""
self.transform(DEPLOY_HOST_STATES.FAILED)
def abort(self):
state = self.get_deploy_host_state()
if state == DEPLOY_HOST_STATES.PENDING:

3
software/software/deploy_state.py
View File

@@ -32,7 +32,8 @@ deploy_state_transition = {
DEPLOY_STATES.HOST_FAILED,
DEPLOY_STATES.HOST_DONE,
DEPLOY_STATES.HOST_ROLLBACK],
DEPLOY_STATES.HOST_DONE: [DEPLOY_STATES.ACTIVATE, DEPLOY_STATES.HOST_ROLLBACK],
DEPLOY_STATES.HOST_DONE: [DEPLOY_STATES.ACTIVATE, DEPLOY_STATES.HOST_ROLLBACK,
DEPLOY_STATES.HOST_FAILED], # manual recovery scenario
# deploy host rollback
DEPLOY_STATES.HOST_ROLLBACK: [DEPLOY_STATES.HOST_ROLLBACK,

21
software/software/software_controller.py
View File

@@ -779,7 +779,7 @@ class SWMessageDeployStateChanged(messages.PatchMessage):
self.valid = True
self.agent = None
valid_agents = ['deploy-start', 'deploy-activate', 'deploy-activate-rollback']
valid_agents = ['deploy-start', 'deploy-activate', 'deploy-activate-rollback', 'admin']
if 'agent' in data:
self.agent = data['agent']
else:
@@ -797,7 +797,8 @@ class SWMessageDeployStateChanged(messages.PatchMessage):
DEPLOY_STATES.ACTIVATE_FAILED.value: DEPLOY_STATES.ACTIVATE_FAILED,
DEPLOY_STATES.ACTIVATE_DONE.value: DEPLOY_STATES.ACTIVATE_DONE,
DEPLOY_STATES.ACTIVATE_ROLLBACK_DONE.value: DEPLOY_STATES.ACTIVATE_ROLLBACK_DONE,
DEPLOY_STATES.ACTIVATE_ROLLBACK_FAILED.value: DEPLOY_STATES.ACTIVATE_ROLLBACK_FAILED
DEPLOY_STATES.ACTIVATE_ROLLBACK_FAILED.value: DEPLOY_STATES.ACTIVATE_ROLLBACK_FAILED,
DEPLOY_STATES.HOST_FAILED.value: DEPLOY_STATES.HOST_FAILED
}
if 'deploy-state' in data and data['deploy-state']:
deploy_state = data['deploy-state']
@@ -814,7 +815,7 @@ class SWMessageDeployStateChanged(messages.PatchMessage):
self.hostname = data['hostname']
if 'host-state' in data and data['host-state']:
host_state = data['host-state']
host_state = states.DEPLOY_HOST_STATES(data['host-state'])
if host_state not in states.VALID_HOST_DEPLOY_STATE:
LOG.error("%s received from %s with invalid host-state %s" %
(messages.PATCHMSG_DEPLOY_STATE_CHANGED, self.agent, host_state))
@@ -2633,7 +2634,8 @@ class PatchController(PatchService):
DEPLOY_STATES.ACTIVATE_DONE: deploy_state.activate_done,
DEPLOY_STATES.ACTIVATE_FAILED: deploy_state.activate_failed,
DEPLOY_STATES.ACTIVATE_ROLLBACK_DONE: deploy_state.activate_rollback_done,
DEPLOY_STATES.ACTIVATE_ROLLBACK_FAILED: deploy_state.activate_rollback_failed
DEPLOY_STATES.ACTIVATE_ROLLBACK_FAILED: deploy_state.activate_rollback_failed,
DEPLOY_STATES.HOST_FAILED: deploy_state.deploy_host_failed
}
if new_state in state_event:
state_event[new_state]()
@@ -2643,7 +2645,16 @@ class PatchController(PatchService):
def host_deploy_state_changed(self, hostname, host_deploy_state):
'''Handle 'host deploy state change' event. '''
self.db_api_instance.update_deploy_host(hostname, host_deploy_state)
deploy_host_state = DeployHostState(hostname)
state_event = {
DEPLOY_HOST_STATES.FAILED: deploy_host_state.failed
}
if host_deploy_state in state_event:
state_event[host_deploy_state]()
else:
msg = f"Received invalid deploy host state update {host_deploy_state}"
LOG.error(msg)
def add_text_tag_to_xml(self, parent, name, text):
tag = ET.SubElement(parent, name)