From b80cf55e72c704940f4cc06f49e5269a51813bf0 Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Mon, 20 Feb 2023 10:17:10 +0530 Subject: [PATCH] cephfs: upgrade cephfs-shell's path wherever necessary Commit dc69033763cc116c6ccdf1f97149a74248691042 moves cephfs-shell from "/src/tools/cephfs/" to "/src/tools/cephfs/shell" but cephfs-shell's location in src/vstart.sh and qa/tasks/cephfs/test_cephfs_shell.py is left un-updated. This produces a broken vstart_environment.sh and broken export command in test_cephfs_shell.py. Introduced-by: dc69033763cc116c6ccdf1f97149a74248691042 Fixes: https://tracker.ceph.com/issues/58795 Signed-off-by: Rishabh Dave (cherry picked from commit 48ef0444774934dd6d0d3e026142d95e4098bebd) Conflicts: qa/tasks/cephfs/test_cephfs_shell.py - Comment present at the top of file was different in Pacific compared to main branch. --- doc/cephfs/cephfs-shell.rst | 2 +- qa/tasks/cephfs/test_cephfs_shell.py | 6 ++++-- src/vstart.sh | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc/cephfs/cephfs-shell.rst b/doc/cephfs/cephfs-shell.rst index 2fa1decbbfd01..6e6a1b1e36b44 100644 --- a/doc/cephfs/cephfs-shell.rst +++ b/doc/cephfs/cephfs-shell.rst @@ -37,7 +37,7 @@ Options : .. code:: bash [build]$ python3 -m venv venv && source venv/bin/activate && pip3 install cmd2 - [build]$ source vstart_environment.sh && source venv/bin/activate && python3 ../src/tools/cephfs/cephfs-shell + [build]$ source vstart_environment.sh && source venv/bin/activate && python3 ../src/tools/cephfs/shell/cephfs-shell Commands ======== diff --git a/qa/tasks/cephfs/test_cephfs_shell.py b/qa/tasks/cephfs/test_cephfs_shell.py index 8995d260ffdc7..477d0ae09da3d 100644 --- a/qa/tasks/cephfs/test_cephfs_shell.py +++ b/qa/tasks/cephfs/test_cephfs_shell.py @@ -1,6 +1,8 @@ """ -Before running this testsuite, add path to cephfs-shell module to $PATH and -export $PATH. +NOTE: For running this tests locally (using vstart_runner.py), export the +path to src/tools/cephfs/shell/cephfs-shell module to $PATH. Running +"export PATH=$PATH:$(cd ../src/tools/cephfs/shell && pwd)" from the build dir +will update the environment without hassles of typing the path correctly. """ from io import StringIO from os import path diff --git a/src/vstart.sh b/src/vstart.sh index e587d6876b393..3e53cf0d61897 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -67,7 +67,7 @@ if [ -n "$CEPH_BUILD_ROOT" ]; then [ -z "$OBJCLASS_PATH" ] && OBJCLASS_PATH=$CEPH_LIB/rados-classes # make install should install python extensions into PYTHONPATH elif [ -n "$CEPH_ROOT" ]; then - [ -z "$CEPHFS_SHELL" ] && CEPHFS_SHELL=$CEPH_ROOT/src/tools/cephfs/cephfs-shell + [ -z "$CEPHFS_SHELL" ] && CEPHFS_SHELL=$CEPH_ROOT/src/tools/cephfs/shell/cephfs-shell [ -z "$PYBIND" ] && PYBIND=$CEPH_ROOT/src/pybind [ -z "$CEPH_BIN" ] && CEPH_BIN=$CEPH_BUILD_DIR/bin [ -z "$CEPH_ADM" ] && CEPH_ADM=$CEPH_BIN/ceph -- 2.39.5