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

test/bdevio: add a shutdown function

Browse Source 
In the case of handling shutdown signal, a self defined
shutdown function is needed to properly handle the cleanup.

This is to fix below issue:
https://github.com/spdk/spdk/issues/1612

Change-Id: I9e1645980bd4b1340667745eec9ff0f3e7a025c6
Signed-off-by: GangCao <gang.cao@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4569
Reviewed-by: Xiaodong Liu <xiaodong.liu@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: <dongx.yi@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
This commit is contained in:
GangCao 2020-10-09 17:20:52 -04:00 committed by Tomasz Zawadzki
parent ef20d5250f
commit 05752408b7
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/bdev/bdevio/bdevio.c
View File

@ -57,6 +57,7 @@ static struct spdk_thread *g_thread_ut;
static struct spdk_thread *g_thread_io; static struct spdk_thread *g_thread_io;
static bool g_wait_for_tests = false; static bool g_wait_for_tests = false;
static int g_num_failures = 0; static int g_num_failures = 0;
static bool g_shutdown = false;
struct io_target { struct io_target {
struct spdk_bdev *bdev; struct spdk_bdev *bdev;
@ -1117,7 +1118,7 @@ __stop_init_thread(void *arg)
g_num_failures = 0; g_num_failures = 0;
bdevio_cleanup_targets(); bdevio_cleanup_targets();
if (g_wait_for_tests) { if (g_wait_for_tests && !g_shutdown) {
/* Do not stop the app yet, wait for another RPC */ /* Do not stop the app yet, wait for another RPC */
rpc_perform_tests_cb(num_failures, request); rpc_perform_tests_cb(num_failures, request);
return; return;
@ -1411,6 +1412,13 @@ invalid:
} }
SPDK_RPC_REGISTER("perform_tests", rpc_perform_tests, SPDK_RPC_RUNTIME) SPDK_RPC_REGISTER("perform_tests", rpc_perform_tests, SPDK_RPC_RUNTIME)
static void
spdk_bdevio_shutdown_cb(void)
{
g_shutdown = true;
spdk_thread_send_msg(g_thread_init, __stop_init_thread, NULL);
}
int int
main(int argc, char **argv) main(int argc, char **argv)
{ {
@ -1420,6 +1428,7 @@ main(int argc, char **argv)
spdk_app_opts_init(&opts); spdk_app_opts_init(&opts);
opts.name = "bdevio"; opts.name = "bdevio";
opts.reactor_mask = "0x7"; opts.reactor_mask = "0x7";
opts.shutdown_cb = spdk_bdevio_shutdown_cb;
if ((rc = spdk_app_parse_args(argc, argv, &opts, "w", NULL, if ((rc = spdk_app_parse_args(argc, argv, &opts, "w", NULL,
bdevio_parse_arg, bdevio_usage)) != bdevio_parse_arg, bdevio_usage)) !=