[Cluster-devel] cluster/rgmanager ChangeLog src/resources/defa ...

[lhh at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL5
Changes by:	lhh at sourceware.org	2007-12-19 21:33:26

Modified files:
	rgmanager      : ChangeLog 
	rgmanager/src/resources: default_event_script.sl service.sh 
	                         vm.sh 

Log message:
	Allow soft dependencies when central_processing is enabled

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/ChangeLog.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.31.2.33&r2=1.31.2.34
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/default_event_script.sl.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.2.2&r2=1.1.2.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/service.sh.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.7.2.9&r2=1.7.2.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/vm.sh.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.2.10&r2=1.1.2.11

--- cluster/rgmanager/ChangeLog	2007/12/19 21:04:40	1.31.2.33
+++ cluster/rgmanager/ChangeLog	2007/12/19 21:33:25	1.31.2.34
@@ -1,6 +1,8 @@
 2007-12-19 Lon Hohberger <lhh at redhat.com>
 	* include/res-ocf.h: Fix typo
-	* src/daemons/restree.c: Export reference counts to resource agents
+	* src/daemons/restree.c: Export reference counts to resource agents.
+	Pull fix from head to ensure we don't do status checks if the interval
+	is 0.
 	* src/resources/clusterfs.sh: Use reference counts to ensure we
 	don't unmount a GFS file system if it's in use by multiple services
 	on the same node.  #254111
--- cluster/rgmanager/src/resources/default_event_script.sl	2007/12/18 17:52:56	1.1.2.2
+++ cluster/rgmanager/src/resources/default_event_script.sl	2007/12/19 21:33:26	1.1.2.3
@@ -139,6 +139,7 @@
 	variable services = service_list();
 	variable x;
 	variable depends;
+	variable depend_mode;
 	variable policy;
 	variable nodes;
 	variable tmp;
@@ -185,6 +186,7 @@
 		% Simplistic dependency handling
 		%
 		depends = service_property(services[x], "depend");
+		depend_mode = service_property(services[x], "depend_mode");
 
 		% No dependency; do nothing
 		if (depends != service_name) {
@@ -200,7 +202,8 @@
 		}
 
 		% service died - stop service(s) that depend on the dead
-		if ((service_owner < 0) and (owner >= 0)) {
+		if ((service_owner < 0) and (owner >= 0) and
+		    (depend_mode != "soft")) {
 			info("Dependency lost; stopping ", services[x]);
 			()=service_stop(services[x]);
 		}
--- cluster/rgmanager/src/resources/service.sh	2007/12/18 17:52:56	1.7.2.9
+++ cluster/rgmanager/src/resources/service.sh	2007/12/19 21:33:26	1.7.2.10
@@ -155,6 +155,21 @@
             <content type="string"/>
         </parameter>
 
+        <parameter name="depend_mode">
+            <longdesc lang="en">
+	    	Dependency mode
+            </longdesc>
+            <shortdesc lang="en">
+		Service dependency mode.
+		hard - This service is stopped/started if its dependency
+		       is stopped/started
+		soft - This service only depends on the other service for
+		       initial startip.  If the other service stops, this
+		       service is not stopped.
+            </shortdesc>
+            <content type="string" default="hard"/>
+        </parameter>
+
         <parameter name="max_restarts">
             <longdesc lang="en">
 	    	Maximum restarts for this service.
--- cluster/rgmanager/src/resources/vm.sh	2007/11/30 19:44:34	1.1.2.10
+++ cluster/rgmanager/src/resources/vm.sh	2007/12/19 21:33:26	1.1.2.11
@@ -226,6 +226,21 @@
             <content type="string"/>
         </parameter>
 
+        <parameter name="depend_mode">
+            <longdesc lang="en">
+	    	Dependency mode
+            </longdesc>
+            <shortdesc lang="en">
+		Service dependency mode.
+		hard - This service is stopped/started if its dependency
+		       is stopped/started
+		soft - This service only depends on the other service for
+		       initial startip.  If the other service stops, this
+		       service is not stopped.
+            </shortdesc>
+            <content type="string" default="hard"/>
+        </parameter>
+
         <parameter name="max_restarts" reconfig="1">
             <longdesc lang="en">
 	    	Maximum restarts for this service.