starlingx
/
config
Code Issues Proposed changes

Fix controller-0 downgrade failing to kill ceph 

kill_ceph_storage_monitor tried to manipulate a pmon
file that does not exist in an AIO-DX environment.

We no longer invoke kill_ceph_storage_monitor in an
AIO SX or DX env.

This allows: "system host-downgrade controller-0"
to proceed in an AIO-DX environment where that second
controller (controller-0) was upgraded.

Partial-Bug: 1929884
Signed-off-by: albailey <Al.Bailey@windriver.com>
Change-Id: I633853f75317736084feae96b5b849c601204c13
This commit is contained in:
albailey 2021-05-28 13:42:42 -05:00
parent ec3436b8d4
commit 31c77439d2
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sysinv/sysinv/sysinv/sysinv/api/controllers/v1/host.py
View File

@ -2769,7 +2769,10 @@ class HostController(rest.RestController):
self._semantic_check_rollback()
if StorageBackendConfig.has_backend_configured(
pecan.request.dbapi, constants.CINDER_BACKEND_CEPH):
disable_storage_monitor = True
# elif block ensures this is a duplex env.
# We do not set disable_storage_monitor True for AIO-DX
if not cutils.is_aio_duplex_system(pecan.request.dbapi):
disable_storage_monitor = True
# the upgrade rollback flag can only be created by root so
# send an rpc request to sysinv-conductor to create the flag
pecan.request.rpcapi.update_controller_rollback_flag(

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

@ -6460,8 +6460,9 @@ class ConductorManager(service.PeriodicService):
def kill_ceph_storage_monitor(self, context):
"""Stop the ceph storage monitor.
pmon will not restart it. This should only be used in an
upgrade/rollback
pmon will not restart it.
This should only be used in an upgrade/rollback.
This should not be called for an AIO (SX or DX).
:param context: request context.
"""