From 1b566ac7d9e9159257b881d7dc5675cd9b7e1961 Mon Sep 17 00:00:00 2001 From: wanghailiangx Date: Wed, 30 Nov 2022 09:44:29 -0500 Subject: [PATCH] test/ftl: add cases line to cover RPC bdev_ftl_unload Change-Id: I34074846d812d9bdf47af25f1275978c3508084b Signed-off-by: Hailiang Wang Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15696 Tested-by: SPDK CI Jenkins Reviewed-by: Shuhei Matsumoto Reviewed-by: Jim Harris --- test/ftl/dirty_shutdown.sh | 1 + test/ftl/fio.sh | 2 ++ test/ftl/restore.sh | 1 + test/ftl/trim.sh | 1 + test/ftl/write_after_write.sh | 1 + 5 files changed, 6 insertions(+) diff --git a/test/ftl/dirty_shutdown.sh b/test/ftl/dirty_shutdown.sh index b88ba762a..6441a7f04 100755 --- a/test/ftl/dirty_shutdown.sh +++ b/test/ftl/dirty_shutdown.sh @@ -77,6 +77,7 @@ md5sum $testdir/testfile > $testdir/testfile.md5 $spdk_dd -m 0x2 -r /var/tmp/spdk_dd.sock --if=$testdir/testfile --of=/dev/nbd0 --bs=$block_size --count=$data_size --oflag=direct sync /dev/nbd0 $rpc_py nbd_stop_disk /dev/nbd0 +$rpc_py bdev_ftl_unload -b ftl0 # Force kill bdev service (dirty shutdown) and start it again kill -9 $svcpid diff --git a/test/ftl/fio.sh b/test/ftl/fio.sh index fd72f59ce..e38b2d15c 100755 --- a/test/ftl/fio.sh +++ b/test/ftl/fio.sh @@ -70,6 +70,8 @@ waitforbdev ftl0 echo ']}' ) > $FTL_JSON_CONF +$rpc_py bdev_ftl_unload -b ftl0 + killprocess $svcpid trap - SIGINT SIGTERM EXIT diff --git a/test/ftl/restore.sh b/test/ftl/restore.sh index be19c3bf8..300de83ae 100755 --- a/test/ftl/restore.sh +++ b/test/ftl/restore.sh @@ -62,6 +62,7 @@ $rpc_py -t $timeout $ftl_construct_args $rpc_py save_subsystem_config -n bdev echo ']}' ) > $testdir/config/ftl.json +$rpc_py bdev_ftl_unload -b ftl0 killprocess $svcpid # Generate random data and calculate checksum diff --git a/test/ftl/trim.sh b/test/ftl/trim.sh index 9f5bc4bb5..25d210087 100755 --- a/test/ftl/trim.sh +++ b/test/ftl/trim.sh @@ -58,6 +58,7 @@ waitforbdev ftl0 bdev_info=$($rpc_py bdev_get_bdevs -b ftl0) nb=$(jq ".[] .num_blocks" <<< "$bdev_info") +$rpc_py bdev_ftl_unload -b ftl0 killprocess $svcpid diff --git a/test/ftl/write_after_write.sh b/test/ftl/write_after_write.sh index 786301a13..e578f74c6 100755 --- a/test/ftl/write_after_write.sh +++ b/test/ftl/write_after_write.sh @@ -53,6 +53,7 @@ waitforbdev ftl0 $rpc_py save_subsystem_config -n bdev echo ']}' ) > $FTL_JSON_CONF +$rpc_py bdev_ftl_unload -b ftl0 killprocess $svcpid