starlingx/config
Code Issues Proposed changes

Refresh disk data on CentOS to Debian upgrade

Browse Source 
Debian and CentOS partition scheme differs, so on a upgrade
scenario from CentOS to Debian the hosts may report disk information
different from what is recorded on the database.

This commit allows deleting a PV that fall under these conditions
on the specific scenario of CentOS -> Debian upgrade, and makes
audit check if reported partition data have difference on some
fields to determine if they need to be updated.

Test Plan:
PASS: upgrade and unlock both controller-1 and controller-0 on Debian
      and verify that disk and partition information is consistent
PASS: install, bootstrap and unlock AIO-SX on Debian

Story: 2009303
Task: 46078

Signed-off-by: Heitor Matsui <HeitorVieira.Matsui@windriver.com>
Change-Id: Ia812612c96806a7f886f1997e96f95241e5e0447
This commit is contained in:
Heitor Matsui 2022-08-19 16:52:26 -03:00
parent d0424e9d08
commit 40b7642192
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4610,6 +4610,20 @@ class ConductorManager(service.PeriodicService):
if ipart['device_path'] == db_part.device_path:
found = True
# On CentOS to Debian upgrade partitions may differ
if (ipart['start_mib'] != db_part['start_mib'] or
ipart['end_mib'] != db_part['end_mib'] or
ipart['type_guid'] != db_part['type_guid']):
LOG.info("PART update part start/end/size/type/name")
self.dbapi.partition_update(
db_part.uuid,
{'start_mib': ipart['start_mib'],
'end_mib': ipart['end_mib'],
'size_mib': ipart['size_mib'],
'type_guid': ipart['type_guid'],
'type_name': ipart['type_name']}
)
if ipart['device_node'] != db_part.device_node:
LOG.info("PART update part device node")
self.dbapi.partition_update(
@ -5190,6 +5204,23 @@ class ConductorManager(service.PeriodicService):
LOG.info("remove out-of-date rook provisioned pv %s" % ipv.lvm_pv_name)
self._prepare_for_ipv_removal(ipv)
self.dbapi.ipv_destroy(ipv.id)
# If upgrading from CentOS to Debian the partition scheme
# may differ, so we can remove the PV in this case
# TODO (heitormatsui): remove when CentOS to Debian upgrade is deprecated
try:
upgrade_in_progress = self.dbapi.software_upgrade_get_one()
loads = self.dbapi.load_get_list()
target_load = cutils.get_imported_load(loads)
host_upgrade = self.dbapi.host_upgrade_get_by_host(forihostid)
if (host_upgrade.software_load == upgrade_in_progress.to_load and
target_load.software_version == tsc.SW_VERSION_22_12):
# remove duplicated pv data from CentOS
LOG.info("remove out-of-date CentOS provisioned pv %s" % ipv.lvm_pv_name)
self._prepare_for_ipv_removal(ipv)
self.dbapi.ipv_destroy(ipv.id)
except exception.NotFound:
pass
else:
if (ipv.pv_state == constants.PV_ERR and
ipv.lvm_vg_name == ipv_in_agent['lvm_vg_name']):

1
tsconfig/tsconfig/tsconfig/tsconfig.py
View File

@ -16,6 +16,7 @@ SW_VERSION = ""
SW_VERSION_21_05 = "21.05"
SW_VERSION_21_12 = "21.12"
SW_VERSION_22_06 = "22.06"
SW_VERSION_22_12 = "22.12"
nodetype = None
subfunctions = []