cluster-devel.redhat.com archive mirror
 help / color / mirror / Atom feed
* [Cluster-devel] cluster/fence/init.d fenced
@ 2007-01-05 16:43 rohara
  0 siblings, 0 replies; 4+ messages in thread
From: rohara @ 2007-01-05 16:43 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	STABLE
Changes by:	rohara at sourceware.org	2007-01-05 16:43:20

Modified files:
	fence/init.d   : fenced 

Log message:
	Add timeout (default 120 seconds) to 'fence_tool leave'. If the cluster is
	not quorate, fenced (fence_tool actually) will wait 120 seconds before it
	gives up.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/init.d/fenced.diff?cvsroot=cluster&only_with_tag=STABLE&r1=1.1.2.2.4.1.2.2&r2=1.1.2.2.4.1.2.3

--- cluster/fence/init.d/Attic/fenced	2006/01/23 19:24:10	1.1.2.2.4.1.2.2
+++ cluster/fence/init.d/Attic/fenced	2007/01/05 16:43:20	1.1.2.2.4.1.2.3
@@ -20,6 +20,13 @@
 #     wait indefinately for fenced to start.
 FENCED_START_TIMEOUT=120
 
+# FENCED_STOP_TIMEOUT -- amount of time to wait for stopping fenced
+#     before giving up.  If FENCED_STOP_TIMEOUT is positive, then we will
+#     wait FENCED_STOP_TIMEOUT seconds before giving up and failing when
+#     fenced does not stop.  If FENCED_STOP_TIMEOUT is zero, then
+#     wait indefinately for fenced to stop.
+FENCED_STOP_TIMEOUT=120
+
 start()
 {
 	echo -n "Starting fence domain:"
@@ -76,9 +83,9 @@
 
 	if pidof fenced &> /dev/null
 	then
-		fence_tool leave > /dev/null 2>&1
+		fence_tool -t $FENCED_STOP_TIMEOUT leave > /dev/null 2>&1
 		rtrn=$?
-	
+
 		if [ $rtrn -eq 0 ]
 		then
 			success "shutdown"



^ permalink raw reply	[flat|nested] 4+ messages in thread
* [Cluster-devel] cluster/fence/init.d fenced
@ 2007-08-24 20:35 rmccabe
  0 siblings, 0 replies; 4+ messages in thread
From: rmccabe @ 2007-08-24 20:35 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	rmccabe at sourceware.org	2007-08-24 20:35:22

Modified files:
	fence/init.d   : fenced 

Log message:
	'service fenced status' always returns failure (1) even if it is running. fix.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/init.d/fenced.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.1.2.10&r2=1.1.2.11

--- cluster/fence/init.d/Attic/fenced	2007/01/05 16:30:25	1.1.2.10
+++ cluster/fence/init.d/Attic/fenced	2007/08/24 20:35:22	1.1.2.11
@@ -128,7 +128,7 @@
 
   status)
 	status fenced
-	rtrn=1
+	rtrn=$?
 	;;
 
   *)



^ permalink raw reply	[flat|nested] 4+ messages in thread
* [Cluster-devel] cluster/fence/init.d fenced
@ 2007-01-05 16:30 rohara
  0 siblings, 0 replies; 4+ messages in thread
From: rohara @ 2007-01-05 16:30 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	rohara at sourceware.org	2007-01-05 16:30:25

Modified files:
	fence/init.d   : fenced 

Log message:
	Add timeout (default 120 seconds) to 'fence_tool leave'. If the cluster is
	not quorate, fenced (fence_tool actually) will wait 120 seconds before it
	gives up.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/init.d/fenced.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.1.2.9&r2=1.1.2.10

--- cluster/fence/init.d/Attic/fenced	2006/12/20 18:36:11	1.1.2.9
+++ cluster/fence/init.d/Attic/fenced	2007/01/05 16:30:25	1.1.2.10
@@ -15,6 +15,13 @@
 #     wait indefinately for fenced to start.
 FENCED_START_TIMEOUT=120
 
+# FENCED_STOP_TIMEOUT -- amount of time to wait for stopping fenced
+#     before giving up.  If FENCED_STOP_TIMEOUT is positive, then we will
+#     wait FENCED_STOP_TIMEOUT seconds before giving up and failing when
+#     fenced does not stop.  If FENCED_STOP_TIMEOUT is zero, then
+#     wait indefinately for fenced to stop.
+FENCED_STOP_TIMEOUT=120
+
 . /etc/init.d/functions
 [ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster
 
@@ -76,9 +83,9 @@
 
 	if pidof fenced &> /dev/null
 	then
-		fence_tool leave > /dev/null 2>&1
+		fence_tool -t $FENCED_STOP_TIMEOUT leave > /dev/null 2>&1
 		rtrn=$?
-	
+
 		if [ $rtrn -eq 0 ]
 		then
 			success "shutdown"



^ permalink raw reply	[flat|nested] 4+ messages in thread
* [Cluster-devel] cluster/fence/init.d fenced
@ 2006-08-09 20:05 jparsons
  0 siblings, 0 replies; 4+ messages in thread
From: jparsons @ 2006-08-09 20:05 UTC (permalink / raw)
  To: cluster-devel.redhat.com

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL4
Changes by:	jparsons at sourceware.org	2006-08-09 20:05:55

Modified files:
	fence/init.d   : fenced 

Log message:
	addresses bz191899

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/fence/init.d/fenced.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.1.2.7&r2=1.1.2.8

--- cluster/fence/init.d/Attic/fenced	2006/01/09 20:36:54	1.1.2.7
+++ cluster/fence/init.d/Attic/fenced	2006/08/09 20:05:54	1.1.2.8
@@ -8,11 +8,6 @@
 # Provides: 
 ### END INIT INFO
 
-. /etc/init.d/functions
-[ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster
-
-LOCK_FILE="/var/lock/subsys/fenced"
-
 # FENCED_START_TIMEOUT -- amount of time to wait for starting fenced
 #     before giving up.  If FENCED_START_TIMEOUT is positive, then we will
 #     wait FENCED_START_TIMEOUT seconds before giving up and failing when
@@ -20,6 +15,12 @@
 #     wait indefinately for fenced to start.
 FENCED_START_TIMEOUT=120
 
+. /etc/init.d/functions
+[ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster
+
+LOCK_FILE="/var/lock/subsys/fenced"
+
+
 start()
 {
 	echo -n "Starting fence domain:"



^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2007-08-24 20:35 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-01-05 16:43 [Cluster-devel] cluster/fence/init.d fenced rohara
  -- strict thread matches above, loose matches on Subject: below --
2007-08-24 20:35 rmccabe
2007-01-05 16:30 rohara
2006-08-09 20:05 jparsons

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).