update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / test / ftl / restore.sh

diff --git a/ceph/src/spdk/test/ftl/restore.sh b/ceph/src/spdk/test/ftl/restore.sh
index aa4fe51787549481da85422beb0b2b272d2a7aba..7b6b0ef0570c9b5bf0cadbf749a01a267a6b6732 100755 (executable)
--- a/ceph/src/spdk/test/ftl/restore.sh
+++ b/ceph/src/spdk/test/ftl/restore.sh
@@ -1,16 +1,26 @@
 #!/usr/bin/env bash
 
-set -e
-
 testdir=$(readlink -f $(dirname $0))
 rootdir=$(readlink -f $testdir/../..)
-rpc_py=$rootdir/scripts/rpc.py
-
 source $rootdir/test/common/autotest_common.sh
+source $testdir/common.sh
+
+rpc_py=$rootdir/scripts/rpc.py
 
 mount_dir=$(mktemp -d)
+
+while getopts ':u:c:' opt; do
+       case $opt in
+               u) uuid=$OPTARG ;;
+               c) nv_cache=$OPTARG ;;
+               ?) echo "Usage: $0 [-u UUID] [-c NV_CACHE_PCI_BDF] OCSSD_PCI_BDF" && exit 1 ;;
+       esac
+done
+shift $((OPTIND - 1))
 device=$1
-uuid=$2
+num_group=$(get_num_group $device)
+num_pu=$(get_num_pu $device)
+pu_count=$((num_group * num_pu))
 
 restore_kill() {
        if mount | grep $mount_dir; then
@@ -18,34 +28,42 @@ restore_kill() {
        fi
        rm -rf $mount_dir
        rm -f $testdir/testfile.md5
+       rm -f $testdir/testfile2.md5
        rm -f $testdir/config/ftl.json
 
-       $rpc_py delete_ftl_bdev -b nvme0
        killprocess $svcpid
        rmmod nbd || true
 }
 
 trap "restore_kill; exit 1" SIGINT SIGTERM EXIT
 
-$rootdir/test/app/bdev_svc/bdev_svc & svcpid=$!
-# Wait until bdev_svc starts
+"$SPDK_BIN_DIR/spdk_tgt" --json <(gen_ftl_nvme_conf) &
+svcpid=$!
+# Wait until spdk_tgt starts
 waitforlisten $svcpid
 
-if [ -n "$uuid" ]; then
-       $rpc_py construct_ftl_bdev -b nvme0 -a $device -l 0-3 -u $uuid
-else
-       $rpc_py construct_ftl_bdev -b nvme0 -a $device -l 0-3
+if [ -n "$nv_cache" ]; then
+       nvc_bdev=$(create_nv_cache_bdev nvc0 $device $nv_cache $pu_count)
 fi
 
+$rpc_py bdev_nvme_attach_controller -b nvme0 -a $device -t pcie
+$rpc_py bdev_ocssd_create -c nvme0 -b nvme0n1 -n 1
+ftl_construct_args="bdev_ftl_create -b ftl0 -d nvme0n1"
+
+[ -n "$uuid" ] && ftl_construct_args+=" -u $uuid"
+[ -n "$nv_cache" ] && ftl_construct_args+=" -c $nvc_bdev"
+
+$rpc_py $ftl_construct_args
+
 # Load the nbd driver
 modprobe nbd
-$rpc_py start_nbd_disk nvme0 /dev/nbd0
+$rpc_py nbd_start_disk ftl0 /dev/nbd0
 waitfornbd nbd0
 
 $rpc_py save_config > $testdir/config/ftl.json
 
 # Prepare the disk by creating ext4 fs and putting a file on it
-mkfs.ext4 -F /dev/nbd0
+make_filesystem ext4 /dev/nbd0
 mount /dev/nbd0 $mount_dir
 dd if=/dev/urandom of=$mount_dir/testfile bs=4K count=256K
 sync
@@ -56,16 +74,26 @@ md5sum $mount_dir/testfile > $testdir/testfile.md5
 umount $mount_dir
 killprocess $svcpid
 
-$rootdir/test/app/bdev_svc/bdev_svc & svcpid=$!
-# Wait until bdev_svc starts
+"$SPDK_BIN_DIR/spdk_tgt" --json <(gen_ftl_nvme_conf) -L ftl_init &
+svcpid=$!
+# Wait until spdk_tgt starts
 waitforlisten $svcpid
 
 $rpc_py load_config < $testdir/config/ftl.json
+waitfornbd nbd0
 
 mount /dev/nbd0 $mount_dir
-md5sum -c $testdir/testfile.md5
 
-report_test_completion occsd_restore
+# Write second file, to make sure writer thread has restored properly
+dd if=/dev/urandom of=$mount_dir/testfile2 bs=4K count=256K
+md5sum $mount_dir/testfile2 > $testdir/testfile2.md5
+
+# Make sure second file will be read from disk
+echo 3 > /proc/sys/vm/drop_caches
+
+# Check both files have proper data
+md5sum -c $testdir/testfile.md5
+md5sum -c $testdir/testfile2.md5
 
 trap - SIGINT SIGTERM EXIT
 restore_kill