From 9fe57e2bea89243a0080e667f90b7d4fb15ed883 Mon Sep 17 00:00:00 2001 From: Danny Al-Gaaf Date: Fri, 5 Apr 2013 15:55:34 +0200 Subject: [PATCH] rados.py: fix create_pool() Call rados_pool_create_with_all() only if auid and crush_rule are set properly. In case only crush_rule is set call rados_pool_create_with_crush_rule() on librados, not the other way around. Signed-off-by: Danny Al-Gaaf (cherry picked from commit 94a1f25e7230a700f06a2699c9c2b99ec1bf7144) --- src/pybind/rados.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/pybind/rados.py b/src/pybind/rados.py index 09af5ac2aec1..3d4e755e8528 100755 --- a/src/pybind/rados.py +++ b/src/pybind/rados.py @@ -209,15 +209,16 @@ Rados object in state %s." % (self.state)) ret = self.librados.rados_pool_create( self.cluster, c_char_p(pool_name)) else: - ret = self.librados.rados_pool_create_with_all( - self.cluster, c_char_p(pool_name), c_uint64(auid), - c_ubyte(crush_rule)) + ret = self.librados.rados_pool_create_with_crush_rule( + self.cluster, c_char_p(pool_name), c_ubyte(crush_rule)) + elif (crush_rule == None): ret = self.librados.rados_pool_create_with_auid( self.cluster, c_char_p(pool_name), c_uint64(auid)) else: - ret = self.librados.rados_pool_create_with_crush_rule( - self.cluster, c_char_p(pool_name), c_ubyte(crush_rule)) + ret = self.librados.rados_pool_create_with_all( + self.cluster, c_char_p(pool_name), c_uint64(auid), + c_ubyte(crush_rule)) if ret < 0: raise make_ex(ret, "error creating pool '%s'" % pool_name) -- 2.47.3