From 1feed4e8613ee07e9a1c8022e71b22f6d4f7d36b Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Wed, 17 Jun 2020 15:49:52 -0400 Subject: [PATCH] vstart: allow specifying a different ganesha binary Signed-off-by: Jeff Layton (cherry picked from commit 06d29a717a20190a98b1b9e3b9306fea163f1ecb) Conflicts: src/vstart.sh - Removed bluestore-zoned option as pr(#35111) is not backported yet. --- src/vstart.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/vstart.sh b/src/vstart.sh index 54591e6308410..7c4198574fabc 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -174,6 +174,7 @@ fi filestore_path= kstore_path= bluestore_dev= +ganesha_path=/usr/bin/ganesha.nfsd VSTART_SEC="client.vstart.sh" @@ -231,6 +232,7 @@ usage=$usage"\t--bluestore-devs: comma-separated list of blockdevs to use for bl usage=$usage"\t--inc-osd: append some more osds into existing vcluster\n" usage=$usage"\t--cephadm: enable cephadm orchestrator with ~/.ssh/id_rsa[.pub]\n" usage=$usage"\t--no-parallel: dont start all OSDs in parallel\n" +usage=$usage"\t--ganesha-path: path to ganesha.nfsd binary (defaults to $ganesha_path)\n" usage_exit() { printf "$usage" @@ -439,6 +441,10 @@ case $1 in done shift ;; + --ganesha-path) + ganesha_path="$2" + shift + ;; * ) usage_exit esac @@ -1139,7 +1145,7 @@ EOF prun env CEPH_CONF="${conf_fn}" ganesha-rados-grace --userid $test_user -p $pool_name -n $namespace add $name prun env CEPH_CONF="${conf_fn}" ganesha-rados-grace --userid $test_user -p $pool_name -n $namespace - prun env CEPH_CONF="${conf_fn}" /usr/bin/ganesha.nfsd -L "$CEPH_OUT_DIR/ganesha-$name.log" -f "$ganesha_dir/ganesha-$name.conf" -p "$CEPH_OUT_DIR/ganesha-$name.pid" -N NIV_DEBUG + prun env CEPH_CONF="${conf_fn}" $ganesha_path -L "$CEPH_OUT_DIR/ganesha-$name.log" -f "$ganesha_dir/ganesha-$name.conf" -p "$CEPH_OUT_DIR/ganesha-$name.pid" -N NIV_DEBUG # Wait few seconds for grace period to be removed sleep 2 -- 2.39.5