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

ut/vbdev_lvol: remove global bs_dev

Browse Source 
This variable was unnecessary since one within lvs->bs_dev
can be used to verify functionality and within stubs.

Change-Id: I43e12236e08f70381e0da5730b760db4ec3c577b
Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.gerrithub.io/419561
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Maciej Szwed <maciej.szwed@intel.com>
Reviewed-by: Seth Howell <seth.howell5141@gmail.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
This commit is contained in:
Tomasz Zawadzki 2018-07-16 09:21:21 -04:00 committed by Ben Walker
parent 1a742f53d3
commit 63bd96d08d
1 changed files with 18 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
test/unit/lib/bdev/vbdev_lvol.c/vbdev_lvol_ut.c
View File

@ -52,7 +52,6 @@ struct spdk_io_channel *g_ch = NULL;
struct lvol_task *g_task = NULL; struct lvol_task *g_task = NULL;
static struct spdk_bdev g_bdev = {}; static struct spdk_bdev g_bdev = {};
static struct spdk_bs_dev *g_bs_dev = NULL;
static struct spdk_lvol_store *g_lvol_store = NULL; static struct spdk_lvol_store *g_lvol_store = NULL;
bool lvol_store_initialize_fail = false; bool lvol_store_initialize_fail = false;
bool lvol_store_initialize_cb_fail = false; bool lvol_store_initialize_cb_fail = false;
@ -204,7 +203,7 @@ void
spdk_lvs_load(struct spdk_bs_dev *dev, spdk_lvs_load(struct spdk_bs_dev *dev,
spdk_lvs_op_with_handle_complete cb_fn, void *cb_arg) spdk_lvs_op_with_handle_complete cb_fn, void *cb_arg)
{ {
struct spdk_lvol_store *lvs; struct spdk_lvol_store *lvs = NULL;
int i; int i;
int lvserrno = g_lvserrno; int lvserrno = g_lvserrno;
@ -222,12 +221,13 @@ spdk_lvs_load(struct spdk_bs_dev *dev,
SPDK_CU_ASSERT_FATAL(lvs != NULL); SPDK_CU_ASSERT_FATAL(lvs != NULL);
TAILQ_INIT(&lvs->lvols); TAILQ_INIT(&lvs->lvols);
TAILQ_INIT(&lvs->pending_lvols); TAILQ_INIT(&lvs->pending_lvols);
g_lvol_store = lvs; spdk_uuid_generate(&lvs->uuid);
lvs->bs_dev = dev;
for (i = 0; i < g_num_lvols; i++) { for (i = 0; i < g_num_lvols; i++) {
_lvol_create(lvs); _lvol_create(lvs);
} }
cb_fn(cb_arg, g_lvol_store, lvserrno); cb_fn(cb_arg, lvs, lvserrno);
} }
int int
@ -264,11 +264,8 @@ spdk_bs_get_page_size(struct spdk_blob_store *bs)
static void static void
bdev_blob_destroy(struct spdk_bs_dev *bs_dev) bdev_blob_destroy(struct spdk_bs_dev *bs_dev)
{ {
CU_ASSERT(g_bs_dev != NULL);
CU_ASSERT(bs_dev != NULL); CU_ASSERT(bs_dev != NULL);
CU_ASSERT(g_bs_dev == bs_dev);
free(bs_dev); free(bs_dev);
g_bs_dev = NULL;
lvol_already_opened = false; lvol_already_opened = false;
} }
@ -285,8 +282,6 @@ spdk_bdev_create_bs_dev(struct spdk_bdev *bdev, spdk_bdev_remove_cb_t remove_cb,
SPDK_CU_ASSERT_FATAL(bs_dev != NULL); SPDK_CU_ASSERT_FATAL(bs_dev != NULL);
bs_dev->destroy = bdev_blob_destroy; bs_dev->destroy = bdev_blob_destroy;
CU_ASSERT(g_bs_dev == NULL);
g_bs_dev = bs_dev;
return bs_dev; return bs_dev;
} }
@ -336,9 +331,9 @@ spdk_lvs_unload(struct spdk_lvol_store *lvs, spdk_lvs_op_complete cb_fn, void *c
free(lvol); free(lvol);
} }
g_lvol_store = NULL; g_lvol_store = NULL;
free(lvs);
g_bs_dev->destroy(g_bs_dev); lvs->bs_dev->destroy(lvs->bs_dev);
free(lvs);
if (cb_fn != NULL) { if (cb_fn != NULL) {
cb_fn(cb_arg, 0); cb_fn(cb_arg, 0);
@ -369,10 +364,10 @@ spdk_lvs_destroy(struct spdk_lvol_store *lvs, spdk_lvs_op_complete cb_fn,
free(lvol); free(lvol);
} }
g_lvol_store = NULL; g_lvol_store = NULL;
lvs->bs_dev->destroy(lvs->bs_dev);
free(lvs); free(lvs);
g_bs_dev->destroy(g_bs_dev);
if (cb_fn != NULL) { if (cb_fn != NULL) {
cb_fn(cb_arg, 0); cb_fn(cb_arg, 0);
} }
@ -702,7 +697,7 @@ ut_lvs_destroy(void)
CU_ASSERT(rc == 0); CU_ASSERT(rc == 0);
CU_ASSERT(g_lvserrno == 0); CU_ASSERT(g_lvserrno == 0);
SPDK_CU_ASSERT_FATAL(g_lvol_store != NULL); SPDK_CU_ASSERT_FATAL(g_lvol_store != NULL);
CU_ASSERT(g_bs_dev != NULL); CU_ASSERT(g_lvol_store->bs_dev != NULL);
lvs = g_lvol_store; lvs = g_lvol_store;
g_lvol_store = NULL; g_lvol_store = NULL;
@ -906,14 +901,13 @@ ut_lvol_hotremove(void)
lvol_store_initialize_fail = false; lvol_store_initialize_fail = false;
lvol_store_initialize_cb_fail = false; lvol_store_initialize_cb_fail = false;
lvol_already_opened = false; lvol_already_opened = false;
g_bs_dev = NULL;
/* Lvol store is succesfully created */ /* Lvol store is succesfully created */
rc = vbdev_lvs_create(&g_bdev, "lvs", 0, lvol_store_op_with_handle_complete, NULL); rc = vbdev_lvs_create(&g_bdev, "lvs", 0, lvol_store_op_with_handle_complete, NULL);
CU_ASSERT(rc == 0); CU_ASSERT(rc == 0);
CU_ASSERT(g_lvserrno == 0); CU_ASSERT(g_lvserrno == 0);
CU_ASSERT(g_lvol_store != NULL); SPDK_CU_ASSERT_FATAL(g_lvol_store != NULL);
CU_ASSERT(g_bs_dev != NULL); CU_ASSERT(g_lvol_store->bs_dev != NULL);
/* Hot remove callback with NULL - stability check */ /* Hot remove callback with NULL - stability check */
vbdev_lvs_hotremove_cb(NULL); vbdev_lvs_hotremove_cb(NULL);
@ -941,6 +935,7 @@ ut_lvs_examine_check(bool success)
SPDK_CU_ASSERT_FATAL(lvs_bdev != NULL); SPDK_CU_ASSERT_FATAL(lvs_bdev != NULL);
g_lvol_store = lvs_bdev->lvs; g_lvol_store = lvs_bdev->lvs;
SPDK_CU_ASSERT_FATAL(g_lvol_store != NULL); SPDK_CU_ASSERT_FATAL(g_lvol_store != NULL);
CU_ASSERT(g_lvol_store->bs_dev != NULL);
} else { } else {
SPDK_CU_ASSERT_FATAL(TAILQ_EMPTY(&g_spdk_lvol_pairs)); SPDK_CU_ASSERT_FATAL(TAILQ_EMPTY(&g_spdk_lvol_pairs));
g_lvol_store = NULL; g_lvol_store = NULL;
@ -950,30 +945,21 @@ ut_lvs_examine_check(bool success)
static void static void
ut_lvol_examine(void) ut_lvol_examine(void)
{ {
lvol_already_opened = false;
g_bs_dev = NULL;
g_lvserrno = 0;
/* Examine unsuccessfully - bdev already opened */ /* Examine unsuccessfully - bdev already opened */
g_bs_dev = NULL;
g_lvserrno = -1; g_lvserrno = -1;
lvol_already_opened = true; lvol_already_opened = true;
vbdev_lvs_examine(&g_bdev); vbdev_lvs_examine(&g_bdev);
ut_lvs_examine_check(false); ut_lvs_examine_check(false);
CU_ASSERT(g_bs_dev == NULL);
/* Examine unsuccessfully - fail on lvol store */ /* Examine unsuccessfully - fail on lvol store */
g_bs_dev = NULL;
g_lvserrno = -1; g_lvserrno = -1;
lvol_already_opened = false; lvol_already_opened = false;
vbdev_lvs_examine(&g_bdev); vbdev_lvs_examine(&g_bdev);
ut_lvs_examine_check(false); ut_lvs_examine_check(false);
CU_ASSERT(g_bs_dev == NULL);
/* Examine succesfully /* Examine succesfully
* - one lvol fails to load * - one lvol fails to load
* - lvs is loaded with no lvols present */ * - lvs is loaded with no lvols present */
g_bs_dev = NULL;
g_lvserrno = 0; g_lvserrno = 0;
g_lvolerrno = -1; g_lvolerrno = -1;
g_num_lvols = 1; g_num_lvols = 1;
@ -981,7 +967,6 @@ ut_lvol_examine(void)
g_registered_bdevs = 0; g_registered_bdevs = 0;
vbdev_lvs_examine(&g_bdev); vbdev_lvs_examine(&g_bdev);
ut_lvs_examine_check(true); ut_lvs_examine_check(true);
CU_ASSERT(g_bs_dev != NULL);
CU_ASSERT(g_registered_bdevs == 0); CU_ASSERT(g_registered_bdevs == 0);
CU_ASSERT(TAILQ_EMPTY(&g_lvol_store->lvols)); CU_ASSERT(TAILQ_EMPTY(&g_lvol_store->lvols));
vbdev_lvs_destruct(g_lvol_store, lvol_store_op_complete, NULL); vbdev_lvs_destruct(g_lvol_store, lvol_store_op_complete, NULL);
@ -989,18 +974,16 @@ ut_lvol_examine(void)
CU_ASSERT(g_lvol_store == NULL); CU_ASSERT(g_lvol_store == NULL);
/* Examine succesfully */ /* Examine succesfully */
g_bs_dev = NULL;
g_lvserrno = 0; g_lvserrno = 0;
g_lvolerrno = 0; g_lvolerrno = 0;
g_registered_bdevs = 0; g_registered_bdevs = 0;
lvol_already_opened = false; lvol_already_opened = false;
vbdev_lvs_examine(&g_bdev); vbdev_lvs_examine(&g_bdev);
ut_lvs_examine_check(true); ut_lvs_examine_check(true);
CU_ASSERT(g_bs_dev != NULL);
CU_ASSERT(g_registered_bdevs != 0); CU_ASSERT(g_registered_bdevs != 0);
SPDK_CU_ASSERT_FATAL(!TAILQ_EMPTY(&g_lvol_store->lvols)); SPDK_CU_ASSERT_FATAL(!TAILQ_EMPTY(&g_lvol_store->lvols));
vbdev_lvs_destruct(g_lvol_store, lvol_store_op_complete, NULL); vbdev_lvs_destruct(g_lvol_store, lvol_store_op_complete, NULL);
free(g_bs_dev); CU_ASSERT(g_lvserrno == 0);
} }
static void static void
@ -1151,7 +1134,7 @@ ut_lvs_unload(void)
CU_ASSERT(rc == 0); CU_ASSERT(rc == 0);
CU_ASSERT(g_lvserrno == 0); CU_ASSERT(g_lvserrno == 0);
SPDK_CU_ASSERT_FATAL(g_lvol_store != NULL); SPDK_CU_ASSERT_FATAL(g_lvol_store != NULL);
CU_ASSERT(g_bs_dev != NULL); CU_ASSERT(g_lvol_store->bs_dev != NULL);
lvs = g_lvol_store; lvs = g_lvol_store;
g_lvol_store = NULL; g_lvol_store = NULL;
@ -1177,7 +1160,6 @@ ut_lvs_init(void)
{ {
int rc = 0; int rc = 0;
struct spdk_lvol_store *lvs; struct spdk_lvol_store *lvs;
struct spdk_bs_dev *bs_dev_temp;
/* spdk_lvs_init() fails */ /* spdk_lvs_init() fails */
lvol_store_initialize_fail = true; lvol_store_initialize_fail = true;
@ -1186,7 +1168,6 @@ ut_lvs_init(void)
CU_ASSERT(rc != 0); CU_ASSERT(rc != 0);
CU_ASSERT(g_lvserrno == 0); CU_ASSERT(g_lvserrno == 0);
CU_ASSERT(g_lvol_store == NULL); CU_ASSERT(g_lvol_store == NULL);
CU_ASSERT(g_bs_dev == NULL);
lvol_store_initialize_fail = false; lvol_store_initialize_fail = false;
@ -1197,7 +1178,6 @@ ut_lvs_init(void)
CU_ASSERT(rc == 0); CU_ASSERT(rc == 0);
CU_ASSERT(g_lvserrno != 0); CU_ASSERT(g_lvserrno != 0);
CU_ASSERT(g_lvol_store == NULL); CU_ASSERT(g_lvol_store == NULL);
CU_ASSERT(g_bs_dev == NULL);
lvol_store_initialize_cb_fail = false; lvol_store_initialize_cb_fail = false;
@ -1205,30 +1185,22 @@ ut_lvs_init(void)
rc = vbdev_lvs_create(&g_bdev, "lvs", 0, lvol_store_op_with_handle_complete, NULL); rc = vbdev_lvs_create(&g_bdev, "lvs", 0, lvol_store_op_with_handle_complete, NULL);
CU_ASSERT(rc == 0); CU_ASSERT(rc == 0);
CU_ASSERT(g_lvserrno == 0); CU_ASSERT(g_lvserrno == 0);
CU_ASSERT(g_lvol_store != NULL); SPDK_CU_ASSERT_FATAL(g_lvol_store != NULL);
CU_ASSERT(g_bs_dev != NULL); CU_ASSERT(g_lvol_store->bs_dev != NULL);
lvs = g_lvol_store; lvs = g_lvol_store;
g_lvol_store = NULL; g_lvol_store = NULL;
bs_dev_temp = g_bs_dev;
g_bs_dev = NULL;
/* Bdev with lvol store already claimed */ /* Bdev with lvol store already claimed */
rc = vbdev_lvs_create(&g_bdev, "lvs", 0, lvol_store_op_with_handle_complete, NULL); rc = vbdev_lvs_create(&g_bdev, "lvs", 0, lvol_store_op_with_handle_complete, NULL);
CU_ASSERT(rc != 0); CU_ASSERT(rc != 0);
CU_ASSERT(g_lvserrno == 0); CU_ASSERT(g_lvserrno == 0);
CU_ASSERT(g_lvol_store == NULL); CU_ASSERT(g_lvol_store == NULL);
CU_ASSERT(g_bs_dev == NULL);
/* Destruct lvol store */ /* Destruct lvol store */
g_bs_dev = bs_dev_temp;
vbdev_lvs_destruct(lvs, lvol_store_op_complete, NULL); vbdev_lvs_destruct(lvs, lvol_store_op_complete, NULL);
CU_ASSERT(g_lvserrno == 0); CU_ASSERT(g_lvserrno == 0);
CU_ASSERT(g_lvol_store == NULL); CU_ASSERT(g_lvol_store == NULL);
CU_ASSERT(g_bs_dev == NULL);
free(g_bs_dev);
} }
static void static void
@ -1353,17 +1325,14 @@ ut_lvs_rename(void)
int rc = 0; int rc = 0;
int sz = 10; int sz = 10;
struct spdk_lvol_store *lvs; struct spdk_lvol_store *lvs;
struct spdk_bs_dev *b_bdev;
/* Lvol store is succesfully created */ /* Lvol store is succesfully created */
rc = vbdev_lvs_create(&g_bdev, "old_lvs_name", 0, lvol_store_op_with_handle_complete, NULL); rc = vbdev_lvs_create(&g_bdev, "old_lvs_name", 0, lvol_store_op_with_handle_complete, NULL);
CU_ASSERT(rc == 0); CU_ASSERT(rc == 0);
CU_ASSERT(g_lvserrno == 0); CU_ASSERT(g_lvserrno == 0);
SPDK_CU_ASSERT_FATAL(g_lvol_store != NULL); SPDK_CU_ASSERT_FATAL(g_lvol_store != NULL);
CU_ASSERT(g_bs_dev != NULL); CU_ASSERT(g_lvol_store->bs_dev != NULL);
b_bdev = g_bs_dev;
g_bs_dev = NULL;
lvs = g_lvol_store; lvs = g_lvol_store;
g_lvol_store = NULL; g_lvol_store = NULL;
@ -1395,7 +1364,6 @@ ut_lvs_rename(void)
/* Unload lvol store */ /* Unload lvol store */
g_lvol_store = lvs; g_lvol_store = lvs;
g_bs_dev = b_bdev;
vbdev_lvs_destruct(g_lvol_store, lvol_store_op_complete, NULL); vbdev_lvs_destruct(g_lvol_store, lvol_store_op_complete, NULL);
CU_ASSERT(g_lvserrno == 0); CU_ASSERT(g_lvserrno == 0);
CU_ASSERT(g_lvol_store == NULL); CU_ASSERT(g_lvol_store == NULL);