starlingx
/
config
Code Issues Proposed changes

Merge "Block restore-complete while apps are restore-requested"

This commit is contained in:
Zuul 2023-04-27 15:46:28 +00:00 committed by Gerrit Code Review
parent c94e6c8e88 6f5766c386
commit ed4e1c5ac5
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sysinv/sysinv/sysinv/sysinv/conductor/manager.py
View File

@ -15556,6 +15556,17 @@ class ConductorManager(service.PeriodicService):
LOG.error(e)
return message
# Do not allow restore to complete if some apps are still in restore-requested state
waiting_apps = [
v.name for v in self.dbapi.kube_app_get_all()
if v.status in [constants.APP_APPLY_IN_PROGRESS, constants.APP_RESTORE_REQUESTED]]
if waiting_apps:
message = "Some apps are still restoring, " \
"try restore-complete later: {}".format(waiting_apps)
LOG.info(message)
return message
try:
restore = self.dbapi.restore_get_one(
filters={'state': constants.RESTORE_STATE_IN_PROGRESS})