ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blob: esnap clone inflate and decouple

Browse Source 
This adds support for inflate and decouple for esnap clones. Since there
are no immediate consumers that will provide back_bs_dev->is_zeroes()
that can return true, a shortcut is taken in that inflate and decouple
of esnap clones are the same.

Signed-off-by: Mike Gerdts <mgerdts@nvidia.com>
Change-Id: I4d2e6565126991acd650f073ce876466334e986d
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11574
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Mike Gerdts 2022-01-25 09:07:23 -06:00 committed by Jim Harris
parent 94c43313ab
commit 652232ae16
2 changed files with 103 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/blob/blobstore.c
View File

@ -6662,10 +6662,19 @@ bs_inflate_blob_done(struct spdk_clone_snapshot_ctx *ctx)
if (ctx->allocate_all) {
/* remove thin provisioning */
bs_blob_list_remove(_blob);
if (_blob->parent_id == SPDK_BLOBID_EXTERNAL_SNAPSHOT) {
blob_remove_xattr(_blob, BLOB_EXTERNAL_SNAPSHOT_ID, true);
_blob->invalid_flags &= ~SPDK_BLOB_EXTERNAL_SNAPSHOT;
} else {
blob_remove_xattr(_blob, BLOB_SNAPSHOT, true);
}
_blob->invalid_flags = _blob->invalid_flags & ~SPDK_BLOB_THIN_PROV;
blob_back_bs_destroy(_blob);
_blob->parent_id = SPDK_BLOBID_INVALID;
} else {
/* For now, esnap clones always have allocate_all set. */
assert(!blob_is_esnap_clone(_blob));
_parent = ((struct spdk_blob_bs_dev *)(_blob->back_bs_dev))->blob;
if (_parent->parent_id != SPDK_BLOBID_INVALID) {
/* We must change the parent of the inflated blob */
@ -6706,6 +6715,10 @@ bs_cluster_needs_allocation(struct spdk_blob *blob, uint64_t cluster, bool alloc
return allocate_all;
}
if (blob->parent_id == SPDK_BLOBID_EXTERNAL_SNAPSHOT) {
return true;
}
b = (struct spdk_blob_bs_dev *)blob->back_bs_dev;
return (allocate_all || b->blob->active.clusters[cluster] != 0);
}
@ -6791,6 +6804,16 @@ bs_inflate_blob_open_cpl(void *cb_arg, struct spdk_blob *_blob, int bserrno)
return;
}
if (_blob->parent_id == SPDK_BLOBID_EXTERNAL_SNAPSHOT) {
/*
* It would be better to rely on back_bs_dev->is_zeroes(), to determine which
* clusters require allocation. Until there is a blobstore consumer that
* uses esnaps with an spdk_bs_dev that implements a useful is_zeroes() it is not
* worth the effort.
*/
ctx->allocate_all = true;
}
/* Do two passes - one to verify that we can obtain enough clusters
* and another to actually claim them.
*/

81
test/unit/lib/blob/blob.c/blob_ut.c
View File

@ -7582,7 +7582,7 @@ blob_esnap_verify_contents(struct spdk_blob *blob, struct spdk_io_channel *ch,
uint64_t offset, uint64_t size, uint32_t readsize, const char *how)
{
const uint32_t bs_blksz = blob->bs->io_unit_size;
const uint32_t esnap_blksz = blob->back_bs_dev->blocklen;
const uint32_t esnap_blksz = blob->back_bs_dev ? blob->back_bs_dev->blocklen : bs_blksz;
const uint32_t start_blk = offset / bs_blksz;
const uint32_t num_blocks = spdk_max(size, readsize) / bs_blksz;
const uint32_t blocks_per_read = spdk_min(size, readsize) / bs_blksz;
@ -8208,6 +8208,83 @@ blob_esnap_clone_snapshot(void)
ut_blob_close_and_delete(bs, blob);
}
static uint64_t
_blob_esnap_clone_hydrate(bool inflate)
{
struct spdk_blob_store *bs = g_bs;
struct spdk_blob_opts opts;
struct ut_esnap_opts esnap_opts;
struct spdk_blob *blob;
spdk_blob_id blobid;
struct spdk_io_channel *channel;
bool destroyed = false;
const uint32_t blocklen = spdk_bs_get_io_unit_size(bs);
const uint32_t cluster_sz = spdk_bs_get_cluster_size(bs);
const uint64_t esnap_num_clusters = 4;
const uint32_t esnap_sz = cluster_sz * esnap_num_clusters;
const uint64_t esnap_num_blocks = esnap_sz / blocklen;
uint64_t num_failures = CU_get_number_of_failures();
channel = spdk_bs_alloc_io_channel(bs);
SPDK_CU_ASSERT_FATAL(channel != NULL);
/* Create the esnap clone */
ut_spdk_blob_opts_init(&opts);
ut_esnap_opts_init(blocklen, esnap_num_blocks, __func__, &destroyed, &esnap_opts);
opts.esnap_id = &esnap_opts;
opts.esnap_id_len = sizeof(esnap_opts);
opts.num_clusters = esnap_num_clusters;
spdk_bs_create_blob_ext(bs, &opts, blob_op_with_id_complete, NULL);
poll_threads();
CU_ASSERT(g_bserrno == 0);
CU_ASSERT(g_blobid != SPDK_BLOBID_INVALID);
blobid = g_blobid;
/* Open the esnap clone */
spdk_bs_open_blob(bs, blobid, blob_op_with_handle_complete, NULL);
poll_threads();
CU_ASSERT(g_bserrno == 0);
SPDK_CU_ASSERT_FATAL(g_blob != NULL);
blob = g_blob;
UT_ASSERT_IS_ESNAP_CLONE(blob, &esnap_opts, sizeof(esnap_opts));
/*
* Inflate or decouple the blob then verify that it is no longer an esnap clone and has
* right content
*/
if (inflate) {
spdk_bs_inflate_blob(bs, channel, blobid, blob_op_complete, NULL);
} else {
spdk_bs_blob_decouple_parent(bs, channel, blobid, blob_op_complete, NULL);
}
poll_threads();
CU_ASSERT(g_bserrno == 0);
UT_ASSERT_IS_NOT_ESNAP_CLONE(blob);
CU_ASSERT(blob_esnap_verify_contents(blob, channel, 0, esnap_sz, esnap_sz, "read"));
ut_blob_close_and_delete(bs, blob);
/*
* Clean up
*/
spdk_bs_free_io_channel(channel);
poll_threads();
/* Return number of new failures */
return CU_get_number_of_failures() - num_failures;
}
static void
blob_esnap_clone_inflate(void)
{
_blob_esnap_clone_hydrate(true);
}
static void
blob_esnap_clone_decouple(void)
{
_blob_esnap_clone_hydrate(false);
}
static void
suite_bs_setup(void)
{
@ -8415,6 +8492,8 @@ main(int argc, char **argv)
CU_ADD_TEST(suite, blob_esnap_io_512_4096);
CU_ADD_TEST(suite_esnap_bs, blob_esnap_thread_add_remove);
CU_ADD_TEST(suite_esnap_bs, blob_esnap_clone_snapshot);
CU_ADD_TEST(suite_esnap_bs, blob_esnap_clone_inflate);
CU_ADD_TEST(suite_esnap_bs, blob_esnap_clone_decouple);
allocate_threads(2);
set_thread(0);