Merge "Multiple AIO SX upgrade_data files cause upgrade failures"
This commit is contained in:
commit
36f23cb2e0
|
@ -307,16 +307,7 @@ def abort_upgrade(from_load, to_load, upgrade):
|
||||||
except OSError:
|
except OSError:
|
||||||
LOG.exception("Failed to remove upgrade directory %s" % directory)
|
LOG.exception("Failed to remove upgrade directory %s" % directory)
|
||||||
|
|
||||||
simplex_backup_filename = get_upgrade_backup_filename(upgrade) + "*"
|
remove_simplex_upgrade_data(upgrade)
|
||||||
simplex_backup_files = glob.glob(os.path.join(
|
|
||||||
tsc.PLATFORM_BACKUP_PATH, simplex_backup_filename))
|
|
||||||
|
|
||||||
for file in simplex_backup_files:
|
|
||||||
try:
|
|
||||||
LOG.info("Removing simplex upgrade file %s" % file)
|
|
||||||
os.remove(file)
|
|
||||||
except OSError:
|
|
||||||
LOG.exception("Failed to remove %s" % file)
|
|
||||||
|
|
||||||
LOG.info("Finished upgrade abort")
|
LOG.info("Finished upgrade abort")
|
||||||
|
|
||||||
|
@ -352,7 +343,20 @@ def activate_upgrade(from_load, to_load, i_system):
|
||||||
LOG.info("Finished upgrade activation")
|
LOG.info("Finished upgrade activation")
|
||||||
|
|
||||||
|
|
||||||
def complete_upgrade(from_load, to_load):
|
def remove_simplex_upgrade_data(upgrade):
|
||||||
|
simplex_backup_filename = get_upgrade_backup_filename(upgrade) + "*"
|
||||||
|
simplex_backup_files = glob.glob(os.path.join(
|
||||||
|
tsc.PLATFORM_BACKUP_PATH, simplex_backup_filename))
|
||||||
|
|
||||||
|
for file in simplex_backup_files:
|
||||||
|
try:
|
||||||
|
LOG.info("Removing simplex upgrade file %s" % file)
|
||||||
|
os.remove(file)
|
||||||
|
except OSError:
|
||||||
|
LOG.exception("Failed to remove %s" % file)
|
||||||
|
|
||||||
|
|
||||||
|
def complete_upgrade(from_load, to_load, upgrade):
|
||||||
""" Executed on release N+1, cleans up data created for upgrade. """
|
""" Executed on release N+1, cleans up data created for upgrade. """
|
||||||
LOG.info("Starting upgrade complete - from: %s, to: %s" %
|
LOG.info("Starting upgrade complete - from: %s, to: %s" %
|
||||||
(from_load, to_load))
|
(from_load, to_load))
|
||||||
|
@ -375,4 +379,6 @@ def complete_upgrade(from_load, to_load):
|
||||||
except OSError:
|
except OSError:
|
||||||
LOG.exception("Failed to remove upgrade directory %s" % directory)
|
LOG.exception("Failed to remove upgrade directory %s" % directory)
|
||||||
|
|
||||||
|
remove_simplex_upgrade_data(upgrade)
|
||||||
|
|
||||||
LOG.info("Finished upgrade complete")
|
LOG.info("Finished upgrade complete")
|
||||||
|
|
|
@ -9513,7 +9513,7 @@ class ConductorManager(service.PeriodicService):
|
||||||
# Complete the upgrade
|
# Complete the upgrade
|
||||||
LOG.info("Completing upgrade from release: %s to release: %s" %
|
LOG.info("Completing upgrade from release: %s to release: %s" %
|
||||||
(from_version, to_version))
|
(from_version, to_version))
|
||||||
upgrades_management.complete_upgrade(from_version, to_version)
|
upgrades_management.complete_upgrade(from_version, to_version, upgrade)
|
||||||
LOG.info("Finished completing upgrade")
|
LOG.info("Finished completing upgrade")
|
||||||
|
|
||||||
# Delete upgrade record
|
# Delete upgrade record
|
||||||
|
|
Loading…
Reference in New Issue