RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 18:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32376 from idryomov/wip-krbd-fsx-object-map

Browse Source 
qa/suites/krbd: fsx with object-map and fast-diff

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Ilya Dryomov 2020-01-07 11:32:26 +01:00 committed by GitHub
commit 39fdbe1b81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qa/suites/krbd/fsx/conf.yaml
View File

@ -3,5 +3,3 @@ overrides:
conf:
global:
ms die on skipped message: false
client:
rbd default features: 37

6
qa/suites/krbd/fsx/features/no-object-map.yaml Normal file
View File

@ -0,0 +1,6 @@
overrides:
ceph:
conf:
client:
# layering, deep-flatten
rbd default features: 33

6
qa/suites/krbd/fsx/features/object-map.yaml Normal file
View File

@ -0,0 +1,6 @@
overrides:
ceph:
conf:
client:
# layering, exclusive-lock, object-map, fast-diff, deep-flatten
rbd default features: 61

16
src/test/librbd/fsx.cc
View File

@ -855,7 +855,7 @@ __librbd_deep_copy(struct rbd_ctx *ctx, const char *src_snapname,
int
__librbd_clone(struct rbd_ctx *ctx, const char *src_snapname,
const char *dst_imagename, int *order, int stripe_unit,
int stripe_count, bool krbd)
int stripe_count)
{
int ret;
@ -879,12 +879,6 @@ __librbd_clone(struct rbd_ctx *ctx, const char *src_snapname,
return ret;
}
if (krbd) {
features &= ~(RBD_FEATURE_OBJECT_MAP |
RBD_FEATURE_FAST_DIFF |
RBD_FEATURE_DEEP_FLATTEN |
RBD_FEATURE_JOURNALING);
}
if (deep_copy) {
ret = __librbd_deep_copy(ctx, src_snapname, dst_imagename, features,
order, stripe_unit, stripe_count);
@ -913,7 +907,7 @@ librbd_clone(struct rbd_ctx *ctx, const char *src_snapname,
int stripe_count)
{
return __librbd_clone(ctx, src_snapname, dst_imagename, order,
stripe_unit, stripe_count, false);
stripe_unit, stripe_count);
}
int
@ -1181,7 +1175,7 @@ krbd_clone(struct rbd_ctx *ctx, const char *src_snapname,
return ret;
return __librbd_clone(ctx, src_snapname, dst_imagename, order,
stripe_unit, stripe_count, true);
stripe_unit, stripe_count);
}
int
@ -1321,7 +1315,7 @@ nbd_clone(struct rbd_ctx *ctx, const char *src_snapname,
return ret;
return __librbd_clone(ctx, src_snapname, dst_imagename, order,
stripe_unit, stripe_count, false);
stripe_unit, stripe_count);
}
const struct rbd_operations nbd_operations = {
@ -1569,7 +1563,7 @@ ggate_clone(struct rbd_ctx *ctx, const char *src_snapname,
}
return __librbd_clone(ctx, src_snapname, dst_imagename, order,
stripe_unit, stripe_count, false);
stripe_unit, stripe_count);
}
int