From: Josh Durgin Date: Wed, 16 Jul 2014 20:29:29 +0000 (-0700) Subject: librbd: use order-agnostic default stripe parameters X-Git-Tag: v0.84~58^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0f87c55355ace952befce773498a3b5d8fac4f01;p=ceph.git librbd: use order-agnostic default stripe parameters This way the default striping style of splitting into object-sized chunks still works with non-default orders specified. Signed-off-by: Josh Durgin --- diff --git a/src/common/config_opts.h b/src/common/config_opts.h index c0d4a104ac51..6d70fec22133 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -745,8 +745,8 @@ OPTION(rbd_localize_parent_reads, OPT_BOOL, true) */ OPTION(rbd_default_format, OPT_INT, 1) OPTION(rbd_default_order, OPT_INT, 22) -OPTION(rbd_default_stripe_count, OPT_U64, 1) // changing requires stripingv2 feature -OPTION(rbd_default_stripe_unit, OPT_U64, 4194304) // changing to non-object size requires stripingv2 feature +OPTION(rbd_default_stripe_count, OPT_U64, 0) // changing requires stripingv2 feature +OPTION(rbd_default_stripe_unit, OPT_U64, 0) // changing to non-object size requires stripingv2 feature OPTION(rbd_default_features, OPT_INT, 3) // 1 for layering, 3 for layering+stripingv2. only applies to format 2 images OPTION(nss_db_path, OPT_STR, "") // path to nss db diff --git a/src/test/pybind/test_rbd.py b/src/test/pybind/test_rbd.py index 11591820641d..6036b527531a 100644 --- a/src/test/pybind/test_rbd.py +++ b/src/test/pybind/test_rbd.py @@ -145,8 +145,8 @@ def test_create_defaults(): check_default_params(2, 20, RBD_FEATURE_STRIPINGV2, 1, 1 << 16) check_default_params(2, 20, RBD_FEATURE_STRIPINGV2, 10, 1 << 20) check_default_params(2, 20, RBD_FEATURE_STRIPINGV2, 10, 1 << 16) + check_default_params(2, 20, RBD_FEATURE_STRIPINGV2, 0, 0) # make sure invalid combinations of stripe unit and order are still invalid - check_default_params(2, 20, RBD_FEATURE_STRIPINGV2, exception=InvalidArgument) check_default_params(2, 22, RBD_FEATURE_STRIPINGV2, 10, 1 << 50, exception=InvalidArgument) check_default_params(2, 22, RBD_FEATURE_STRIPINGV2, 10, 100, exception=InvalidArgument) check_default_params(2, 22, RBD_FEATURE_STRIPINGV2, 0, 1, exception=InvalidArgument)