RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-15 14:58:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

rados.py: return error strings even if ret != 0

Browse Source 
Key rados_free() off returned length, not ret

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Dan Mick 2013-06-18 11:05:10 -07:00
parent 81e73c7a63
commit 54f74325c7
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/pybind/rados.py
View File

@ -544,17 +544,15 @@ Rados object in state %s." % (self.state))
outbufp, byref(outbuflen), outsp, byref(outslen)),
timeout)
if ret == 0:
# copy returned memory (ctypes makes a copy, not a reference)
my_outbuf = outbufp.contents[:(outbuflen.value)]
my_outs = outsp.contents[:(outslen.value)]
# copy returned memory (ctypes makes a copy, not a reference)
my_outbuf = outbufp.contents[:(outbuflen.value)]
my_outs = outsp.contents[:(outslen.value)]
# free callee's allocations
# free callee's allocations
if outbuflen.value:
run_in_thread(self.librados.rados_buffer_free, (outbufp.contents,))
if outslen.value:
run_in_thread(self.librados.rados_buffer_free, (outsp.contents,))
else:
my_outbuf = ''
my_outs = ''
return (ret, my_outbuf, my_outs)
@ -576,17 +574,15 @@ Rados object in state %s." % (self.state))
outbufp, byref(outbuflen), outsp, byref(outslen)),
timeout)
if ret == 0:
# copy returned memory
my_outbuf = outbufp.contents[:(outbuflen.value)]
my_outs = outsp.contents[:(outslen.value)]
# copy returned memory (ctypes makes a copy, not a reference)
my_outbuf = outbufp.contents[:(outbuflen.value)]
my_outs = outsp.contents[:(outslen.value)]
# free callee's allocations
# free callee's allocations
if outbuflen.value:
run_in_thread(self.librados.rados_buffer_free, (outbufp.contents,))
if outslen.value:
run_in_thread(self.librados.rados_buffer_free, (outsp.contents,))
else:
my_outbuf = ''
my_outs = ''
return (ret, my_outbuf, my_outs)
@ -608,17 +604,15 @@ Rados object in state %s." % (self.state))
outbufp, byref(outbuflen), outsp, byref(outslen)),
timeout)
if ret == 0:
# copy returned memory
my_outbuf = outbufp.contents[:(outbuflen.value)]
my_outs = outsp.contents[:(outslen.value)]
# copy returned memory (ctypes makes a copy, not a reference)
my_outbuf = outbufp.contents[:(outbuflen.value)]
my_outs = outsp.contents[:(outslen.value)]
# free callee's allocations
# free callee's allocations
if outbuflen.value:
run_in_thread(self.librados.rados_buffer_free, (outbufp.contents,))
if outslen.value:
run_in_thread(self.librados.rados_buffer_free, (outsp.contents,))
else:
my_outbuf = ''
my_outs = ''
return (ret, my_outbuf, my_outs)