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

[lhh@sourceware.org <lhh@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	lhh at sourceware.org	2007-12-19 21:34:54

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&r1=1.67&r2=1.68
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/default_event_script.sl.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/service.sh.diff?cvsroot=cluster&r1=1.12&r2=1.13
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/vm.sh.diff?cvsroot=cluster&r1=1.8&r2=1.9

--- cluster/rgmanager/ChangeLog	2007/12/19 21:07:13	1.67
+++ cluster/rgmanager/ChangeLog	2007/12/19 21:34:54	1.68
@@ -4,6 +4,8 @@
 	* 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
+	* src/resources/service.sh, default_event_script.sl: Add support for
+	"soft" dependencies if central_processing is enabled
 
 2007-12-14 Lon Hohberger <lhh@redhat.com>
 	(Misc central_events fixes)
--- cluster/rgmanager/src/resources/default_event_script.sl	2007/12/12 21:41:32	1.2
+++ cluster/rgmanager/src/resources/default_event_script.sl	2007/12/19 21:34:54	1.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/11/30 20:06:55	1.12
+++ cluster/rgmanager/src/resources/service.sh	2007/12/19 21:34:54	1.13
@@ -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 20:06:55	1.8
+++ cluster/rgmanager/src/resources/vm.sh	2007/12/19 21:34:54	1.9
@@ -230,6 +230,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.