Commit 5f0c99c0 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

test/vhost/initiator: specify RPC address via -r



Remove the [Rpc] section of the vhost initiator bdev.conf file and use
the bdev_svc -r parameter to set the RPC address instead.

Change-Id: Iaa5f6947b49679082f00d4c30d625ab2e5db8441
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/390327


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarDariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 23c568aa
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -413,7 +413,7 @@ function discover_bdevs()
{
	local rootdir=$1
	local config_file=$2
	local rpc_server=$3
	local rpc_server=/var/tmp/spdk-discover-bdevs.sock

	if [ ! -e $config_file ]; then
		echo "Invalid Configuration File: $config_file"
@@ -422,7 +422,7 @@ function discover_bdevs()

	# Start the bdev service to query for the list of available
	# bdevs.
	$rootdir/test/app/bdev_svc/bdev_svc -i 0 -s 1024  -c $config_file &>/dev/null &
	$rootdir/test/app/bdev_svc/bdev_svc -r $rpc_server -i 0 -s 1024  -c $config_file &>/dev/null &
	stubpid=$!
	while ! [ -e /var/run/spdk_bdev0 ]; do
		sleep 1
+0 −4
Original line number Diff line number Diff line
@@ -2,9 +2,5 @@
  Path /tmp/vhost.0
  Queues 16

[Rpc]
  Enable Yes
  Listen /var/tmp/spdk2.sock

[Ioat]
  Disable Yes
+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ for bdev in $bdevs; do
        timing_exit bounds

        timing_enter bdev_svc
        bdevs=$(discover_bdevs $rootdir $testdir/bdev.conf /var/tmp/spdk2.sock | jq -r '.[] | select(.claimed == false)')
        bdevs=$(discover_bdevs $rootdir $testdir/bdev.conf | jq -r '.[] | select(.claimed == false)')
        timing_exit bdev_svc

        if [ -d /usr/src/fio ]; then