Commit a394f628 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki Committed by Darek Stojaczyk
Browse files

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.

Change-Id: Id1ba86740237c32a6f0259562c0b5c11d917bbcf
Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/453643


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
parent 22c3befd

test/bdev/bdev_raid.sh

+3 −3
Original line number Diff line number Diff line
@@ -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