RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-20 17:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ceph-daemon: raise RuntimeError when CephContainer.run() fails

Browse Source 
Signed-off-by: Michael Fritch <mfritch@suse.com>
This commit is contained in:
Michael Fritch 2019-10-31 13:04:39 -06:00
parent 7e4ef7f8ec
commit f956c45851
No known key found for this signature in database
GPG Key ID: 75F3EB2E80A03B7F
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ceph-daemon
View File

@ -78,7 +78,7 @@ podman_path = None
##################################
# Popen wrappers, lifted from ceph-volume
def call(command, desc=None, verbose=False, **kw):
def call(command, desc=None, verbose=False, **kwargs):
"""
Wrap subprocess.Popen to
@ -93,7 +93,7 @@ def call(command, desc=None, verbose=False, **kw):
"""
if not desc:
desc = command[0]
verbose_on_failure = kw.pop('verbose_on_failure', True)
verbose_on_failure = kwargs.pop('verbose_on_failure', True)
logger.debug("Running command: %s" % ' '.join(command))
process = subprocess.Popen(
@ -101,7 +101,7 @@ def call(command, desc=None, verbose=False, **kw):
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
close_fds=True,
**kw
**kwargs
)
# get current p.stdout flags, add O_NONBLOCK
stdout_flags = fcntl.fcntl(process.stdout, fcntl.F_GETFL)
@ -160,7 +160,7 @@ def call(command, desc=None, verbose=False, **kw):
return out, err, returncode
def call_throws(command, **kwargs):
out, err, ret = call(command, command[0], **kwargs)
out, err, ret = call(command, **kwargs)
if ret:
raise RuntimeError('Failed command: %s' % ' '.join(command))
return out, err, ret
@ -757,7 +757,7 @@ class CephContainer:
def run(self):
logger.debug(self.run_cmd())
out, _, _ = call(self.run_cmd(), self.entrypoint)
out, _, _ = call_throws(self.run_cmd(), desc=self.entrypoint)
return out