]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
test/rbd: fsx should utilize the default image features
authorJason Dillaman <dillaman@redhat.com>
Mon, 14 May 2018 18:57:23 +0000 (14:57 -0400)
committerJason Dillaman <dillaman@redhat.com>
Sat, 19 May 2018 12:17:33 +0000 (08:17 -0400)
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit c1e111e9855047d69762d06bb9094f93c6c12139)

src/test/librbd/fsx.cc

index aa283af43ba74537c7fbd21f2d2f496e51659ff1..9f950c9f61d5998863c0270dcd689f27c6a6dfaf 100644 (file)
@@ -1938,7 +1938,14 @@ create_image()
         rados_application_enable(ioctx, "rbd", 1);
 
        if (clone_calls || journal_replay) {
-                uint64_t features = 0;
+                r = rados_conf_get(cluster, "rbd_default_features", buf,
+                                   sizeof(buf));
+                if (r < 0) {
+                        simple_err("Could not get rbd_default_features value", r);
+                        goto failed_open;
+                }
+
+                uint64_t features = strtol(buf, NULL, 0);
                 if (clone_calls) {
                         features |= RBD_FEATURE_LAYERING;
                 }