starlingx/update
Code Issues Proposed changes

Merge "Replace etcd cloning for symlink"

Browse Source
This commit is contained in:
Zuul
2025-05-28 16:12:36 +00:00
committed by Gerrit Code Review
parent 1e1d027702 28ab0e7aa1
commit a8b3c98117
2 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
software/scripts/prepare-data-migration
View File

@@ -157,11 +157,14 @@ class DataMigration(object):
etcd_to_dir = os.path.join(ETCD_PATH, self.to_release)
etcd_from_dir = os.path.join(ETCD_PATH, self.from_release)
shutil.rmtree(etcd_to_dir, ignore_errors=True)
if os.path.islink(etcd_to_dir):
os.unlink(etcd_to_dir)
elif os.path.isdir(etcd_to_dir):
shutil.rmtree(etcd_to_dir, ignore_errors=True)
try:
shutil.copytree(etcd_from_dir, etcd_to_dir)
LOG.info("Copied etcd from %s to %s completed", etcd_from_dir, etcd_to_dir)
os.symlink(etcd_from_dir, etcd_to_dir, target_is_directory=True)
LOG.info("Symlink etcd from %s to %s completed", etcd_from_dir, etcd_to_dir)
except Exception as e:
LOG.exception("Failed to copy etcd from %s to %s. Error: %s.",
etcd_from_dir, etcd_to_dir, e.output)

24
software/software/software_functions.py
View File

@@ -1553,11 +1553,33 @@ def clean_up_deployment_data(major_release):
os.path.join(constants.POSTGRES_PATH, constants.UPGRADE),
os.path.join(constants.POSTGRES_PATH, major_release),
os.path.join(constants.RABBIT_PATH, major_release),
os.path.join(constants.ETCD_PATH, major_release),
]
for folder in upgrade_folders:
shutil.rmtree(folder, ignore_errors=True)
# etcd has different cleanup procedure:
# - remove the to-release symlink
# - rename from-release directory to to-release
# - restart etcd process
etcd_from_path = os.path.join(constants.ETCD_PATH, major_release)
etcd_to_path = os.path.join(constants.ETCD_PATH, SW_VERSION)
if utils.compare_release_version(SW_VERSION, major_release):
if os.path.islink(etcd_to_path):
os.unlink(etcd_to_path)
LOG.info("Removed %s symlink", etcd_to_path)
os.rename(etcd_from_path, etcd_to_path)
LOG.info("Renamed %s directory to %s", etcd_from_path, etcd_to_path)
try:
subprocess.run(["/usr/bin/sm-restart-safe", "service", "etcd"], check=True)
LOG.info("Restarted etcd service")
except subprocess.CalledProcessError as e:
LOG.error("Error restarting etcd: %s", str(e))
# on rollback, only the symlink needs to be removed
else:
if os.path.islink(etcd_from_path):
os.unlink(etcd_from_path)
LOG.info("Removed %s symlink", etcd_from_path)
def remove_major_release_deployment_flags():
"""