]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
tests: disable deep-flatten feature for the krbd fsx test
authorIlya Dryomov <idryomov@gmail.com>
Wed, 13 May 2015 14:10:39 +0000 (17:10 +0300)
committerIlya Dryomov <idryomov@gmail.com>
Wed, 13 May 2015 14:10:39 +0000 (17:10 +0300)
krbd doesn't support fast-diff or deep-flatten yet.  Had to do this
with two commits because fast-diff is in next and deep-flatten isn't.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
src/test/librbd/fsx.cc

index 250dbb5e7db11d86814728e98c112018366c6376..238d6ab085ba4c9b7dbc3c798a5cb5c6780776c2 100644 (file)
@@ -483,7 +483,8 @@ __librbd_clone(struct rbd_ctx *ctx, const char *src_snapname,
        if (krbd) {
                features &= ~(RBD_FEATURE_EXCLUSIVE_LOCK |
                              RBD_FEATURE_OBJECT_MAP     |
-                              RBD_FEATURE_FAST_DIFF);
+                              RBD_FEATURE_FAST_DIFF      |
+                              RBD_FEATURE_DEEP_FLATTEN);
        }
        ret = rbd_clone2(ioctx, ctx->name, src_snapname, ioctx,
                         dst_imagename, features, order,