Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=6484b090d... Commit: 6484b090d44811c4d2d2f59f62444ab44346c200 Parent: 908fd921599b4e494028f3972a71c99c0aed674f Author: Ondrej Mular omular@redhat.com AuthorDate: Fri Nov 29 11:32:14 2013 -0500 Committer: Marek 'marx' Grac mgrac@redhat.com CommitterDate: Thu Dec 19 16:11:01 2013 +0100
fencing: new option --method
Add new option method --method for cycle reboot --- fence/agents/lib/fencing.py.py | 76 +++++++++++++++++++++++++++++---------- 1 files changed, 56 insertions(+), 20 deletions(-)
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py index 2b914f2..a570203 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 (onoff|cycle) (Default: onoff)", + "required" : "0", + "shortdesc" : "Method to fence (onoff|cycle) (Default: onoff)", + "default" : "onoff", + "choices" : [ "onoff", "cycle" ], + "order" : 1} }
# options which are added automatically if 'key' is encountered ("default" is always added) @@ -780,6 +789,23 @@ def set_multi_power_fn(tn, options, set_power_fn): else: set_power_fn(tn, options)
+def multi_reboot_cycle_fn(tn, options, reboot_cycle_fn): + success = False; + if options.has_key("--plugs"): + for plug in options["--plugs"]: + try: + options["--uuid"] = str(uuid.UUID(plug)) + except ValueError: + pass + except KeyError: + pass + options["--plug"] = plug + plug_status = reboot_cycle_fn(tn, options) + if plug_status: + success = plug_status + else: + success = reboot_cycle_fn(tn, options) + return success
def show_docs(options, docs = None): device_opt = options["device_opt"] @@ -804,7 +830,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 +889,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": 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 multi_reboot_cycle_fn(tn, options, reboot_cycle_fn): 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
cluster-commits@lists.fedorahosted.org