Commit 6e8e184b authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Jim Harris
Browse files

scripts: fix PYTHONPATH references to scripts/ directory 



After 7610bc38, 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: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12223


Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent ac0c53ae

scripts/perf/nvmf/README.md

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

test/app/fuzz/common/fuzz_rpc.py

+1 −1
Original line number Diff line number Diff line
@@ -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',

test/bdev/bdevio/tests.py

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

test/bdev/bdevperf/bdevperf.py

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

test/nvme/perf/common.sh

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