From 6658c53d6f651373f0d9c2559b3524815604d30a Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Tue, 2 Feb 2021 10:42:44 -0700 Subject: [PATCH] mgr/cephadm: Local variable name is assigned to but never used (F841) add error handling when `CompletedProcess` fails during rgw relam, zongroup create et al. Signed-off-by: Michael Fritch --- .../mgr/cephadm/services/cephadmservice.py | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/pybind/mgr/cephadm/services/cephadmservice.py b/src/pybind/mgr/cephadm/services/cephadmservice.py index e4060152a8b99..eaa24367128ab 100644 --- a/src/pybind/mgr/cephadm/services/cephadmservice.py +++ b/src/pybind/mgr/cephadm/services/cephadmservice.py @@ -682,7 +682,10 @@ class RgwService(CephService): 'realm', 'create', '--rgw-realm=%s' % spec.rgw_realm, '--default'] - result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) # noqa: F841 + result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + if result.returncode: + err = 'failed to create RGW realm "%s": %r' % (spec.rgw_realm, result.stderr) + raise OrchestratorError(err) self.mgr.log.info('created realm: %s' % spec.rgw_realm) def get_zonegroups() -> List[str]: @@ -708,7 +711,10 @@ class RgwService(CephService): 'zonegroup', 'create', '--rgw-zonegroup=default', '--master', '--default'] - result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) # noqa: F841 + result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + if result.returncode: + err = 'failed to create RGW zonegroup "%s": %r' % ('default', result.stderr) + raise OrchestratorError(err) self.mgr.log.info('created zonegroup: default') def create_zonegroup_if_required() -> None: @@ -740,7 +746,10 @@ class RgwService(CephService): '--rgw-zonegroup=default', '--rgw-zone=%s' % spec.rgw_zone, '--master', '--default'] - result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) # noqa: F841 + result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + if result.returncode: + err = 'failed to create RGW zone "%s": %r' % (spec.rgw_zone, result.stderr) + raise OrchestratorError(err) self.mgr.log.info('created zone: %s' % spec.rgw_zone) changes = False @@ -763,7 +772,10 @@ class RgwService(CephService): 'period', 'update', '--rgw-realm=%s' % spec.rgw_realm, '--commit'] - result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) # noqa: F841 + result = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + if result.returncode: + err = 'failed to update RGW period: %r' % (result.stderr) + raise OrchestratorError(err) self.mgr.log.info('updated period') -- 2.39.5