X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/60d497235042759bb618f3d3eff58f71d5e528aa..a237d0a89f861e284cd64c7eff3df1ef957a0dcc:/lib/cli.py?ds=sidebyside diff --git a/lib/cli.py b/lib/cli.py index 62fa111..1f89be3 100644 --- a/lib/cli.py +++ b/lib/cli.py @@ -26,6 +26,7 @@ import sys import textwrap import os.path import copy +import time from cStringIO import StringIO from ganeti import utils @@ -34,11 +35,13 @@ from ganeti import errors from ganeti import mcpu from ganeti import constants from ganeti import opcodes +from ganeti import luxi from optparse import (OptionParser, make_option, TitledHelpFormatter, Option, OptionValueError, SUPPRESS_HELP) -__all__ = ["DEBUG_OPT", "NOHDR_OPT", "SEP_OPT", "GenericMain", "SubmitOpCode", +__all__ = ["DEBUG_OPT", "NOHDR_OPT", "SEP_OPT", "GenericMain", + "SubmitOpCode", "GetClient", "cli_option", "GenerateTable", "AskUser", "ARGS_NONE", "ARGS_FIXED", "ARGS_ATLEAST", "ARGS_ANY", "ARGS_ONE", "USEUNITS_OPT", "FIELDS_OPT", "FORCE_OPT", @@ -167,15 +170,13 @@ USEUNITS_OPT = make_option("--human-readable", default=False, help="Print sizes in human readable format") FIELDS_OPT = make_option("-o", "--output", dest="output", action="store", - type="string", help="Select output fields", + type="string", help="Comma separated list of" + " output fields", metavar="FIELDS") FORCE_OPT = make_option("-f", "--force", dest="force", action="store_true", default=False, help="Force the operation") -_LOCK_OPT = make_option("--lock-retries", default=None, - type="int", help=SUPPRESS_HELP) - TAG_SRC_OPT = make_option("--from", dest="tags_source", default=None, help="File with tag names") @@ -218,7 +219,7 @@ class CliOption(Option): cli_option = CliOption -def _ParseArgs(argv, commands): +def _ParseArgs(argv, commands, aliases): """Parses the command line and return the function which must be executed together with its arguments @@ -227,6 +228,7 @@ def _ParseArgs(argv, commands): commands: dictionary with special contents, see the design doc for cmdline handling + aliases: dictionary with command aliases {'alias': 'target, ...} """ if len(argv) == 0: @@ -240,7 +242,8 @@ def _ParseArgs(argv, commands): # argument. optparse.py does it the same. sys.exit(0) - if len(argv) < 2 or argv[1] not in commands.keys(): + if len(argv) < 2 or not (argv[1] in commands or + argv[1] in aliases): # let's do a nice thing sortedcmds = commands.keys() sortedcmds.sort() @@ -248,23 +251,34 @@ def _ParseArgs(argv, commands): "\n%(bin)s --help to see details, or" " man %(bin)s\n" % {"bin": binary}) # compute the max line length for cmd + usage - mlen = max([len(" %s %s" % (cmd, commands[cmd][3])) for cmd in commands]) + mlen = max([len(" %s" % cmd) for cmd in commands]) mlen = min(60, mlen) # should not get here... # and format a nice command list print "Commands:" for cmd in sortedcmds: - cmdstr = " %s %s" % (cmd, commands[cmd][3]) + cmdstr = " %s" % (cmd,) help_text = commands[cmd][4] help_lines = textwrap.wrap(help_text, 79-3-mlen) - print "%-*s - %s" % (mlen, cmdstr, - help_lines.pop(0)) + print "%-*s - %s" % (mlen, cmdstr, help_lines.pop(0)) for line in help_lines: print "%-*s %s" % (mlen, "", line) print return None, None, None + + # get command, unalias it, and look it up in commands cmd = argv.pop(1) + if cmd in aliases: + if cmd in commands: + raise errors.ProgrammerError("Alias '%s' overrides an existing" + " command" % cmd) + + if aliases[cmd] not in commands: + raise errors.ProgrammerError("Alias '%s' maps to non-existing" + " command '%s'" % (cmd, aliases[cmd])) + + cmd = aliases[cmd] + func, nargs, parser_opts, usage, description = commands[cmd] - parser_opts.append(_LOCK_OPT) parser = OptionParser(option_list=parser_opts, description=description, formatter=TitledHelpFormatter(), @@ -356,18 +370,44 @@ def AskUser(text, choices=None): def SubmitOpCode(op, proc=None, feedback_fn=None): - """Function to submit an opcode. + """Legacy function to submit an opcode. This is just a simple wrapper over the construction of the processor instance. It should be extended to better handle feedback and interaction functions. """ - if feedback_fn is None: - feedback_fn = logger.ToStdout - if proc is None: - proc = mcpu.Processor(feedback=feedback_fn) - return proc.ExecOpCode(op) + # TODO: Fix feedback_fn situation. + cl = luxi.Client() + + job_id = cl.SubmitJob([op]) + + while True: + jobs = cl.QueryJobs([job_id], ["status"]) + if not jobs: + # job not found, go away! + raise errors.JobLost("Job with id %s lost" % job_id) + + # TODO: Handle canceled and archived jobs + status = jobs[0][0] + if status in (constants.JOB_STATUS_SUCCESS, constants.JOB_STATUS_ERROR): + break + time.sleep(1) + + jobs = cl.QueryJobs([job_id], ["status", "opresult"]) + if not jobs: + raise errors.JobLost("Job with id %s lost" % job_id) + + status, result = jobs[0] + if status == constants.JOB_STATUS_SUCCESS: + return result[0] + else: + raise errors.OpExecError(result) + + +def GetClient(): + # TODO: Cache object? + return luxi.Client() def FormatError(err): @@ -415,12 +455,21 @@ def FormatError(err): obuf.write("Failure: invalid tag(s) given:\n%s" % msg) elif isinstance(err, errors.GenericError): obuf.write("Unhandled Ganeti error: %s" % msg) + elif isinstance(err, luxi.NoMasterError): + obuf.write("Cannot communicate with the master daemon.\nIs it running" + " and listening on '%s'?" % err.args[0]) + elif isinstance(err, luxi.TimeoutError): + obuf.write("Timeout while talking to the master daemon. Error:\n" + "%s" % msg) + elif isinstance(err, luxi.ProtocolError): + obuf.write("Unhandled protocol error while talking to the master daemon:\n" + "%s" % msg) else: obuf.write("Unhandled exception: %s" % msg) return retcode, obuf.getvalue().rstrip('\n') -def GenericMain(commands, override=None): +def GenericMain(commands, override=None, aliases=None): """Generic main function for all the gnt-* commands. Arguments: @@ -429,6 +478,7 @@ def GenericMain(commands, override=None): - override: if not None, we expect a dictionary with keys that will override command line options; this can be used to pass options from the scripts to generic functions + - aliases: dictionary with command aliases {'alias': 'target, ...} """ # save the program name and the entire command line for later logging @@ -443,7 +493,10 @@ def GenericMain(commands, override=None): binary = "" old_cmdline = "" - func, options, args = _ParseArgs(sys.argv, commands) + if aliases is None: + aliases = {} + + func, options, args = _ParseArgs(sys.argv, commands, aliases) if func is None: # parse error return 1 @@ -451,13 +504,9 @@ def GenericMain(commands, override=None): for key, val in override.iteritems(): setattr(options, key, val) - logger.SetupLogging(debug=options.debug, program=binary) + logger.SetupLogging(program=binary, debug=options.debug) - try: - utils.Lock('cmd', max_retries=options.lock_retries, debug=options.debug) - except errors.LockError, err: - logger.ToStderr(str(err)) - return 1 + utils.debug = options.debug if old_cmdline: logger.Info("run with arguments '%s'" % old_cmdline) @@ -465,14 +514,10 @@ def GenericMain(commands, override=None): logger.Info("run with no arguments") try: - try: - result = func(options, args) - except errors.GenericError, err: - result, err_msg = FormatError(err) - logger.ToStderr(err_msg) - finally: - utils.Unlock('cmd') - utils.LockCleanup() + result = func(options, args) + except (errors.GenericError, luxi.ProtocolError), err: + result, err_msg = FormatError(err) + logger.ToStderr(err_msg) return result