RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 11:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #35702 into master

Browse Source 
* refs/pull/35702/head:
	vstart: just use ganesha.nfsd that's in $PATH

Reviewed-by: Varsha Rao <varao@redhat.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
This commit is contained in:
Patrick Donnelly 2020-06-23 07:22:58 -07:00
commit 015a2e66a6
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/vstart.sh
View File

@ -175,7 +175,6 @@ fi
filestore_path=
kstore_path=
bluestore_dev=
ganesha_path=/usr/bin/ganesha.nfsd
VSTART_SEC="client.vstart.sh"
@ -234,7 +233,6 @@ usage=$usage"\t--bluestore-zoned: blockdevs listed by --bluestore-devs are zoned
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"
@ -446,10 +444,6 @@ case $1 in
--bluestore-zoned )
zoned_enabled=1
;;
--ganesha-path)
ganesha_path="$2"
shift
;;
* )
usage_exit
esac
@ -1151,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}" $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
prun env CEPH_CONF="${conf_fn}" 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
# Wait few seconds for grace period to be removed
sleep 2