From mboxrd@z Thu Jan 1 00:00:00 1970 From: lhh@sourceware.org Date: 30 Nov 2007 19:44:35 -0000 Subject: [Cluster-devel] cluster/rgmanager src/resources/vm.sh src/reso ... Message-ID: <20071130194435.21438.qmail@sourceware.org> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit CVSROOT: /cvs/cluster Module name: cluster Branch: RHEL5 Changes by: lhh at sourceware.org 2007-11-30 19:44:34 Modified files: rgmanager/src/resources: vm.sh service.sh clusterfs.sh rgmanager : ChangeLog Log message: 2007-11-30 Lon Hohberger * src/resources/clusterfs.sh: Retry mount up to 3 times to avoid race condition during another process mounting a GFS volume * src/resources/vm.sh, service.sh: Add defaults for values. Make vm.sh work with more service attrs (max restarts) Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/vm.sh.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.2.9&r2=1.1.2.10 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/service.sh.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.7.2.7&r2=1.7.2.8 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/clusterfs.sh.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.15.2.3&r2=1.15.2.4 http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/ChangeLog.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.31.2.29&r2=1.31.2.30 --- cluster/rgmanager/src/resources/vm.sh 2007/11/26 21:46:27 1.1.2.9 +++ cluster/rgmanager/src/resources/vm.sh 2007/11/30 19:44:34 1.1.2.10 @@ -75,7 +75,39 @@ Automatic start after quorum formation - + + + + + + If set to yes, the last owner will reboot if this resource + group fails to stop cleanly, thus allowing the resource + group to fail over to another node. Use with caution; a + badly-behaved resource could cause the entire cluster to + reboot. This should never be enabled if the automatic + start feature is used. + + + Reboot if stop phase fails + + + + + + + If set, this resource group will only relocate to + nodes which have no other resource groups running in the + event of a failure. If no empty nodes are available, + this resource group will not be restarted after a failure. + Additionally, resource groups will not automatically + relocate to the node running this resource group. This + option can be overridden by manual start and/or relocate + operations. + + + Exclusive resource group + + @@ -143,7 +175,6 @@ - Swap disk for the virtual machine. (physical, on the host) @@ -184,17 +215,28 @@ - + + + Top-level service this depends on, in "service:name" format. + + + Service dependency; will not start without the specified + service running. + + + + + Maximum restarts for this service. Maximum restarts for this service. - + - + Restart expiration time @@ -206,7 +248,7 @@ is exceeded in this given expiration time, the service is relocated instead of restarted again. - + --- cluster/rgmanager/src/resources/service.sh 2007/11/26 21:46:27 1.7.2.7 +++ cluster/rgmanager/src/resources/service.sh 2007/11/30 19:44:34 1.7.2.8 @@ -95,7 +95,7 @@ - + If set, this resource group will only relocate to nodes which have no other resource groups running in the @@ -162,7 +162,7 @@ Maximum restarts for this service. - + @@ -177,7 +177,7 @@ is exceeded in this given expiration time, the service is relocated instead of restarted again. - + --- cluster/rgmanager/src/resources/clusterfs.sh 2007/11/13 17:38:02 1.15.2.3 +++ cluster/rgmanager/src/resources/clusterfs.sh 2007/11/30 19:44:34 1.15.2.4 @@ -907,8 +907,20 @@ case $1 in start) - startFilesystem - exit $? + declare tries=0 + declare rv + + while [ $tries -lt 3 ]; do + startFilesystem + rv=$? + if [ rv -eq 0 ]; then + exit 0 + fi + + ((tries++)) + sleep 3 + done + exit $rv ;; stop) stopFilesystem --- cluster/rgmanager/ChangeLog 2007/11/26 21:46:26 1.31.2.29 +++ cluster/rgmanager/ChangeLog 2007/11/30 19:44:34 1.31.2.30 @@ -1,3 +1,9 @@ +2007-11-30 Lon Hohberger + * src/resources/clusterfs.sh: Retry mount up to 3 times to avoid + race condition during another process mounting a GFS volume + * src/resources/vm.sh, service.sh: Add defaults for values. + Make vm.sh work with more service attrs (max restarts) + 2007-11-26 Lon Hohberger * include/reslist.h: Add restart counters to resource node structure (intended for top-level resources, i.e. services, vms...)