[Cluster-devel] cluster/rgmanager/src daemons/restree.c resour ...

[Cluster-devel] cluster/rgmanager/src daemons/restree.c resour ...

[lhh]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	lhh at sourceware.org	2006-08-11 15:02:30

Modified files:
	rgmanager/src/daemons: restree.c 
	rgmanager/src/resources: fs.sh 

Log message:
	Merge from RHEL4U4 branch

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/restree.c.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.10.2.10&r2=1.10.2.11
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/fs.sh.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.4.2.14&r2=1.4.2.15

--- cluster/rgmanager/src/daemons/restree.c	2006/06/16 20:11:33	1.10.2.10
+++ cluster/rgmanager/src/daemons/restree.c	2006/08/11 15:02:29	1.10.2.11
@@ -15,6 +15,9 @@
   along with this program; see the file COPYING.  If not, write to the
   Free Software Foundation, Inc.,  675 Mass Ave, Cambridge, 
   MA 02139, USA.
+
+  Fix for #193859 - relocation of a service w/o umounting file-systems
+    by Navid Sheikhol-Eslami [ navid at redhat dot com ]
 */
 #include <libxml/parser.h>
 #include <libxml/xmlmemory.h>
--- cluster/rgmanager/src/resources/fs.sh	2006/06/16 19:57:52	1.4.2.14
+++ cluster/rgmanager/src/resources/fs.sh	2006/08/11 15:02:29	1.4.2.15
@@ -1061,7 +1061,8 @@
 	typeset -i ret_val=0
 	typeset -i try=1
 	typeset -i max_tries=3		# how many times to try umount
-	typeset -i sleep_time=2		# time between each umount failure
+	typeset -i sleep_time=5		# time between each umount failure
+	typeset -i nfslock_reclaim=0
 	typeset done=""
 	typeset umount_failed=""
 	typeset force_umount=""
@@ -1157,11 +1158,8 @@
 	          		    mkdir -p $mp/.clumanager/statd
 				    # Copy out the notify list; our 
 				    # IPs are already torn down
-				    if notify_list_store $mp/.clumanager/statd
-				    then
-				      notify_list_broadcast \
-				        $mp/.clumanager/statd
-				    fi
+				    notify_list_store $mp/.clumanager/statd
+				    nfslock_reclaim=1
 				  fi
 				fi
 			fi
@@ -1186,6 +1184,11 @@
 		fi
 	done # while 
 
+	if [ $nfslock_reclaim -eq 1 ]; then
+		# If we have this flag set, do a full reclaim broadcast
+		notify_list_broadcast $mp/.clumanager/statd
+	fi
+
 	if [ -n "$umount_failed" ]; then
 		ocf_log err "'umount $mp' failed, error=$ret_val"