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

pybind/rados: construct cmd as an array of a single entry

Browse Source 
otherwise what monitor receives would be something like

mon_command({ " p r e f i x " :   " o s d   m a p " ...

difficult to parse/grep by machine/human.

Signed-off-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2020-09-01 13:07:17 +08:00
parent 51a2a72215
commit 2d10914d5a
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pybind/rados/rados.pyx
View File

@ -1381,7 +1381,7 @@ Rados object in state %s." % self.state)
# timeout argument, but we keep it for backward compat with old python binding
self.require_state("connected")
cmd = cstr_list(cmd, 'c')
cmd = [cstr(cmd, 'cmd')]
if isinstance(target, int):
# NOTE(sileht): looks weird but test_monmap_dump pass int
@ -1439,12 +1439,11 @@ Rados object in state %s." % self.state)
# timeout argument, but we keep it for backward compat with old python binding
self.require_state("connected")
cmd = cstr_list(cmd, 'cmd')
inbuf = cstr(inbuf, 'inbuf')
cmds = [cstr(cmd, 'cmd')]
cdef:
int _osdid = osdid
char **_cmd = to_bytes_array(cmd)
char **_cmd = to_bytes_array(cmds)
size_t _cmdlen = len(cmd)
char *_inbuf = inbuf
@ -1481,15 +1480,15 @@ Rados object in state %s." % self.state)
# timeout argument, but we keep it for backward compat with old python binding
self.require_state("connected")
cmd = cstr_list(cmd, 'cmd')
cmds = [cstr(cmd, 'cmd')]
inbuf = cstr(inbuf, 'inbuf')
target = cstr(target, 'target', opt=True)
cdef:
char *_target = opt_str(target)
char **_cmd = to_bytes_array(cmd)
size_t _cmdlen = len(cmd)
char **_cmd = to_bytes_array(cmds)
size_t _cmdlen = len(cmds)
char *_inbuf = inbuf
size_t _inbuf_len = len(inbuf)