[Cluster-devel] [PATCH 1/4] fencing: new option --method

[Ondrej Mular <omular@redhat.com>]

Add new option method --method for cycle reboot

Checks input for invalid usage of cycle (method cycle and plug)

---
 fence/agents/lib/fencing.py.py | 62 ++++++++++++++++++++++++++++--------------
 1 file changed, 42 insertions(+), 20 deletions(-)

diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 2b914f2..ab14cb7 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -342,7 +342,16 @@ all_opt = {
 		"help" : "--use-sudo                     Use sudo (without password) when calling 3rd party software",
 		"required" : "0",
 		"shortdesc" : "Use sudo (without password) when calling 3rd party sotfware.",
-		"order" : 205}
+		"order" : 205},
+	"method" : {
+		"getopt" : "m:",
+		"longopt" : "method",
+		"help" : "-m, --method=[method]          Method to fence (offon|cycle) (Default: offon)",
+		"required" : "0",
+		"shortdesc" : "Method to fence (offon|cycle) (Default: offon)",
+		"default" : "offon",
+		"choices" : [ "offon", "cycle" ],
+		"order" : 1}
 }
 
 # options which are added automatically if 'key' is encountered ("default" is always added)
@@ -723,6 +732,9 @@ def check_input(device_opt, opt):
 		else:
 			options["--ipport"] = 23
 
+	if options.has_key("--plug") and options.has_key("--method") and options["--method"] == "cycle":
+		fail_usage("Failed: Cannot use --method cycle and --plug together")
+
 	for opt in device_opt:
 		if all_opt[opt].has_key("choices"):
 			long = "--" + all_opt[opt]["longopt"]
@@ -804,7 +816,7 @@ def show_docs(options, docs = None):
 		print __main__.REDHAT_COPYRIGHT
 		sys.exit(0)
 
-def fence_action(tn, options, set_power_fn, get_power_fn, get_outlet_list = None):
+def fence_action(tn, options, set_power_fn, get_power_fn, get_outlet_list = None, reboot_cycle_fn = None):
 	result = 0
 
 	try:
@@ -863,28 +875,38 @@ def fence_action(tn, options, set_power_fn, get_power_fn, get_outlet_list = None
 				else:
 					fail(EC_WAITING_OFF)
 		elif options["--action"] == "reboot":
-			if status != "off":
-				options["--action"] = "off"
-				set_multi_power_fn(tn, options, set_power_fn)
-				time.sleep(int(options["--power-wait"]))
-				if wait_power_status(tn, options, get_power_fn) == 0:
-					fail(EC_WAITING_OFF)
-			options["--action"] = "on"
-
 			power_on = False
-			try:
+			if options.has_key("--method") and options["--method"].lower() == "cycle" and reboot_cycle_fn is not None:
 				for _ in range(1, 1 + int(options["--retry-on"])):
-					set_multi_power_fn(tn, options, set_power_fn)
-					time.sleep(int(options["--power-wait"]))
-					if wait_power_status(tn, options, get_power_fn) == 1:
+					if reboot_cycle_fn(tn, options):
 						power_on = True
 						break
-			except Exception, ex:
-				# an error occured during power ON phase in reboot
-				# fence action was completed succesfully even in that case
-				sys.stderr.write(str(ex))
-				syslog.syslog(syslog.LOG_NOTICE, str(ex))
-				pass
+
+				if not power_on:
+					fail(EC_TIMED_OUT)
+
+			else:
+				if status != "off":
+					options["--action"] = "off"
+					set_multi_power_fn(tn, options, set_power_fn)
+					time.sleep(int(options["--power-wait"]))
+					if wait_power_status(tn, options, get_power_fn) == 0:
+						fail(EC_WAITING_OFF)
+				options["--action"] = "on"
+
+				try:
+					for _ in range(1, 1 + int(options["--retry-on"])):
+						set_multi_power_fn(tn, options, set_power_fn)
+						time.sleep(int(options["--power-wait"]))
+						if wait_power_status(tn, options, get_power_fn) == 1:
+							power_on = True
+							break
+				except Exception, ex:
+					# an error occured during power ON phase in reboot
+					# fence action was completed succesfully even in that case
+					sys.stderr.write(str(ex))
+					syslog.syslog(syslog.LOG_NOTICE, str(ex))
+					pass
 
 			if power_on == False:
 				# this should not fail as node was fenced succesfully
-- 
1.8.3.1