CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL5
Changes by: lhh@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 <lhh at redhat.com>
* 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=RHEL 5&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=RH EL5&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 @@
<shortdesc lang="en">
Automatic start after quorum formation
</shortdesc>
- <content type="boolean"/>
+ <content type="boolean" default="1"/>
+ </parameter>
+
+ <parameter name="hardrecovery" reconfig="1">
+ <longdesc lang="en">
+ 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.
+ </longdesc>
+ <shortdesc lang="en">
+ Reboot if stop phase fails
+ </shortdesc>
+ <content type="boolean" default="0"/>
+ </parameter>
+
+ <parameter name="exclusive" reconfig="1">
+ <longdesc lang="en">
+ 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.
+ </longdesc>
+ <shortdesc lang="en">
+ Exclusive resource group
+ </shortdesc>
+ <content type="boolean" default="0"/>
</parameter>

<parameter name="recovery" reconfig="1">
@@ -143,7 +175,6 @@
<content type="string"/>
</parameter>

-
<parameter name="swapdisk_physical" unique="1">
<longdesc lang="en">
Swap disk for the virtual machine. (physical, on the host)
@@ -184,17 +215,28 @@
<content type="string" default="live"/>
</parameter>

- <parameter name="max_restarts">
+ <parameter name="depend">
+ <longdesc lang="en">
+ Top-level service this depends on, in "service:name" format.
+ </longdesc>
+ <shortdesc lang="en">
+ Service dependency; will not start without the specified
+ service running.
+ </shortdesc>
+ <content type="string"/>
+ </parameter>
+
+ <parameter name="max_restarts" reconfig="1">
<longdesc lang="en">
Maximum restarts for this service.
</longdesc>
<shortdesc lang="en">
Maximum restarts for this service.
</shortdesc>
- <content type="string"/>
+ <content type="string" default="0"/>
</parameter>

- <parameter name="restart_expire_time">
+ <parameter name="restart_expire_time" reconfig="1">
<longdesc lang="en">
Restart expiration time
</longdesc>
@@ -206,7 +248,7 @@
is exceeded in this given expiration time, the service
is relocated instead of restarted again.
</shortdesc>
- <content type="string"/>
+ <content type="string" default="0"/>
</parameter>

</parameters>
--- 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 @@
<content type="boolean" default="0"/>
</parameter>

- <parameter name="exclusive">
+ <parameter name="exclusive" reconfig="1">
<longdesc lang="en">
If set, this resource group will only relocate to
nodes which have no other resource groups running in the
@@ -162,7 +162,7 @@
<shortdesc lang="en">
Maximum restarts for this service.
</shortdesc>
- <content type="string"/>
+ <content type="string" default="0"/>
</parameter>

<parameter name="restart_expire_time">
@@ -177,7 +177,7 @@
is exceeded in this given expiration time, the service
is relocated instead of restarted again.
</shortdesc>
- <content type="string"/>
+ <content type="string" default="0"/>
</parameter>

</parameters>
--- 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 <lhh at redhat.com>
+ * 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 <lhh at redhat.com>
* include/reslist.h: Add restart counters to resource node structure
(intended for top-level resources, i.e. services, vms...)