fence-agents: master - fencing: Method to cause one node to delay fencing

Marek Grác marx at fedoraproject.org
Wed Jul 28 12:51:50 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commitdiff;h=5bff4d9b9fd523a20884ba068c89f7e957dfcc9b
Commit:        5bff4d9b9fd523a20884ba068c89f7e957dfcc9b
Parent:        0836ec51f4a916748f4dce0ba39ce0a7d56264b6
Author:        Marek 'marx' Grac <mgrac at redhat.com>
AuthorDate:    Wed Jul 28 14:49:36 2010 +0200
Committer:     Marek 'marx' Grac <mgrac at redhat.com>
CommitterDate: Wed Jul 28 14:49:36 2010 +0200

fencing: Method to cause one node to delay fencing

Resolves: rhbz#614046
---
 fence/agents/lib/fencing.py.py |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 6646eb9..bc4e60e 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -63,6 +63,12 @@ all_opt = {
 		"required" : "0",
 		"shortdesc" : "Write debug information to given file",
 		"order" : 52 },
+	"delay" : {
+		"getopt" : "f:",
+		"longopt" : "delay",
+		"help" : "--delay <seconds>              Wait X seconds before fencing is started",
+		"default" : "0",
+		"order" : 200 },
 	"agent"   : {
 		"getopt" : "",
 		"help" : "",
@@ -354,10 +360,10 @@ all_opt = {
 		"longopt" : "retry-on",
 		"help" : "--retry-on <attempts>          Count of attempts to retry power on",
 		"default" : "1",
-		"order" : 200 }
+		"order" : 201 }
 }
 
-common_opt = [ "retry_on" ]
+common_opt = [ "retry_on", "delay" ]
 
 class fspawn(pexpect.spawn):
 	def log_expect(self, options, pattern, timeout):
@@ -581,7 +587,7 @@ def check_input(device_opt, opt):
 	##
 	## Add options which are available for every fence agent
 	#####
-	device_opt.extend(common_opt)
+	device_opt.extend([x for x in common_opt if device_opt.count(x) == 0])
 	
 	options = dict(opt)
 	options["device_opt"] = device_opt
@@ -723,6 +729,8 @@ def fence_action(tn, options, set_power_fn, get_power_fn, get_outlet_list = None
 				print o + options["-C"] + alias	
 		return
 
+	if options["-o"] in ["off", "reboot"]:
+		time.sleep(int(options["-f"]))
 	status = get_power_fn(tn, options)
 
 	if status != "on" and status != "off":  


More information about the cluster-commits mailing list