diff options
| author | Josh Durgin <josh.durgin@inktank.com> | 2013-04-11 13:00:27 -0700 |
|---|---|---|
| committer | Josh Durgin <josh.durgin@inktank.com> | 2013-04-11 13:00:27 -0700 |
| commit | daa6ed2bfe790f83f986f51d0917d6268d3e9d78 (patch) | |
| tree | 436cc1357a4f29bf1eadcea00a539792c3faa8ef | |
| parent | 1d0bf61da98bec7318f44b95a49298e13b792b70 (diff) | |
| parent | 9fe57e2bea89243a0080e667f90b7d4fb15ed883 (diff) | |
| download | ceph-daa6ed2bfe790f83f986f51d0917d6268d3e9d78.tar.gz | |
Merge pull request #210 from dalgaaf/wip-da-bobtail-pybind
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
| -rwxr-xr-x | src/pybind/rados.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/pybind/rados.py b/src/pybind/rados.py index 09af5ac2aec..3d4e755e852 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) |