Browse Source

Handle "updating" and "recovering" app update states during

upgrade activation

During simplex subcloud upgrade, if the initial upgrade
activation request fails, dcmanager orchestrator re-tries the
activation by sending another request (current logic is to
retry up to 10 times). On the second upgrade activation
request, sysinv skips the oidc-auth-apps reapply as the
app is in 'updating' state and proceeds to completing the
remaining steps of the activation sequence. As a result,
upgrade activation completes while platform apps were either
in the incorrect version or incorrect state.

This commit resolves the issue by skipping only for "uploaded"
and "applied" states during upgrade activation.

Change-Id: I4b0aa4897e83a47ccdcf58c37232301f3668de32
Signed-off-by: Jessica Castelino <jessica.castelino@windriver.com>
Story: 2008055
Task: 42246
changes/87/786287/6
Jessica Castelino 2 months ago
parent
commit
251afbcdfb
1 changed files with 6 additions and 2 deletions
  1. +6
    -2
      controllerconfig/controllerconfig/upgrade-scripts/65-k8s-app-upgrade.sh

+ 6
- 2
controllerconfig/controllerconfig/upgrade-scripts/65-k8s-app-upgrade.sh View File

@ -101,8 +101,12 @@ if [ "$FROM_RELEASE" == "20.06" ] && [ "$ACTION" == "activate" ]; then
log "$NAME: $EXISTING_APP_NAME, version $EXISTING_APP_VERSION, is currently in the state: $EXISTING_APP_STATUS"
if [ "x${UPGRADE_APP_VERSION}" == "x${EXISTING_APP_VERSION}" ]; then
log "$NAME: ${UPGRADE_APP_NAME}, version ${EXISTING_APP_VERSION}, is already present. skipping..."
continue
# If the app is in uploaded or applied state, then we continue with next iteration.
# Else, the code execution proceeds and the script would exit with an unexpected state.
if [[ "${EXISTING_APP_STATUS}" =~ ^(uploaded|applied)$ ]]; then
log "$NAME: ${UPGRADE_APP_NAME}, version ${EXISTING_APP_VERSION}, is already present. skipping..."
continue
fi
fi
# All applications should be in an 'applied' or 'uploaded' state. Any other state is unexpected


Loading…
Cancel
Save