From 687cff4ff8338f6e31d2c2e709fd8feb60752789 Mon Sep 17 00:00:00 2001 From: Jeff Layton Date: Wed, 10 Jun 2020 15:55:24 -0400 Subject: [PATCH] vstart: set $CEPH_CONF when running ganesha-rados-grace ...otherwise we could pick up the wrong ceph.conf file. Also, use the correct $test_user userid for these ops. Fixes: https://tracker.ceph.com/issues/45971 Signed-off-by: Jeff Layton (cherry picked from commit 9882a69818457580cbaa318d7a50ff6ddb09ee69) --- src/vstart.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vstart.sh b/src/vstart.sh index 08aeae7700972..5010f3827d76d 100755 --- a/src/vstart.sh +++ b/src/vstart.sh @@ -1136,15 +1136,15 @@ start_ganesha() { pid file = $ganesha_dir/ganesha.pid EOF - prun ganesha-rados-grace -p $pool_name -n $namespace add $name - prun ganesha-rados-grace -p $pool_name -n $namespace + 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 "$ganesha_dir/ganesha.log" -f "$ganesha_dir/ganesha.conf" -p "$ganesha_dir/ganesha.pid" -N NIV_DEBUG # Wait few seconds for grace period to be removed sleep 2 - prun ganesha-rados-grace -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 $CEPH_BIN/rados -p $pool_name put "conf-$name" "$ganesha_dir/ganesha.conf" -- 2.39.5