c6ffad06fa
Before this fix, nbd_with_lvol_verify() would compare the string output
of mkfs.ext4 ("Dicarding device blocks...") with 0. If the shell does
not cast an invalid number to 0, test in the if statement will evaluate
to false.
The intent of the test in the if statement seems to be to check the exit
code from mkfs.ext4. This commit implements that assumed intent.
Additionally, mkfs_ret is now a local variable.
Signed-off-by: Mike Gerdts <mgerdts@nvidia.com>
Change-Id: I6c0de7b3f70674fb442abbcc9164f65a1ad55d40
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/15276
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Shuhei Matsumoto <smatsumoto@nvidia.com>
Reviewed-by: Aleksey Marchuk <alexeymar@nvidia.com>
Reviewed-by: Xinrui Mao <xinrui.mao@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
144 lines
3.2 KiB
Bash
144 lines
3.2 KiB
Bash
set -e
|
|
|
|
function nbd_start_disks() {
|
|
local rpc_server=$1
|
|
local bdev_list=($2)
|
|
local nbd_list=($3)
|
|
local i
|
|
|
|
for ((i = 0; i < ${#nbd_list[@]}; i++)); do
|
|
$rootdir/scripts/rpc.py -s $rpc_server nbd_start_disk ${bdev_list[$i]} ${nbd_list[$i]}
|
|
# Wait for nbd device ready
|
|
waitfornbd $(basename ${nbd_list[$i]})
|
|
done
|
|
}
|
|
|
|
function nbd_start_disks_without_nbd_idx() {
|
|
local rpc_server=$1
|
|
local bdev_list=($2)
|
|
local i
|
|
local nbd_device
|
|
|
|
for ((i = 0; i < ${#bdev_list[@]}; i++)); do
|
|
nbd_device=$($rootdir/scripts/rpc.py -s $rpc_server nbd_start_disk ${bdev_list[$i]})
|
|
# Wait for nbd device ready
|
|
waitfornbd $(basename ${nbd_device})
|
|
done
|
|
}
|
|
|
|
function waitfornbd_exit() {
|
|
local nbd_name=$1
|
|
|
|
for ((i = 1; i <= 20; i++)); do
|
|
if grep -q -w $nbd_name /proc/partitions; then
|
|
sleep 0.1
|
|
else
|
|
break
|
|
fi
|
|
done
|
|
|
|
return 0
|
|
}
|
|
|
|
function nbd_stop_disks() {
|
|
local rpc_server=$1
|
|
local nbd_list=($2)
|
|
local i
|
|
|
|
for i in "${nbd_list[@]}"; do
|
|
$rootdir/scripts/rpc.py -s $rpc_server nbd_stop_disk $i
|
|
waitfornbd_exit $(basename $i)
|
|
done
|
|
}
|
|
|
|
function nbd_get_count() {
|
|
# return = count of spdk nbd devices
|
|
local rpc_server=$1
|
|
|
|
nbd_disks_json=$($rootdir/scripts/rpc.py -s $rpc_server nbd_get_disks)
|
|
nbd_disks_name=$(echo "${nbd_disks_json}" | jq -r '.[] | .nbd_device')
|
|
count=$(echo "${nbd_disks_name}" | grep -c /dev/nbd || true)
|
|
echo $count
|
|
}
|
|
|
|
function nbd_dd_data_verify() {
|
|
local nbd_list=($1)
|
|
local operation=$2
|
|
local tmp_file=$SPDK_TEST_STORAGE/nbdrandtest
|
|
|
|
if [ "$operation" = "write" ]; then
|
|
# data write
|
|
dd if=/dev/urandom of=$tmp_file bs=4096 count=256
|
|
for i in "${nbd_list[@]}"; do
|
|
dd if=$tmp_file of=$i bs=4096 count=256 oflag=direct
|
|
done
|
|
elif [ "$operation" = "verify" ]; then
|
|
# data read and verify
|
|
for i in "${nbd_list[@]}"; do
|
|
cmp -b -n 1M $tmp_file $i
|
|
done
|
|
rm $tmp_file
|
|
fi
|
|
}
|
|
|
|
function nbd_rpc_data_verify() {
|
|
local rpc_server=$1
|
|
local bdev_list=($2)
|
|
local nbd_list=($3)
|
|
|
|
nbd_start_disks $rpc_server "${bdev_list[*]}" "${nbd_list[*]}"
|
|
count=$(nbd_get_count $rpc_server)
|
|
if [ $count -ne ${#nbd_list[@]} ]; then
|
|
return 1
|
|
fi
|
|
|
|
nbd_dd_data_verify "${nbd_list[*]}" "write"
|
|
nbd_dd_data_verify "${nbd_list[*]}" "verify"
|
|
|
|
nbd_stop_disks $rpc_server "${nbd_list[*]}"
|
|
count=$(nbd_get_count $rpc_server)
|
|
if [ $count -ne 0 ]; then
|
|
return 1
|
|
fi
|
|
|
|
return 0
|
|
}
|
|
|
|
function nbd_rpc_start_stop_verify() {
|
|
local rpc_server=$1
|
|
local bdev_list=($2)
|
|
|
|
nbd_start_disks_without_nbd_idx $rpc_server "${bdev_list[*]}"
|
|
|
|
nbd_disks_json=$($rootdir/scripts/rpc.py -s $rpc_server nbd_get_disks)
|
|
nbd_disks_name=($(echo "${nbd_disks_json}" | jq -r '.[] | .nbd_device'))
|
|
nbd_stop_disks $rpc_server "${nbd_disks_name[*]}"
|
|
|
|
count=$(nbd_get_count $rpc_server)
|
|
if [ $count -ne 0 ]; then
|
|
return 1
|
|
fi
|
|
|
|
return 0
|
|
}
|
|
|
|
function nbd_with_lvol_verify() {
|
|
local rpc_server=$1
|
|
local nbd_list=($2)
|
|
local mkfs_ret
|
|
|
|
$rootdir/scripts/rpc.py -s $rpc_server bdev_malloc_create -b malloc_lvol_verify 16 512
|
|
$rootdir/scripts/rpc.py -s $rpc_server bdev_lvol_create_lvstore malloc_lvol_verify lvs
|
|
$rootdir/scripts/rpc.py -s $rpc_server bdev_lvol_create lvol 4 -l lvs
|
|
$rootdir/scripts/rpc.py -s $rpc_server nbd_start_disk lvs/lvol "${nbd_list[0]}"
|
|
|
|
mkfs.ext4 ${nbd_list[0]}
|
|
mkfs_ret=$?
|
|
nbd_stop_disks $rpc_server "${nbd_list[0]}"
|
|
if [ $mkfs_ret -ne 0 ]; then
|
|
return 1
|
|
fi
|
|
|
|
return 0
|
|
}
|