RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 11:07:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

mgr/cephadm: report exception during upgrade in upgrade status

Browse Source 
Fixes: https://tracker.ceph.com/issues/50361

Signed-off-by: Adam King <adking@redhat.com>
This commit is contained in:
Adam King 2021-04-14 11:39:10 -04:00
parent 648f9e11a6
commit 6119294b28
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pybind/mgr/cephadm/upgrade.py
View File

@ -80,6 +80,7 @@ class CephadmUpgrade:
'UPGRADE_FAILED_PULL',
'UPGRADE_REDEPLOY_DAEMON',
'UPGRADE_BAD_TARGET_VERSION',
'UPGRADE_EXCEPTION'
]
def __init__(self, mgr: "CephadmOrchestrator"):
@ -250,7 +251,16 @@ class CephadmUpgrade:
:return:
"""
if self.upgrade_state and not self.upgrade_state.paused:
self._do_upgrade()
try:
self._do_upgrade()
except Exception as e:
self._fail_upgrade('UPGRADE_EXCEPTION', {
'severity': 'error',
'summary': 'Upgrade: failed due to an unexpected exception',
'count': 1,
'detail': [f'Unexpected exception occurred during upgrade process: {str(e)}'],
})
return False
return True
return False