]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
fix unreachable code path 65469/head
authorKushal Deb <Kushal.Deb@ibm.com>
Wed, 10 Sep 2025 09:53:44 +0000 (15:23 +0530)
committerKushal Deb <Kushal.Deb@ibm.com>
Mon, 22 Sep 2025 05:01:07 +0000 (10:31 +0530)
Signed-off-by: Kushal Deb <Kushal.Deb@ibm.com>
src/pybind/mgr/rgw/module.py

index 284d88ef175194ceb536b85312bb970d98f5b25e..fd5f0f7ff48b24bf69bfb70f51e6e14e2da882c9 100644 (file)
@@ -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))