From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 10 Jun 2020 19:55:24 +0000 (-0400)
Subject: vstart: set $CEPH_CONF when running ganesha-rados-grace
X-Git-Tag: v16.1.0~2087^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9882a69818457580cbaa318d7a50ff6ddb09ee69;p=ceph.git

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 <jlayton@redhat.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index 88fe10338681..319b6e47c09b 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -1142,15 +1142,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"