0ecb36c727
$USER gives the login name who logged in the terminal and logname prints the login name who logged in the session. test/nvmf/common.sh has used $USER to start the SPDK application, as non-root but test/nvmf/host/perf.sh and test/nvmf/target/nvmf_example.sh have used logname to start the example application as non-root. It looks OK to use $USER to start application as non-root like other cases. Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Change-Id: Ia0a17e3bd37a76e4d808e5816ba6716920f8f340 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4090 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Broadcom CI Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
60 lines
1.6 KiB
Bash
Executable File
60 lines
1.6 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
|
|
testdir=$(readlink -f $(dirname $0))
|
|
rootdir=$(readlink -f $testdir/../../..)
|
|
source $rootdir/test/common/autotest_common.sh
|
|
source $rootdir/test/nvmf/common.sh
|
|
|
|
rpc_py="$rootdir/scripts/rpc.py"
|
|
|
|
MALLOC_BDEV_SIZE=64
|
|
MALLOC_BLOCK_SIZE=512
|
|
|
|
function build_nvmf_example_args() {
|
|
if [ $SPDK_RUN_NON_ROOT -eq 1 ]; then
|
|
echo "sudo -u $USER $SPDK_EXAMPLE_DIR/nvmf -i $NVMF_APP_SHM_ID" -g 10000
|
|
else
|
|
echo "$SPDK_EXAMPLE_DIR/nvmf -i $NVMF_APP_SHM_ID" -g 10000
|
|
fi
|
|
}
|
|
|
|
NVMF_EXAMPLE="$(build_nvmf_example_args)"
|
|
|
|
function nvmfexamplestart() {
|
|
timing_enter start_nvmf_example
|
|
$NVMF_EXAMPLE $1 &
|
|
nvmfpid=$!
|
|
trap 'process_shm --id $NVMF_APP_SHM_ID; nvmftestfini; exit 1' SIGINT SIGTERM EXIT
|
|
waitforlisten $nvmfpid
|
|
timing_exit start_nvmf_example
|
|
}
|
|
|
|
timing_enter nvmf_example_test
|
|
nvmftestinit
|
|
nvmfexamplestart "-m 0xF"
|
|
|
|
#create transport
|
|
$rpc_py nvmf_create_transport $NVMF_TRANSPORT_OPTS -u 8192
|
|
#create malloc bdev
|
|
malloc_bdevs="$($rpc_py bdev_malloc_create $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE) "
|
|
#create subsystem
|
|
$rpc_py nvmf_create_subsystem nqn.2016-06.io.spdk:cnode1 -a -s SPDK00000000000001
|
|
|
|
#add ns to subsystem
|
|
for malloc_bdev in $malloc_bdevs; do
|
|
$rpc_py nvmf_subsystem_add_ns nqn.2016-06.io.spdk:cnode1 "$malloc_bdev"
|
|
done
|
|
|
|
#add listener to subsystem
|
|
$rpc_py nvmf_subsystem_add_listener nqn.2016-06.io.spdk:cnode1 -t $TEST_TRANSPORT -a $NVMF_FIRST_TARGET_IP -s $NVMF_PORT
|
|
|
|
perf="$SPDK_EXAMPLE_DIR/perf"
|
|
|
|
$perf -q 64 -o 4096 -w randrw -M 30 -t 10 \
|
|
-r "trtype:${TEST_TRANSPORT} adrfam:IPv4 traddr:${NVMF_FIRST_TARGET_IP} trsvcid:${NVMF_PORT} \
|
|
subnqn:nqn.2016-06.io.spdk:cnode1"
|
|
|
|
trap - SIGINT SIGTERM EXIT
|
|
nvmftestfini
|
|
timing_exit nvmf_example_test
|