From c7afc11a4adf9a6ebb148c1707535483f1273469 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Mon, 11 May 2020 19:55:50 -0400 Subject: [PATCH] pybind/rbd: RBD.create() method's 'old_format' parameter now defaults to False The RBD v1 format has been deprecated for numerous releases and creation of v1 format images has been disabled since the Mimic release. This fixes the Python API's image create() method to ensure v2 images are created by default (and no longer throw an exception that creation of v1 images are disabled). Fixes: https://tracker.ceph.com/issues/45504 Signed-off-by: Jason Dillaman (cherry picked from commit 45349355f4b41c6f9de594ef34a8657230113e6b) --- src/pybind/rbd/rbd.pyx | 2 +- src/test/pybind/test_rbd.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pybind/rbd/rbd.pyx b/src/pybind/rbd/rbd.pyx index 8b8140dc4cecf..72cfda55650b8 100644 --- a/src/pybind/rbd/rbd.pyx +++ b/src/pybind/rbd/rbd.pyx @@ -1180,7 +1180,7 @@ class RBD(object): rbd_version(&major, &minor, &extra) return (major, minor, extra) - def create(self, ioctx, name, size, order=None, old_format=True, + def create(self, ioctx, name, size, order=None, old_format=False, features=None, stripe_unit=None, stripe_count=None, data_pool=None): """ diff --git a/src/test/pybind/test_rbd.py b/src/test/pybind/test_rbd.py index 98d2a7051a382..ebec25652b584 100644 --- a/src/test/pybind/test_rbd.py +++ b/src/test/pybind/test_rbd.py @@ -190,7 +190,7 @@ def check_default_params(format, order=None, features=None, stripe_count=None, feature_data_pool = 128 image_name = get_temp_image_name() if exception is None: - RBD().create(ioctx, image_name, IMG_SIZE) + RBD().create(ioctx, image_name, IMG_SIZE, old_format=(format == 1)) try: with Image(ioctx, image_name) as image: eq(format == 1, image.old_format()) -- 2.39.5