From a715b454e9c41718197a726fde46c8a521857e82 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Wed, 8 May 2019 04:09:09 -0400 Subject: [PATCH] test/raid: always call rpc_py with correct socket Previously the socket was only used in single rpc call, upcoming patch will use of the $rpc_py. Moving socket to $rpc_py simplifies calling it in multiple parts of the script. Signed-off-by: Tomasz Zawadzki Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/453643 (master) (cherry picked from commit a394f628680a1c4529603e91b03e7c8201c75cd0) Change-Id: Id1ba86740237c32a6f0259562c0b5c11d917bbcf Signed-off-by: Tomasz Zawadzki Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/457208 Tested-by: SPDK CI Jenkins Reviewed-by: Darek Stojaczyk --- test/bdev/bdev_raid.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/bdev/bdev_raid.sh b/test/bdev/bdev_raid.sh index 5dba789d2..a995c7863 100755 --- a/test/bdev/bdev_raid.sh +++ b/test/bdev/bdev_raid.sh @@ -4,7 +4,8 @@ set -e testdir=$(readlink -f $(dirname $0)) rootdir=$(readlink -f $testdir/../..) -rpc_py="$rootdir/scripts/rpc.py" +rpc_server=/var/tmp/spdk-raid.sock +rpc_py="$rootdir/scripts/rpc.py -s $rpc_server" tmp_file=/tmp/raidrandtest source $rootdir/test/common/autotest_common.sh @@ -62,7 +63,6 @@ function on_error_exit() { function raid_function_test() { if [ $(uname -s) = Linux ] && modprobe -n nbd; then - local rpc_server=/var/tmp/spdk-raid.sock local conf=$1 local nbd=/dev/nbd0 local raid_bdev @@ -77,7 +77,7 @@ function raid_function_test() { echo "Process raid pid: $raid_pid" waitforlisten $raid_pid $rpc_server - raid_bdev=$($rootdir/scripts/rpc.py -s $rpc_server get_raid_bdevs online | cut -d ' ' -f 1) + raid_bdev=$($rpc_py get_raid_bdevs online | cut -d ' ' -f 1) if [ $raid_bdev = "" ]; then echo "No raid0 device in SPDK app" return 1