|
 |
9ae3f9 |
From d23ad767281af85cf07f5c3f63de482d40ee1953 Mon Sep 17 00:00:00 2001
|
|
|
9ae3f9 |
From: Shwetha K Acharya <sacharya@redhat.com>
|
|
|
9ae3f9 |
Date: Thu, 10 Sep 2020 13:16:12 +0530
|
|
|
9ae3f9 |
Subject: [PATCH 471/473] nfs-ganesha: gluster_shared_storage fails to
|
|
|
9ae3f9 |
automount on node reboot on rhel 8
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
The patch https://review.gluster.org/#/c/glusterfs/+/24934/, changes mount point
|
|
|
9ae3f9 |
of gluster_shared_storage from /var/run to /run to address the issue of symlink
|
|
|
9ae3f9 |
at mount path in fstab.
|
|
|
9ae3f9 |
NOTE: mount point /var/run is symlink to /run
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
The required changes with respect to gluster_shared_storage mount path are
|
|
|
9ae3f9 |
introduced with this patch in nfs-ganesha.
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
>Fixes: #1475
|
|
|
9ae3f9 |
>Change-Id: I9c7677a053e1291f71476d47ba6fa2e729f59625
|
|
|
9ae3f9 |
>Signed-off-by: Shwetha K Acharya <sacharya@redhat.com>
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
backport of https://review.gluster.org/#/c/glusterfs/+/24970/
|
|
|
9ae3f9 |
BUG: 1873469
|
|
|
9ae3f9 |
Change-Id: I9c7677a053e1291f71476d47ba6fa2e729f59625
|
|
|
9ae3f9 |
Signed-off-by: Shwetha K Acharya <sacharya@redhat.com>
|
|
|
9ae3f9 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/211392
|
|
|
9ae3f9 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
9ae3f9 |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
9ae3f9 |
---
|
|
|
9ae3f9 |
extras/ganesha/ocf/ganesha_nfsd | 2 +-
|
|
|
9ae3f9 |
extras/ganesha/scripts/ganesha-ha.sh | 2 +-
|
|
|
9ae3f9 |
extras/hook-scripts/start/post/S31ganesha-start.sh | 2 +-
|
|
|
9ae3f9 |
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
diff --git a/extras/ganesha/ocf/ganesha_nfsd b/extras/ganesha/ocf/ganesha_nfsd
|
|
|
9ae3f9 |
index 93fc8be..f91e8b6 100644
|
|
|
9ae3f9 |
--- a/extras/ganesha/ocf/ganesha_nfsd
|
|
|
9ae3f9 |
+++ b/extras/ganesha/ocf/ganesha_nfsd
|
|
|
9ae3f9 |
@@ -36,7 +36,7 @@ else
|
|
|
9ae3f9 |
. ${OCF_FUNCTIONS_DIR}/ocf-shellfuncs
|
|
|
9ae3f9 |
fi
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
-OCF_RESKEY_ha_vol_mnt_default="/var/run/gluster/shared_storage"
|
|
|
9ae3f9 |
+OCF_RESKEY_ha_vol_mnt_default="/run/gluster/shared_storage"
|
|
|
9ae3f9 |
: ${OCF_RESKEY_ha_vol_mnt=${OCF_RESKEY_ha_vol_mnt_default}}
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
ganesha_meta_data() {
|
|
|
9ae3f9 |
diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
9ae3f9 |
index a6814b1..9790a71 100644
|
|
|
9ae3f9 |
--- a/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
9ae3f9 |
+++ b/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
9ae3f9 |
@@ -24,7 +24,7 @@ GANESHA_HA_SH=$(realpath $0)
|
|
|
9ae3f9 |
HA_NUM_SERVERS=0
|
|
|
9ae3f9 |
HA_SERVERS=""
|
|
|
9ae3f9 |
HA_VOL_NAME="gluster_shared_storage"
|
|
|
9ae3f9 |
-HA_VOL_MNT="/var/run/gluster/shared_storage"
|
|
|
9ae3f9 |
+HA_VOL_MNT="/run/gluster/shared_storage"
|
|
|
9ae3f9 |
HA_CONFDIR=$HA_VOL_MNT"/nfs-ganesha"
|
|
|
9ae3f9 |
SERVICE_MAN="DISTRO_NOT_FOUND"
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
diff --git a/extras/hook-scripts/start/post/S31ganesha-start.sh b/extras/hook-scripts/start/post/S31ganesha-start.sh
|
|
|
9ae3f9 |
index 90ba6bc..7ad6f23 100755
|
|
|
9ae3f9 |
--- a/extras/hook-scripts/start/post/S31ganesha-start.sh
|
|
|
9ae3f9 |
+++ b/extras/hook-scripts/start/post/S31ganesha-start.sh
|
|
|
9ae3f9 |
@@ -4,7 +4,7 @@ OPTSPEC="volname:,gd-workdir:"
|
|
|
9ae3f9 |
VOL=
|
|
|
9ae3f9 |
declare -i EXPORT_ID
|
|
|
9ae3f9 |
ganesha_key="ganesha.enable"
|
|
|
9ae3f9 |
-GANESHA_DIR="/var/run/gluster/shared_storage/nfs-ganesha"
|
|
|
9ae3f9 |
+GANESHA_DIR="/run/gluster/shared_storage/nfs-ganesha"
|
|
|
9ae3f9 |
CONF1="$GANESHA_DIR/ganesha.conf"
|
|
|
9ae3f9 |
GLUSTERD_WORKDIR=
|
|
|
9ae3f9 |
|
|
|
9ae3f9 |
--
|
|
|
9ae3f9 |
1.8.3.1
|
|
|
9ae3f9 |
|