|
 |
cb8e9e |
From 233f6e2adb9f28291cbb00636fa1e215fe1dae7d Mon Sep 17 00:00:00 2001
|
|
|
cb8e9e |
From: Soumya Koduri <skoduri@redhat.com>
|
|
|
cb8e9e |
Date: Tue, 30 Jun 2015 19:26:27 +0530
|
|
|
cb8e9e |
Subject: [PATCH 193/200] common-ha: Fix '/var/lib/nfs/statd/state' path creation
|
|
|
cb8e9e |
|
|
|
cb8e9e |
'/var/lib/nfs/statd/state' which contains NSM state number
|
|
|
cb8e9e |
should be a file instead of directory.
|
|
|
cb8e9e |
|
|
|
cb8e9e |
This is a backport of the below fix
|
|
|
cb8e9e |
http://review.gluster.org/#/c/11468/
|
|
|
cb8e9e |
|
|
|
cb8e9e |
Change-Id: Id008b4f4dd810fe6d6b4d2599cbc0b488010384b
|
|
|
cb8e9e |
BUG: 1237165
|
|
|
cb8e9e |
Signed-off-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
cb8e9e |
Reviewed-on: http://review.gluster.org/11468
|
|
|
cb8e9e |
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
|
|
|
cb8e9e |
Reviewed-by: Niels de Vos <ndevos@redhat.com>
|
|
|
cb8e9e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/52070
|
|
|
cb8e9e |
Tested-by: Niels de Vos <ndevos@redhat.com>
|
|
|
cb8e9e |
---
|
|
|
cb8e9e |
extras/ganesha/scripts/ganesha-ha.sh | 8 +++++---
|
|
|
cb8e9e |
1 files changed, 5 insertions(+), 3 deletions(-)
|
|
|
cb8e9e |
|
|
|
cb8e9e |
diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
cb8e9e |
index ccaa3d8..69794a3 100755
|
|
|
cb8e9e |
--- a/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
cb8e9e |
+++ b/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
cb8e9e |
@@ -783,7 +783,9 @@ setup_state_volume()
|
|
|
cb8e9e |
if [ ! -d ${mnt}/nfs-ganesha/${dirname}/nfs/statd ]; then
|
|
|
cb8e9e |
mkdir ${mnt}/nfs-ganesha/${dirname}/nfs/statd
|
|
|
cb8e9e |
fi
|
|
|
cb8e9e |
- touch ${mnt}/nfs-ganesha/${dirname}/nfs/state
|
|
|
cb8e9e |
+ if [ ! -e ${mnt}/nfs-ganesha/${dirname}/nfs/state ]; then
|
|
|
cb8e9e |
+ touch ${mnt}/nfs-ganesha/${dirname}/nfs/state
|
|
|
cb8e9e |
+ fi
|
|
|
cb8e9e |
if [ ! -d ${mnt}/nfs-ganesha/${dirname}/nfs/ganesha/v4recov ]; then
|
|
|
cb8e9e |
mkdir ${mnt}/nfs-ganesha/${dirname}/nfs/ganesha/v4recov
|
|
|
cb8e9e |
fi
|
|
|
cb8e9e |
@@ -796,8 +798,8 @@ setup_state_volume()
|
|
|
cb8e9e |
if [ ! -d ${mnt}/nfs-ganesha/${dirname}/nfs/statd/sm.bak ]; then
|
|
|
cb8e9e |
mkdir ${mnt}/nfs-ganesha/${dirname}/nfs/statd/sm.bak
|
|
|
cb8e9e |
fi
|
|
|
cb8e9e |
- if [ ! -d ${mnt}/nfs-ganesha/${dirname}/nfs/statd/state ]; then
|
|
|
cb8e9e |
- mkdir ${mnt}/nfs-ganesha/${dirname}/nfs/statd/state
|
|
|
cb8e9e |
+ if [ ! -e ${mnt}/nfs-ganesha/${dirname}/nfs/statd/state ]; then
|
|
|
cb8e9e |
+ touch ${mnt}/nfs-ganesha/${dirname}/nfs/statd/state
|
|
|
cb8e9e |
fi
|
|
|
cb8e9e |
for server in ${HA_SERVERS} ; do
|
|
|
cb8e9e |
if [ ${server} != ${dirname} ]; then
|
|
|
cb8e9e |
--
|
|
|
cb8e9e |
1.7.1
|
|
|
cb8e9e |
|