From 6e8e184bca3b27096663dcc22f4b8b179a46a82b Mon Sep 17 00:00:00 2001 From: Konrad Sztyber Date: Tue, 12 Apr 2022 08:33:06 +0200 Subject: [PATCH] scripts: fix PYTHONPATH references to scripts/ directory After 7610bc38d, python modules are now located in the python/ directory. That patch also updated PYTHONPATH assignment in most of the scripts, but one of the perf script and some docs/messages were missed. Change-Id: Iff3588526f2a382e599f5734d38fc32c15a7bf56 Signed-off-by: Konrad Sztyber Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12223 Reviewed-by: Karol Latecki Reviewed-by: Changpeng Liu Reviewed-by: Jim Harris Community-CI: Broadcom CI Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins --- scripts/perf/nvmf/README.md | 6 +++--- test/app/fuzz/common/fuzz_rpc.py | 2 +- test/bdev/bdevio/tests.py | 6 +++--- test/bdev/bdevperf/bdevperf.py | 6 +++--- test/nvme/perf/common.sh | 2 +- test/nvmf/target/multitarget_rpc.py | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/perf/nvmf/README.md b/scripts/perf/nvmf/README.md index af2397c14..3166a74d1 100644 --- a/scripts/perf/nvmf/README.md +++ b/scripts/perf/nvmf/README.md @@ -370,18 +370,18 @@ Run the script on the NVMe-oF target system: ``` ~sh cd spdk -sudo PYTHONPATH=$PYTHONPATH:$PWD/scripts scripts/perf/nvmf/run_nvmf.py +sudo PYTHONPATH=$PYTHONPATH:$PWD/python scripts/perf/nvmf/run_nvmf.py ``` By default script uses config.json configuration file in the scripts/perf/nvmf directory. You can specify a different configuration file at runtime as below: ``` ~sh -sudo PYTHONPATH=$PYTHONPATH:$PWD/scripts scripts/perf/nvmf/run_nvmf.py -c /path/to/config.json +sudo PYTHONPATH=$PYTHONPATH:$PWD/python scripts/perf/nvmf/run_nvmf.py -c /path/to/config.json ``` PYTHONPATH environment variable is needed because script uses SPDK-local Python -modules. If you'd like to get rid of `PYTHONPATH=$PYTHONPATH:$PWD/scripts` +modules. If you'd like to get rid of `PYTHONPATH=$PYTHONPATH:$PWD/python` you need to modify your environment so that Python interpreter is aware of `spdk/scripts` directory. diff --git a/test/app/fuzz/common/fuzz_rpc.py b/test/app/fuzz/common/fuzz_rpc.py index 27c27b41e..05697fe40 100755 --- a/test/app/fuzz/common/fuzz_rpc.py +++ b/test/app/fuzz/common/fuzz_rpc.py @@ -45,7 +45,7 @@ def _fuzz_vhost_create_dev(client, socket, is_blk, use_bogus_buffer, use_valid_b if __name__ == "__main__": parser = argparse.ArgumentParser( - description='SPDK RPC command line interface. NOTE: spdk/scripts/ is expected in PYTHONPATH') + description='SPDK RPC command line interface. NOTE: spdk/python is expected in PYTHONPATH') parser.add_argument('-s', dest='server_addr', help='RPC domain socket path or IP address', default='/var/tmp/spdk.sock') parser.add_argument('-p', dest='port', diff --git a/test/bdev/bdevio/tests.py b/test/bdev/bdevio/tests.py index 6ba764399..0db27688c 100755 --- a/test/bdev/bdevio/tests.py +++ b/test/bdev/bdevio/tests.py @@ -8,8 +8,8 @@ try: from spdk.rpc.client import print_dict, JSONRPCException import spdk.rpc as rpc except ImportError: - print("SPDK RPC library missing. Please add spdk/scripts/ directory to PYTHONPATH:") - print("'export PYTHONPATH=$PYTHONPATH:./spdk/scripts/'") + print("SPDK RPC library missing. Please add spdk/python directory to PYTHONPATH:") + print("'export PYTHONPATH=$PYTHONPATH:spdk/python'") exit(1) try: @@ -39,7 +39,7 @@ def perform_tests_func(client, name=None): if __name__ == "__main__": parser = argparse.ArgumentParser( - description='SPDK RPC command line interface. NOTE: spdk/scripts/ is expected in PYTHONPATH') + description='SPDK RPC command line interface. NOTE: spdk/python is expected in PYTHONPATH') parser.add_argument('-s', dest='server_addr', help='RPC domain socket path or IP address', default='/var/tmp/spdk.sock') parser.add_argument('-p', dest='port', diff --git a/test/bdev/bdevperf/bdevperf.py b/test/bdev/bdevperf/bdevperf.py index 5839d33f9..a9bfc4e51 100755 --- a/test/bdev/bdevperf/bdevperf.py +++ b/test/bdev/bdevperf/bdevperf.py @@ -9,8 +9,8 @@ try: from spdk.rpc.client import print_dict, JSONRPCException import spdk.rpc as rpc except ImportError: - print("SPDK RPC library missing. Please add spdk/scripts/ directory to PYTHONPATH:") - print("'export PYTHONPATH=$PYTHONPATH:./spdk/scripts/'") + print("SPDK RPC library missing. Please add spdk/python directory to PYTHONPATH:") + print("'export PYTHONPATH=$PYTHONPATH:spdk/python'") exit(1) try: @@ -38,7 +38,7 @@ def perform_tests_func(client): if __name__ == "__main__": parser = argparse.ArgumentParser( - description='SPDK RPC command line interface. NOTE: spdk/scripts/ is expected in PYTHONPATH') + description='SPDK RPC command line interface. NOTE: spdk/python is expected in PYTHONPATH') parser.add_argument('-s', dest='server_addr', help='RPC domain socket path or IP address', default='/var/tmp/spdk.sock') parser.add_argument('-p', dest='port', diff --git a/test/nvme/perf/common.sh b/test/nvme/perf/common.sh index 58461abca..483a77a03 100755 --- a/test/nvme/perf/common.sh +++ b/test/nvme/perf/common.sh @@ -440,7 +440,7 @@ function run_bdevperf() { sleep 3 fi - PYTHONPATH=$PYTHONPATH:$rootdir/scripts $bdevperf_rpc -s "$rpc_socket" -t $((RUNTIME + 10)) perform_tests + PYTHONPATH=$PYTHONPATH:$rootdir/python $bdevperf_rpc -s "$rpc_socket" -t $((RUNTIME + 10)) perform_tests # Using "-z" option causes bdevperf to NOT exit automatically after running the test, # so we need to stop it ourselves. diff --git a/test/nvmf/target/multitarget_rpc.py b/test/nvmf/target/multitarget_rpc.py index f01c53745..abfe8329e 100755 --- a/test/nvmf/target/multitarget_rpc.py +++ b/test/nvmf/target/multitarget_rpc.py @@ -17,7 +17,7 @@ except ImportError: if __name__ == "__main__": parser = argparse.ArgumentParser( - description='NVMe-oF RPC command line interface. NOTE: spdk/scripts/ is expected in PYTHONPATH') + description='NVMe-oF RPC command line interface. NOTE: spdk/python is expected in PYTHONPATH') parser.add_argument('-s', dest='server_addr', help='RPC domain socket path or IP address', default='/var/tmp/spdk.sock') parser.add_argument('-p', dest='port',