RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-31 07:53:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #35649 into master

Browse Source 
* refs/pull/35649/head:
	vstart: allow specifying a different ganesha binary
	vstart: handle multiple ganesha's more sanely

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kotresh Hiremath Ravishankar <khiremat@redhat.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
This commit is contained in:
Patrick Donnelly 2020-06-18 09:05:08 -07:00
commit 9242da5a47
No known key found for this signature in database
GPG Key ID: 3A2A7E25BEA8AADB
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.githubmap
View File

@ -121,3 +121,4 @@ asettle Alexandra Settle <asettle@suse.com>
vumrao Vikhyat Umrao <vikhyat@redhat.com> vumrao Vikhyat Umrao <vikhyat@redhat.com>
saschagrunert Sascha Grunert <sgrunert@suse.com> saschagrunert Sascha Grunert <sgrunert@suse.com>
mchangir Milind Changire <mchangir@redhat.com> mchangir Milind Changire <mchangir@redhat.com>
kotreshhr Kotresh Hiremath Ravishankar <khiremat@redhat.com>

14
src/vstart.sh
View File

@ -175,6 +175,7 @@ fi
filestore_path= filestore_path=
kstore_path= kstore_path=
bluestore_dev= bluestore_dev=
ganesha_path=/usr/bin/ganesha.nfsd
VSTART_SEC="client.vstart.sh" VSTART_SEC="client.vstart.sh"
@ -233,6 +234,7 @@ 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--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--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--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() { usage_exit() {
printf "$usage" printf "$usage"
@ -444,6 +446,10 @@ case $1 in
--bluestore-zoned ) --bluestore-zoned )
zoned_enabled=1 zoned_enabled=1
;; ;;
--ganesha-path)
ganesha_path="$2"
shift
;;
* ) * )
usage_exit usage_exit
esac esac
@ -1132,20 +1138,20 @@ start_ganesha() {
RADOS_URLS { RADOS_URLS {
Userid = $test_user; Userid = $test_user;
watch_url = \"$url\"; watch_url = \"$url\";
}" > "$ganesha_dir/ganesha.conf" }" > "$ganesha_dir/ganesha-$name.conf"
wconf <<EOF wconf <<EOF
[ganesha.$name] [ganesha.$name]
host = $HOSTNAME host = $HOSTNAME
ip = $IP ip = $IP
port = $port port = $port
ganesha data = $ganesha_dir ganesha data = $ganesha_dir
pid file = $ganesha_dir/ganesha.pid pid file = $ganesha_dir/ganesha-$name.pid
EOF 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 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-rados-grace --userid $test_user -p $pool_name -n $namespace
prun env CEPH_CONF="${conf_fn}" /usr/bin/ganesha.nfsd -L "$ganesha_dir/ganesha.log" -f "$ganesha_dir/ganesha.conf" -p "$ganesha_dir/ganesha.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 # Wait few seconds for grace period to be removed
sleep 2 sleep 2
@ -1153,7 +1159,7 @@ EOF
prun env CEPH_CONF="${conf_fn}" ganesha-rados-grace --userid $test_user -p $pool_name -n $namespace prun env CEPH_CONF="${conf_fn}" ganesha-rados-grace --userid $test_user -p $pool_name -n $namespace
if $with_mgr_dashboard; then if $with_mgr_dashboard; then
$CEPH_BIN/rados -p $pool_name put "conf-$name" "$ganesha_dir/ganesha.conf" $CEPH_BIN/rados -p $pool_name put "conf-$name" "$ganesha_dir/ganesha-$name.conf"
fi fi
echo "$test_user ganesha daemon $name started on port: $port" echo "$test_user ganesha daemon $name started on port: $port"