starlingx/config
Code Issues Proposed changes

Improvements to application dependency behavior on deploy activate

Browse Source 
This change adds improvements that were discussed in the review
https://review.opendev.org/c/starlingx/config/+/927528.

An unnecessary check has been removed from the update_in_series
function in the upgrade script 65. Spelling corrections have also
been added.

These changes also resolve a bug for Zuul that runs the
"sysinv tox" command. The command was failing due to the import
"from sysinv.api.controllers.v1 import kube_app" which in turn
failed to resolve the import of the fm_core package which is not
found if imported directly.

This is an intermediate solution, but a new task will be created
to deal with this, resolving the issue with the Fault repository
and adjusting the tox of all applications.

Test Plan:
PASS: build-pkgs && build-image
PASS: run "tox -e flake8"
PASS: run "tox -e metadata" in metrics-server repository
PASS: run "tox -e metadata" in istio repository
PASS: Upgrade from stx-9 to master
PASS: 65-k8s-app-upgrade.sh script runs without errors
PASS: Applications that can be updated in parallel are updated
      in parallel.
PASS: Applications that need to be serially updated are serially
      updated.

Closes-bug: 2078948
Closes-bug: 2080063

Change-Id: I79c6e5e46ec3f4b693f1325d0241b29c60ec489e
Signed-off-by: David Bastos <david.barbosabastos@windriver.com>
This commit is contained in:
David Bastos
2024-09-10 08:24:58 -03:00
parent cacd50005c
commit a381232a0c
2 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
controllerconfig/controllerconfig/upgrade-scripts/65-k8s-app-upgrade.sh
View File

@@ -169,8 +169,7 @@ function update_in_series {
UPDATING_APP_VERSION=$(echo ${UPDATING_APP_INFO} | sed 's/.*app_version:[[:space:]]\(\S*\).*/\1/')
UPDATING_APP_STATUS=$(echo ${UPDATING_APP_INFO} | sed 's/.*status:[[:space:]]\(\S*\).*/\1/')
if [ "${UPDATING_APP_NAME}" == "${UPGRADE_APP_NAME}" ] && \
[ "${UPDATING_APP_VERSION}" == "${UPGRADE_APP_VERSION}" ] && \
if [ "${UPDATING_APP_VERSION}" == "${UPGRADE_APP_VERSION}" ] && \
[ "${UPDATING_APP_STATUS}" == "applied" ]; then
ALARMS=$(fm alarm-list --nowrap --uuid --query "alarm_id=750.005;entity_type_id=k8s_application;entity_instance_id=${UPGRADE_APP_NAME}" | head -n-1 | tail -n+4 | awk '{print $2}')
for alarm in ${ALARMS}; do
@@ -195,12 +194,12 @@ function update_in_series {
}
function update_apps {
COMPATIBLES_APPS=$1
IS_SERIAL_INSTALATION=$2
PATHS_TO_TARBALLS=$1
IS_SERIAL_INSTALLATION=$2
LAST_APP_CHECKED=""
# Get the list of applications installed in the new release
for fqpn_app in $COMPATIBLES_APPS; do
for fqpn_app in $PATHS_TO_TARBALLS; do
# Extract the app name and version from the tarball name: app_name-version.tgz
re='^(.*)-([0-9]+\.[0-9]+-[0-9]+).tgz'
[[ "$(basename $fqpn_app)" =~ $re ]]
@@ -267,7 +266,7 @@ function update_apps {
log "Updating ${EXISTING_APP_NAME}, from version ${EXISTING_APP_VERSION} to version ${UPGRADE_APP_VERSION} from $fqpn_app"
system application-update $fqpn_app
if [ "$IS_SERIAL_INSTALATION" == "true" ]; then
if [ "$IS_SERIAL_INSTALLATION" == "true" ]; then
update_in_series
fi
;;
@@ -333,18 +332,18 @@ if [ "$ACTION" == "activate" ]; then
K8S_VERSIONS=$(system kube-version-list)
ACTIVE_K8S_VERSION=$(echo "$K8S_VERSIONS" | grep ' True ' | grep ' active ' | awk -F '|' '{print $2}' | tr -d ' ')
# Get compatibles apps with current k8s version
# Get apps compatible with current k8s version
# TODO(dbarbosa): Remove "--log-file ${SOFTWARE_LOG_PATH}" after fixing the issue with logs of
# the "sysinv-app query <k8s-target-version>" being logged to stdout.
COMPATIBLES_APPS=$(sudo sysinv-app --log-file ${SOFTWARE_LOG_PATH} query ${ACTIVE_K8S_VERSION})
COMPATIBLES_APPS_FORMATED=$(echo "$COMPATIBLES_APPS" | paste -sd '|')
COMPATIBLE_APPS=$(sudo sysinv-app --log-file ${SOFTWARE_LOG_PATH} query ${ACTIVE_K8S_VERSION})
COMPATIBLE_APPS_FORMATED=$(echo "$COMPATIBLE_APPS" | paste -sd '|')
# Get all loads apps
APPS_LOADED=$(system application-list | head -n-1 | tail -n+4 | awk '{print $2}')
# Check and log compatible and not compatible apps
for APP in $APPS_LOADED; do
if [[ "${APP}" =~ (${COMPATIBLES_APPS_FORMATED}) ]]; then
if [[ "${APP}" =~ (${COMPATIBLE_APPS_FORMATED}) ]]; then
log "${APP} has an upgrade compatible tarball and will be updated."
else
log "${APP} does not have an upgrade compatible tarball and will remain at its current version."
@@ -361,31 +360,31 @@ if [ "$ACTION" == "activate" ]; then
# Sort applications by version. Lower versions are attempted first.
# TODO(dbarbosa): Remove "--log-file ${SOFTWARE_LOG_PATH}" after fixing the issue with logs of
# the "sysinv-app query <k8s-target-version>" being logged to stdout.
COMPATIBLES_APPS_TARBALL_PATH=$(sudo sysinv-app --log-file ${SOFTWARE_LOG_PATH} query ${ACTIVE_K8S_VERSION} --include-path | sort -V)
PATHS_TO_COMPATIBLE_TARBALLS=$(sudo sysinv-app --log-file ${SOFTWARE_LOG_PATH} query ${ACTIVE_K8S_VERSION} --include-path | sort -V)
CRITICAL_APPS_PATHS=""
# From the list of COMPATIBLES_APPS_TARBALL_PATH, apps that have priority for installation by the platform are separated.
# From the list of PATHS_TO_COMPATIBLE_TARBALLS, apps that have priority for installation by the platform are separated.
for app in $CRITICAL_APPS; do
# Get the first matching path for the app
matched_path=$(echo "$COMPATIBLES_APPS_TARBALL_PATH" | grep -m 1 "/$app-")
matched_path=$(echo "$PATHS_TO_COMPATIBLE_TARBALLS" | grep -m 1 "/$app-")
# Add the matched path to MATCHED_PATHS if found
if [ -n "$matched_path" ]; then
CRITICAL_APPS_PATHS+="$matched_path "
# Remove the matched path from COMPATIBLES_APPS_TARBALL_PATH
COMPATIBLES_APPS_TARBALL_PATH=$(echo "$COMPATIBLES_APPS_TARBALL_PATH" | grep -v "$matched_path")
# Remove the matched path from PATHS_TO_COMPATIBLE_TARBALLS
PATHS_TO_COMPATIBLE_TARBALLS=$(echo "$PATHS_TO_COMPATIBLE_TARBALLS" | grep -v "$matched_path")
fi
done
APPS_IN_SERIAL_PATH=''
APPS_IN_PARALLEL_PATHS=''
# Find matches between ALL_SYSTEM_SERIAL_APPLICATION and COMPATIBLES_APPS_TARBALL_PATH and save
# Find matches between ALL_SYSTEM_SERIAL_APPLICATION and PATHS_TO_COMPATIBLE_TARBALLS and save
# to APPS_IN_SERIAL_PATH
for app in $ALL_SYSTEM_SERIAL_APPLICATION; do
# Find the corresponding path in COMPATIBLES_APPS_TARBALL_PATH
matched_path=$(echo "$COMPATIBLES_APPS_TARBALL_PATH" | grep -m 1 "/$app-")
# Find the corresponding path in PATHS_TO_COMPATIBLE_TARBALLS
matched_path=$(echo "$PATHS_TO_COMPATIBLE_TARBALLS" | grep -m 1 "/$app-")
# If a match is found, append it to APPS_IN_SERIAL_PATH
if [ -n "$matched_path" ]; then
@@ -393,9 +392,9 @@ if [ "$ACTION" == "activate" ]; then
fi
done
# Find unmatched paths between ALL_SYSTEM_SERIAL_APPLICATION and COMPATIBLES_APPS_TARBALL_PATH
# Find unmatched paths between ALL_SYSTEM_SERIAL_APPLICATION and PATHS_TO_COMPATIBLE_TARBALLS
# and save to APPS_IN_PARALLEL_PATHS
for path in $COMPATIBLES_APPS_TARBALL_PATH; do
for path in $PATHS_TO_COMPATIBLE_TARBALLS; do
if ! echo -e "$APPS_IN_SERIAL_PATH" | grep -q "$path"; then
APPS_IN_PARALLEL_PATHS="${APPS_IN_PARALLEL_PATHS}${path} "
fi

30
sysinv/sysinv/sysinv/sysinv/cmd/applications.py
View File

@@ -18,7 +18,6 @@ from distutils.version import LooseVersion
from oslo_config import cfg
from oslo_log import log
from sysinv.api.controllers.v1 import kube_app as kube_api
from sysinv.common import constants
from sysinv.common import exception
from sysinv.common import kubernetes
@@ -26,7 +25,6 @@ from sysinv.common import service
from sysinv.common.app_metadata import verify_application
from sysinv.common.app_metadata import verify_application_tarball
from sysinv.common import utils as cutils
from sysinv.conductor import kube_app
from sysinv.db import api
CONF = cfg.CONF
@@ -34,6 +32,32 @@ CONF = cfg.CONF
LOG = log.getLogger(__name__)
# TODO(dbarbosa): Remove the get_kube_api function and return imports to the top of the file
# after the issue with fm_core import was resolved in the Fault repository
def get_kube_api():
"""Import kube_app from sysinv.api.controllers.v1 only when needed
It is necessary to import kube_app separately only when needed due to the fm_core package
(which is imported inside kube_app by fault repository) failing if imported when the
"sysinv tox" or "sysinv verify-metadata" command is run.
"""
from sysinv.api.controllers.v1 import kube_app
return kube_app
# TODO(dbarbosa): Remove the get_kube_app function and return imports to the top of the file
# after the issue with fm_core import was resolved in the Fault repository
def get_kube_app():
"""Import kube_app from sysinv.conductor only when needed
It is necessary to import kube_app separately only when needed due to the fm_core package
(which is imported inside kube_app by fault repository) failing if imported when the
"sysinv tox" or "sysinv verify-metadata" command is run.
"""
from sysinv.conductor import kube_app
return kube_app
def verify_application_tox(path):
"""Verify an application using tox.
@@ -156,6 +180,8 @@ def load_metadata_of_apps(apps_metadata):
"""
dbapi = api.get_instance()
kube_api = get_kube_api()
kube_app = get_kube_app()
kube_app_helper = kube_api.KubeAppHelper(dbapi)
# All installed K8S Apps.