From d24883e4973ae13c50137cf35bdba12bf67d7860 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Mon, 29 Feb 2016 11:31:55 -0500 Subject: [PATCH] rbd: update default image features Exclusive lock, object map, fast-diff, and deep-flatten have been enabled by default for all new images. Signed-off-by: Jason Dillaman --- PendingReleaseNotes | 8 ++++++++ src/common/config_opts.h | 8 +++++--- src/test/pybind/test_rbd.py | 2 +- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/PendingReleaseNotes b/PendingReleaseNotes index c4140307b7030..0b94b198f0e13 100644 --- a/PendingReleaseNotes +++ b/PendingReleaseNotes @@ -12,6 +12,14 @@ v10.0.0 limit max waiting time of monitor election process, which was previously restricted by 'mon_lease'. +* The default RBD image features for new images have been updated to enable + the following: exclusive lock, object map, fast-diff, and deep-flatten. + These features are not currently supported by the RBD kernel driver nor older + RBD clients. These features can be disabled on a per-image basis via the RBD + CLI or the default features can be updated to the pre-Jewel setting by adding + the following to the client section of the Ceph configuration file: + rbd default features = 1 + v9.3.0 ====== * Some symbols wrongly exposed by librados in v9.1.0 and v9.2.0 were removed. diff --git a/src/common/config_opts.h b/src/common/config_opts.h index 03d4c6abf0084..427fdddb19991 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -1118,9 +1118,11 @@ OPTION(rbd_default_format, OPT_INT, 2) OPTION(rbd_default_order, OPT_INT, 22) 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) // only applies to format 2 images - // +1 for layering, +2 for stripingv2, - // +4 for exclusive lock, +8 for object map +OPTION(rbd_default_features, OPT_INT, 61) // only applies to format 2 images + // +1 for layering, +2 for stripingv2, + // +4 for exclusive lock, +8 for object map + // +16 for fast-diff, +32 for deep-flatten, + // +64 for journaling OPTION(rbd_default_map_options, OPT_STR, "") // default rbd map -o / --options diff --git a/src/test/pybind/test_rbd.py b/src/test/pybind/test_rbd.py index df98dee8c09c9..e77a026920300 100644 --- a/src/test/pybind/test_rbd.py +++ b/src/test/pybind/test_rbd.py @@ -143,7 +143,7 @@ def check_default_params(format, order=None, features=None, stripe_count=None, expected_features = features if expected_features is None or format == 1: - expected_features = 0 if format == 1 else 3 + expected_features = 0 if format == 1 else 61 eq(expected_features, image.features()) expected_stripe_count = stripe_count -- 2.39.5