diff mbox

rados.py: add tmap_to_omap method

Message ID ork348a2mc.fsf@free.home (mailing list archive)
State New, archived
Headers show

Commit Message

Alexandre Oliva Oct. 10, 2014, 5:57 a.m. UTC
I wanted to script a tmap_to_omap conversion of a few million dirs, but
running the rados program for each inode would have made it take too
long, so I wrote the attached python script, that I'm now running in
multiple copies in parallel with GNU parallel.

Before it would run, however, I found out python bindings of rados's
tmap_to_omap hadn't been implemented.  It might have been because it
takes a bool argument, and I couldn't find out how to pass it as such.

I ended up forcing the bool argument to False and passing it as an int
0.  This could fail on machines whose ABIs pass bools differently from
ints, but IIRC bools are just aliases to char in C, at least within GCC,
and since char is promoted to int for argument passing, passing an int
should work, especially if it's zero.  For nonzero values, endianness
could matter if the argument is passed on the stack, so I settled for
forcing it to zero.

If anyone knows better, please let me know.
---

Add tmap_to_omap method to rados python bindings, without the bool
argument: it is forced to false.

Signed-off-by: Alexandre Oliva <oliva@gnu.org>
---
 src/pybind/rados.py |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

Comments

Loic Dachary Oct. 10, 2014, 6:51 a.m. UTC | #1
Hi,

This patch is improving

http://tracker.ceph.com/issues/9532

which is part of

http://tracker.ceph.com/issues/6114

But I do not know the answer to the bool question ;-)

Cheers

On 10/10/2014 07:57, Alexandre Oliva wrote:
> I wanted to script a tmap_to_omap conversion of a few million dirs, but
> running the rados program for each inode would have made it take too
> long, so I wrote the attached python script, that I'm now running in
> multiple copies in parallel with GNU parallel.
> 
> Before it would run, however, I found out python bindings of rados's
> tmap_to_omap hadn't been implemented.  It might have been because it
> takes a bool argument, and I couldn't find out how to pass it as such.
> 
> I ended up forcing the bool argument to False and passing it as an int
> 0.  This could fail on machines whose ABIs pass bools differently from
> ints, but IIRC bools are just aliases to char in C, at least within GCC,
> and since char is promoted to int for argument passing, passing an int
> should work, especially if it's zero.  For nonzero values, endianness
> could matter if the argument is passed on the stack, so I settled for
> forcing it to zero.
> 
> If anyone knows better, please let me know.
> 
> 
> 
> 
> ---
> 
> Add tmap_to_omap method to rados python bindings, without the bool
> argument: it is forced to false.
> 
> Signed-off-by: Alexandre Oliva <oliva@gnu.org>
> ---
>  src/pybind/rados.py |   18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
> 
> diff --git a/src/pybind/rados.py b/src/pybind/rados.py
> index 93e5040..a2394aa 100644
> --- a/src/pybind/rados.py
> +++ b/src/pybind/rados.py
> @@ -1438,6 +1438,24 @@ returned %d, but should return zero on success." % (self.name, ret))
>              raise make_ex(ret, "Failed to stat %r" % key)
>          return psize.value, time.localtime(pmtime.value)
>  
> +    def tmap_to_omap(self, key):
> +        """
> +        Convert a dir from tmap to omap.
> +
> +        :param key: the name of the object to convert
> +        :type key: str
> +
> +        :raises: :class:`TypeError`
> +        :raises: :class:`Error`
> +        :returns: int - 0 on success, otherwise raises an error
> +        """
> +        self.require_ioctx_open()
> +        ret = run_in_thread(self.librados.rados_tmap_to_omap,
> +                            (self.io, c_char_p(key), c_int(0)))
> +        if ret < 0:
> +            raise make_ex(ret, "Failed to convert %s from tmap to omap" % key)
> +        return 0
> +
>      def get_xattr(self, key, xattr_name):
>          """
>          Get the value of an extended attribute on an object.
> 
>
diff mbox

Patch

diff --git a/src/pybind/rados.py b/src/pybind/rados.py
index 93e5040..a2394aa 100644
--- a/src/pybind/rados.py
+++ b/src/pybind/rados.py
@@ -1438,6 +1438,24 @@  returned %d, but should return zero on success." % (self.name, ret))
             raise make_ex(ret, "Failed to stat %r" % key)
         return psize.value, time.localtime(pmtime.value)
 
+    def tmap_to_omap(self, key):
+        """
+        Convert a dir from tmap to omap.
+
+        :param key: the name of the object to convert
+        :type key: str
+
+        :raises: :class:`TypeError`
+        :raises: :class:`Error`
+        :returns: int - 0 on success, otherwise raises an error
+        """
+        self.require_ioctx_open()
+        ret = run_in_thread(self.librados.rados_tmap_to_omap,
+                            (self.io, c_char_p(key), c_int(0)))
+        if ret < 0:
+            raise make_ex(ret, "Failed to convert %s from tmap to omap" % key)
+        return 0
+
     def get_xattr(self, key, xattr_name):
         """
         Get the value of an extended attribute on an object.