From: Kushal Deb Date: Wed, 10 Sep 2025 09:53:44 +0000 (+0530) Subject: fix unreachable code path X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F65469%2Fhead;p=ceph.git fix unreachable code path Signed-off-by: Kushal Deb --- diff --git a/src/pybind/mgr/rgw/module.py b/src/pybind/mgr/rgw/module.py index 284d88ef1751..fd5f0f7ff48b 100644 --- a/src/pybind/mgr/rgw/module.py +++ b/src/pybind/mgr/rgw/module.py @@ -238,12 +238,12 @@ class Module(orchestrator.OrchestratorClientMixin, MgrModule): msg = f'{msg}; {e.stdout}' elif e.stdout: msg = e.stdout - return HandleCommandResult(retval=e.retcode, stdout=msg, stderr=e.stderr) + e.stderr = (e.stderr or '') + ( "\nNote: Partial bootstrap detected - The following entries were already created during a previous bootstrap attempt. \n" "To resume, run:\n ceph rgw realm bootstrap with --skip-realm-components\n" ) - return HandleCommandResult(retval=e.retcode, stdout=e.stdout, stderr=e.stderr) + return HandleCommandResult(retval=e.retcode, stdout=msg, stderr=e.stderr) except PoolCreationError as e: self.log.error(f'Pool creation failure: {str(e)}') return HandleCommandResult(retval=-errno.EINVAL, stderr=str(e))