Merge "AIO-DX: Controller-1 fails to be unlocked after downgrade"
This commit is contained in:
commit
21462704d3
|
@ -3973,6 +3973,17 @@ class ConductorManager(service.PeriodicService):
|
||||||
LOG.exception("Invalid ihost_uuid %s" % ihost_uuid)
|
LOG.exception("Invalid ihost_uuid %s" % ihost_uuid)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
try:
|
||||||
|
self.dbapi.software_upgrade_get_one()
|
||||||
|
except exception.NotFound:
|
||||||
|
# No upgrade in progress
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
if db_host.software_load != tsc.SW_VERSION:
|
||||||
|
LOG.info("Ignore updating disk partition for host: %s. Version "
|
||||||
|
"%s mismatch." % (db_host.hostname, db_host.software_load))
|
||||||
|
return
|
||||||
|
|
||||||
# Get the id of the host.
|
# Get the id of the host.
|
||||||
forihostid = db_host['id']
|
forihostid = db_host['id']
|
||||||
|
|
||||||
|
@ -4164,6 +4175,17 @@ class ConductorManager(service.PeriodicService):
|
||||||
LOG.exception("Invalid ihost_uuid %s" % ihost_uuid)
|
LOG.exception("Invalid ihost_uuid %s" % ihost_uuid)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
try:
|
||||||
|
self.dbapi.software_upgrade_get_one()
|
||||||
|
except exception.NotFound:
|
||||||
|
# No upgrade in progress
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
if ihost.software_load != tsc.SW_VERSION:
|
||||||
|
LOG.info("Ignore updating physical volume for host: %s. Version "
|
||||||
|
"%s mismatch." % (ihost.hostname, ihost.software_load))
|
||||||
|
return
|
||||||
|
|
||||||
forihostid = ihost['id']
|
forihostid = ihost['id']
|
||||||
|
|
||||||
ipvs = self.dbapi.ipv_get_by_ihost(ihost_uuid)
|
ipvs = self.dbapi.ipv_get_by_ihost(ihost_uuid)
|
||||||
|
|
Loading…
Reference in New Issue