From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 14 May 2018 18:57:23 +0000 (-0400)
Subject: test/rbd: fsx should utilize the default image features
X-Git-Tag: v13.1.1~1^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4357ab5fea465dc075bd1670c12688b96917f10c;p=ceph.git

test/rbd: fsx should utilize the default image features

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit c1e111e9855047d69762d06bb9094f93c6c12139)
---

diff --git a/src/test/librbd/fsx.cc b/src/test/librbd/fsx.cc
index aa283af43ba7..9f950c9f61d5 100644
--- a/src/test/librbd/fsx.cc
+++ b/src/test/librbd/fsx.cc
@@ -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;
                 }