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

blobstore,ut: add possibility to delay scheduled tasks

Browse Source 
Adding ability to delay scheduled tasks until _bs_flush_scheduler is called.
This allows to test blobstore when tasks do not finish immediately.

New unit test added for spdk_bs_unload.

Signed-off-by: Piotr Pelplinski <piotr.pelplinski@intel.com>
Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I9c1b3c0c2ebb1e16c032fd136d11ef351d8f3fe0
Reviewed-on: https://review.gerrithub.io/374767
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Piotr Pelplinski 2017-08-21 17:22:43 +02:00 committed by Jim Harris
parent 70eff4fbb0
commit 51c223729d
1 changed files with 62 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,10 +48,41 @@ int g_bserrno;
struct spdk_xattr_names *g_names; struct spdk_xattr_names *g_names;
int g_done; int g_done;
bool g_scheduler_delay = false;
struct scheduled_ops {
spdk_thread_fn fn;
void *ctx;
TAILQ_ENTRY(scheduled_ops) ops_queue;
};
static TAILQ_HEAD(, scheduled_ops) g_scheduled_ops = TAILQ_HEAD_INITIALIZER(g_scheduled_ops);
static void static void
_bs_send_msg(spdk_thread_fn fn, void *ctx, void *thread_ctx) _bs_send_msg(spdk_thread_fn fn, void *ctx, void *thread_ctx)
{ {
fn(ctx); if (g_scheduler_delay) {
struct scheduled_ops *ops = calloc(1, sizeof(*ops));
ops->fn = fn;
ops->ctx = ctx;
TAILQ_INSERT_TAIL(&g_scheduled_ops, ops, ops_queue);
} else {
fn(ctx);
}
}
static void
_bs_flush_scheduler(void)
{
struct scheduled_ops *ops, *tmp;
TAILQ_FOREACH_SAFE(ops, &g_scheduled_ops, ops_queue, tmp) {
ops->fn(ops->ctx);
TAILQ_REMOVE(&g_scheduled_ops, ops, ops_queue);
free(ops);
}
} }
static void static void
@ -899,6 +930,35 @@ bs_load(void)
g_bs = NULL; g_bs = NULL;
} }
/*
* Create a blobstore and then unload it, while delaying all scheduled operations
* until after spdk_bs_unload call has finished. This ensures the memory associated
* with the internal blobstore channels is not touched after it is freed.
*/
static void
bs_unload_delayed(void)
{
struct spdk_bs_dev *dev;
dev = init_dev();
spdk_bs_init(dev, NULL, bs_op_with_handle_complete, NULL);
CU_ASSERT(g_bserrno == 0);
SPDK_CU_ASSERT_FATAL(g_bs != NULL);
g_scheduler_delay = true;
g_bserrno = -1;
spdk_bs_unload(g_bs, bs_op_complete, NULL);
CU_ASSERT(g_bserrno == 0);
g_bs = NULL;
_bs_flush_scheduler();
CU_ASSERT(TAILQ_EMPTY(&g_scheduled_ops));
g_scheduler_delay = false;
}
/* /*
* Create a blobstore with a cluster size different than the default, and ensure it is * Create a blobstore with a cluster size different than the default, and ensure it is
* persisted. * persisted.
@ -1146,6 +1206,7 @@ int main(int argc, char **argv)
CU_add_test(suite, "blob_iter", blob_iter) == NULL || CU_add_test(suite, "blob_iter", blob_iter) == NULL ||
CU_add_test(suite, "blob_xattr", blob_xattr) == NULL || CU_add_test(suite, "blob_xattr", blob_xattr) == NULL ||
CU_add_test(suite, "bs_load", bs_load) == NULL || CU_add_test(suite, "bs_load", bs_load) == NULL ||
CU_add_test(suite, "bs_unload_delayed", bs_unload_delayed) == NULL ||
CU_add_test(suite, "bs_cluster_sz", bs_cluster_sz) == NULL || CU_add_test(suite, "bs_cluster_sz", bs_cluster_sz) == NULL ||
CU_add_test(suite, "bs_resize_md", bs_resize_md) == NULL || CU_add_test(suite, "bs_resize_md", bs_resize_md) == NULL ||
CU_add_test(suite, "blob_serialize", blob_serialize) == NULL CU_add_test(suite, "blob_serialize", blob_serialize) == NULL