d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
numam-spdk/test/spdkcli/tcp.sh

36 lines
808 B
Bash
Raw Normal View History

spdkcli: Add support for TCP connection Adds an option to spdkcli.py to allow connection over a tcp via a host address and port. These options match the format that exists in rpc.py Signed-off-by: Mike Carlin <mikefcarlin@protonmail.com> Change-Id: I7e9e1c376546dd765ffd6f4f4db88e193e9aa0ef Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467844 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2019-09-09 04:12:24 -07:00
#!/usr/bin/env bash
testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../..)
source $rootdir/test/common/autotest_common.sh
source $rootdir/test/spdkcli/common.sh
test/spdkcli/tcp: use socat for listening for RPC on a TCP port `-r` command line param in SPDK won't accept a TCP port soon. Instead, we can make SPDK listen on a unix domain socket, then expose the socket on a TCP port using socat. Change-Id: Iea52a5f21d845eac6888d343ce03c7e7caf19617 Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1332 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2020-03-17 11:58:09 +01:00
function err_cleanup() {
if [ -n "$socat_pid" ]; then
killprocess $socat_pid || true
fi
killprocess $spdk_tgt_pid
}
spdkcli: Add support for TCP connection Adds an option to spdkcli.py to allow connection over a tcp via a host address and port. These options match the format that exists in rpc.py Signed-off-by: Mike Carlin <mikefcarlin@protonmail.com> Change-Id: I7e9e1c376546dd765ffd6f4f4db88e193e9aa0ef Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467844 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2019-09-09 04:12:24 -07:00
IP_ADDRESS="127.0.0.1"
PORT="9998"
test/spdkcli/tcp: use socat for listening for RPC on a TCP port `-r` command line param in SPDK won't accept a TCP port soon. Instead, we can make SPDK listen on a unix domain socket, then expose the socket on a TCP port using socat. Change-Id: Iea52a5f21d845eac6888d343ce03c7e7caf19617 Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1332 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2020-03-17 11:58:09 +01:00
trap 'err_cleanup; exit 1' SIGINT SIGTERM EXIT
spdkcli: Add support for TCP connection Adds an option to spdkcli.py to allow connection over a tcp via a host address and port. These options match the format that exists in rpc.py Signed-off-by: Mike Carlin <mikefcarlin@protonmail.com> Change-Id: I7e9e1c376546dd765ffd6f4f4db88e193e9aa0ef Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467844 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2019-09-09 04:12:24 -07:00
timing_enter run_spdk_tgt_tcp
build: Output executables from the app directory to build/bin Automatically place binaries produced from the app directory into build/bin. This matches with the output in build/lib that already exists. Change-Id: I13cd2da71d2f88592e22308fe8a907bf458458b5 Signed-off-by: Ben Walker <benjamin.walker@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2379 Community-CI: Mellanox Build Bot Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
2020-05-11 14:15:03 -07:00
$SPDK_BIN_DIR/spdk_tgt -m 0x3 -p 0 -s 2048 &
spdkcli: Add support for TCP connection Adds an option to spdkcli.py to allow connection over a tcp via a host address and port. These options match the format that exists in rpc.py Signed-off-by: Mike Carlin <mikefcarlin@protonmail.com> Change-Id: I7e9e1c376546dd765ffd6f4f4db88e193e9aa0ef Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467844 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2019-09-09 04:12:24 -07:00
spdk_tgt_pid=$!
test/spdkcli/tcp: use socat for listening for RPC on a TCP port `-r` command line param in SPDK won't accept a TCP port soon. Instead, we can make SPDK listen on a unix domain socket, then expose the socket on a TCP port using socat. Change-Id: Iea52a5f21d845eac6888d343ce03c7e7caf19617 Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1332 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2020-03-17 11:58:09 +01:00
waitforlisten $spdk_tgt_pid
# socat will terminate automatically after the connection is closed
socat TCP-LISTEN:$PORT UNIX-CONNECT:$DEFAULT_RPC_ADDR &
socat_pid=$!
test/spdkcli/tcp: general cleanup Polling for TCP connection seems cool, but it's a lot of code that's impossible to debug. Rely on the same code inside rpc.py instead. If the connection fails, rpc.py will give us the best error message we can get. Change-Id: I1ca99bb2256a38004269927b057335208cc5d968 Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1333 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com> Community-CI: Mellanox Build Bot
2020-03-17 12:04:22 +01:00
$rootdir/scripts/rpc.py -r 100 -t 2 -s $IP_ADDRESS -p $PORT rpc_get_methods
spdkcli: Add support for TCP connection Adds an option to spdkcli.py to allow connection over a tcp via a host address and port. These options match the format that exists in rpc.py Signed-off-by: Mike Carlin <mikefcarlin@protonmail.com> Change-Id: I7e9e1c376546dd765ffd6f4f4db88e193e9aa0ef Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467844 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2019-09-09 04:12:24 -07:00
timing_exit run_spdk_tgt_tcp
test/spdkcli/tcp: don't override the ERR trap That test used to call an inexistent function in its ERR trap. That's for one. Second, none of the SPDK tests should set the ERR trap themselves - it's set once in autotest_common.sh and prints the backtrace. What test scripts should do is setting SIGINT/EXIT traps - fix it now. Change-Id: I46c82651be78eeaec16ac52396c5e80a0405e5ff Signed-off-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1331 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Michal Berger <michalx.berger@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2020-03-17 11:30:37 +01:00
trap - SIGINT SIGTERM EXIT
spdkcli: Add support for TCP connection Adds an option to spdkcli.py to allow connection over a tcp via a host address and port. These options match the format that exists in rpc.py Signed-off-by: Mike Carlin <mikefcarlin@protonmail.com> Change-Id: I7e9e1c376546dd765ffd6f4f4db88e193e9aa0ef Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/467844 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com>
2019-09-09 04:12:24 -07:00
killprocess $spdk_tgt_pid
Reference in New Issue Copy Permalink