]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
pybind/rados: should pass "name" to cstr() 41318/head
authorKefu Chai <kchai@redhat.com>
Fri, 22 Mar 2019 06:25:12 +0000 (14:25 +0800)
committerNeha Ojha <nojha@redhat.com>
Wed, 12 May 2021 21:32:41 +0000 (21:32 +0000)
it's a regression introduced by 6cb23f9c

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit dba8326bdf5c9cda08d5bc70640371220bb18073)

src/pybind/rados/rados.pyx

index b281ce69001bec6fa8b9fabd44649fb9aec4acb6..703b626e81132f9b35d1541c34b58b1de292730f 100644 (file)
@@ -557,9 +557,9 @@ def decode_cstr(val, encoding="utf-8"):
     return val.decode(encoding)
 
 
-def flatten_dict(d):
+def flatten_dict(d, name):
     items = chain.from_iterable(d.items())
-    return cstr(''.join(i + '\0' for i in items))
+    return cstr(''.join(i + '\0' for i in items), name)
 
 
 cdef char* opt_str(s) except? NULL:
@@ -1542,7 +1542,7 @@ Rados object in state %s." % self.state)
         """
         service = cstr(service, 'service')
         daemon = cstr(daemon, 'daemon')
-        metadata_dict = flatten_dict(metadata)
+        metadata_dict = flatten_dict(metadata, 'metadata')
         cdef:
             char *_service = service
             char *_daemon = daemon
@@ -1555,7 +1555,7 @@ Rados object in state %s." % self.state)
 
     @requires(('metadata', dict))
     def service_daemon_update(self, status):
-        status_dict = flatten_dict(status)
+        status_dict = flatten_dict(status, 'status')
         cdef:
             char *_status = status_dict