From: "Fabio M. Di Nitto"
The original patch e512a9ce367 was still racy in some conditions
as other rpc.* and nfs* processes were holding a lock on the filesystem.
stopping nfs in kernel is simply not enough in rhel5
this fixed version does stop nfs completely and re-instante nfs exports.
Resolves: rhbz#822066
Signed-off-by: Fabio M. Di Nitto
---
rgmanager/src/resources/clusterfs.sh | 31 ---
rgmanager/src/resources/fs.sh| 31 ---
2 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/rgmanager/src/resources/clusterfs.sh
b/rgmanager/src/resources/clusterfs.sh
index 89b30a2..49eb724 100755
--- a/rgmanager/src/resources/clusterfs.sh
+++ b/rgmanager/src/resources/clusterfs.sh
@@ -681,7 +681,10 @@ stopFilesystem() {
typeset -i max_tries=3 # how many times to try umount
typeset -i sleep_time=2 # time between each umount failure
typeset -i refs=0
- typeset nfsdthreads
+ typeset nfsexports=""
+ typeset nfsexp=""
+ typeset nfsopts=""
+ typeset nfsacl=""
typeset done=""
typeset umount_failed=""
typeset force_umount=""
@@ -804,16 +807,22 @@ stop: Could not match $OCF_RESKEY_device with a real
device"
if [ "$OCF_RESKEY_nfsrestart" = "yes" ]
|| \
[ "$OCF_RESKEY_nfsrestart" = "1" ];
then
- if [ -f /proc/fs/nfsd/threads
]; then
- ocf_log warning
"Restarting nfsd/nfslock"
- nfsdthreads="$(cat
/proc/fs/nfsd/threads)"
- service nfslock stop
- echo 0 >
/proc/fs/nfsd/threads
- echo $nfsdthreads >
/proc/fs/nfsd/threads
- service nfslock start
- else
- ocf_log err "Unable to
determin nfsd information. nfsd restart aborted"
- fi
+ ocf_log warning "Restarting
nfsd/nfslock"
+ nfsexports=$(cat
/var/lib/nfs/etab)
+ service nfslock stop
+ service nfs stop
+ service nfs start
+ service nfslock start
+ echo "$nfsexports" | { while
read line; do
+ nfsexp=$(echo $line |
awk '{print $1}')
+ nfsopts=$(echo $line |
sed -e 's#.*(##g' -e 's#).*##g')
+ nfsacl=$(echo $line |
awk '{print $2}' | sed -e 's#(.*##g')
+ if [ -n "$nfsopts" ];
then
+ exportfs -i -o
"$nfsopts" "$nfsacl":$nfsexp
+ else
+ exportfs -i
"$nfsacl":$nfsexp
+ fi
+ done; }
fi
else
diff --git a/rgmanager/src/resources/fs.sh b/rgmanager/src/resources/fs.sh
index 5724352..a98cddc 100755
--- a/rgmanager/src/resources/fs.sh
+++ b/rgmanager/src/resources/fs.sh
@@ -1019,7 +1019,10 @@ stopFilesystem() {
typeset -i max_tries=3 # how many times to try umount
typeset -i sleep_time=5 # time between each umount failure
typeset -i nfslock_reclaim=0
- typeset nfsdthreads
+ typeset nfsexports=""
+ typeset nfsexp=""
+ typeset nfsopts=""
+ typeset nfsacl=""
typeset done=""
typeset umount_failed=""
typeset force_umount=""
@@ -1126,16 +1129,22 @@ stop: Could not match $OCF_RESKEY_device with a real
device"
if [ "$OCF_RESKEY_nfsrestart" = "yes" ] || \
[ "$OCF_RESKEY_nfsrestart" = "1" ]; then
- if [ -f /proc/fs/nfsd/threads ]; then
- ocf_log warning "Restarting
nfsd/nfslock"
- nfsdthreads="$(cat
/proc/fs/nfsd/threads)"
- service nfslock stop
- echo 0 > /pr
