X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/66348f29ecbde0f159b04499b22ca5a6c8b61c59..cd098c41522469e462efeb1e157a8718ff7b7809:/scripts/gnt-cluster?ds=sidebyside diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster index 38763ab..3986dea 100755 --- a/scripts/gnt-cluster +++ b/scripts/gnt-cluster @@ -34,14 +34,19 @@ from ganeti import errors from ganeti import utils from ganeti import bootstrap from ganeti import ssh +from ganeti import objects +@UsesRPC def InitCluster(opts, args): """Initialize the cluster. - Args: - opts - class with options as members - args - list of arguments, expected to be [clustername] + @param opts: the command line options selected by the user + @type args: list + @param args: should contain only one element, the desired + cluster name + @rtype: int + @return: the desired exit code """ if not opts.lvm_storage and opts.vg_name: @@ -56,54 +61,37 @@ def InitCluster(opts, args): if hvlist is not None: hvlist = hvlist.split(",") else: - hvlist = [constants.DEFAULT_ENABLED_HYPERVISOR] + hvlist = [opts.default_hypervisor] # avoid an impossible situation - if opts.default_hypervisor in hvlist: - default_hypervisor = opts.default_hypervisor - else: - default_hypervisor = hvlist[0] - - hvparams = opts.hvparams - if hvparams: - # a list of (name, dict) we can pass directly to dict() - hvparams = dict(opts.hvparams) - else: - # otherwise init as empty dict - hvparams = {} + if opts.default_hypervisor not in hvlist: + ToStderr("The default hypervisor requested (%s) is not" + " within the enabled hypervisor list (%s)" % + (opts.default_hypervisor, hvlist)) + return 1 + hvparams = dict(opts.hvparams) beparams = opts.beparams - # check for invalid parameters - for parameter in beparams: - if parameter not in constants.BES_PARAMETERS: - ToStderr("Invalid backend parameter: %s" % parameter) - return 1 + nicparams = opts.nicparams # prepare beparams dict - for parameter in constants.BES_PARAMETERS: - if parameter not in beparams: - beparams[parameter] = constants.BEC_DEFAULTS[parameter] - - # type wrangling - try: - beparams[constants.BE_VCPUS] = int(beparams[constants.BE_VCPUS]) - except ValueError: - ToStderr("%s must be an integer" % constants.BE_VCPUS) - return 1 + beparams = objects.FillDict(constants.BEC_DEFAULTS, beparams) + utils.ForceDictType(beparams, constants.BES_PARAMETER_TYPES) - beparams[constants.BE_MEMORY] = utils.ParseUnit(beparams[constants.BE_MEMORY]) + # prepare nicparams dict + nicparams = objects.FillDict(constants.NICC_DEFAULTS, nicparams) + utils.ForceDictType(nicparams, constants.NICS_PARAMETER_TYPES) # prepare hvparams dict for hv in constants.HYPER_TYPES: if hv not in hvparams: hvparams[hv] = {} - for parameter in constants.HVC_DEFAULTS[hv]: - if parameter not in hvparams[hv]: - hvparams[hv][parameter] = constants.HVC_DEFAULTS[hv][parameter] + hvparams[hv] = objects.FillDict(constants.HVC_DEFAULTS[hv], hvparams[hv]) + utils.ForceDictType(hvparams[hv], constants.HVS_PARAMETER_TYPES) for hv in hvlist: if hv not in constants.HYPER_TYPES: - ToStderr("invalid hypervisor: %s" % hv) + ToStderr("invalid hypervisor: %s", hv) return 1 bootstrap.InitCluster(cluster_name=args[0], @@ -114,17 +102,25 @@ def InitCluster(opts, args): master_netdev=opts.master_netdev, file_storage_dir=opts.file_storage_dir, enabled_hypervisors=hvlist, - default_hypervisor=default_hypervisor, + default_hypervisor=opts.default_hypervisor, hvparams=hvparams, - beparams=beparams) + beparams=beparams, + nicparams=nicparams, + candidate_pool_size=opts.candidate_pool_size, + modify_etc_hosts=opts.modify_etc_hosts, + ) return 0 +@UsesRPC def DestroyCluster(opts, args): """Destroy the cluster. - Args: - opts - class with options as members + @param opts: the command line options selected by the user + @type args: list + @param args: should be an empty list + @rtype: int + @return: the desired exit code """ if not opts.yes_do_it: @@ -143,9 +139,11 @@ def DestroyCluster(opts, args): def RenameCluster(opts, args): """Rename the cluster. - Args: - opts - class with options as members, we use force only - args - list of arguments, expected to be [new_name] + @param opts: the command line options selected by the user + @type args: list + @param args: should contain only one element, the new cluster name + @rtype: int + @return: the desired exit code """ name = args[0] @@ -162,15 +160,33 @@ def RenameCluster(opts, args): return 0 +def RedistributeConfig(opts, args): + """Forces push of the cluster configuration. + + @param opts: the command line options selected by the user + @type args: list + @param args: empty list + @rtype: int + @return: the desired exit code + + """ + op = opcodes.OpRedistributeConfig() + SubmitOrSend(op, opts) + return 0 + + def ShowClusterVersion(opts, args): """Write version of ganeti software to the standard output. - Args: - opts - class with options as members + @param opts: the command line options selected by the user + @type args: list + @param args: should be an empty list + @rtype: int + @return: the desired exit code """ - op = opcodes.OpQueryClusterInfo() - result = SubmitOpCode(op) + cl = GetClient() + result = cl.QueryClusterInfo() ToStdout("Software version: %s", result["software_version"]) ToStdout("Internode protocol: %s", result["protocol_version"]) ToStdout("Configuration format: %s", result["config_version"]) @@ -182,20 +198,41 @@ def ShowClusterVersion(opts, args): def ShowClusterMaster(opts, args): """Write name of master node to the standard output. - Args: - opts - class with options as members + @param opts: the command line options selected by the user + @type args: list + @param args: should be an empty list + @rtype: int + @return: the desired exit code """ - ToStdout("%s", GetClient().QueryConfigValues(["master_node"])[0]) + master = bootstrap.GetMaster() + ToStdout(master) return 0 +def _PrintGroupedParams(paramsdict): + """Print Grouped parameters (be, nic, disk) by group. + + @type paramsdict: dict of dicts + @param paramsdict: {group: {param: value, ...}, ...} + + """ + for gr_name, gr_dict in paramsdict.items(): + ToStdout(" - %s:", gr_name) + for item, val in gr_dict.iteritems(): + ToStdout(" %s: %s", item, val) def ShowClusterConfig(opts, args): """Shows cluster information. + @param opts: the command line options selected by the user + @type args: list + @param args: should be an empty list + @rtype: int + @return: the desired exit code + """ - op = opcodes.OpQueryClusterInfo() - result = SubmitOpCode(op) + cl = GetClient() + result = cl.QueryClusterInfo() ToStdout("Cluster name: %s", result["name"]) @@ -208,16 +245,20 @@ def ShowClusterConfig(opts, args): ToStdout("Enabled hypervisors: %s", ", ".join(result["enabled_hypervisors"])) ToStdout("Hypervisor parameters:") - for hv_name, hv_dict in result["hvparams"].items(): - ToStdout(" - %s:", hv_name) - for item, val in hv_dict.iteritems(): - ToStdout(" %s: %s", item, val) + _PrintGroupedParams(result["hvparams"]) ToStdout("Cluster parameters:") - for gr_name, gr_dict in result["beparams"].items(): - ToStdout(" - %s:", gr_name) - for item, val in gr_dict.iteritems(): - ToStdout(" %s: %s", item, val) + ToStdout(" - candidate pool size: %s", result["candidate_pool_size"]) + ToStdout(" - master netdev: %s", result["master_netdev"]) + ToStdout(" - default bridge: %s", result["default_bridge"]) + ToStdout(" - lvm volume group: %s", result["volume_group_name"]) + ToStdout(" - file storage path: %s", result["file_storage_dir"]) + + ToStdout("Default instance parameters:") + _PrintGroupedParams(result["beparams"]) + + ToStdout("Default nic parameters:") + _PrintGroupedParams(result["nicparams"]) return 0 @@ -225,11 +266,12 @@ def ShowClusterConfig(opts, args): def ClusterCopyFile(opts, args): """Copy a file from master to some nodes. - Args: - opts - class with options as members - args - list containing a single element, the file name - Opts used: - nodes - list containing the name of target nodes; if empty, all nodes + @param opts: the command line options selected by the user + @type args: list + @param args: should contain only one element, the path of + the file to be copied + @rtype: int + @return: the desired exit code """ filename = args[0] @@ -242,8 +284,8 @@ def ClusterCopyFile(opts, args): cluster_name = cl.QueryConfigValues(["cluster_name"])[0] - op = opcodes.OpQueryNodes(output_fields=["name"], names=opts.nodes) - results = [row[0] for row in SubmitOpCode(op, cl=cl) if row[0] != myname] + results = GetOnlineNodes(nodes=opts.nodes, cl=cl) + results = [name for name in results if name != myname] srun = ssh.SshRunner(cluster_name=cluster_name) for node in results: @@ -256,18 +298,18 @@ def ClusterCopyFile(opts, args): def RunClusterCommand(opts, args): """Run a command on some nodes. - Args: - opts - class with options as members - args - the command list as a list - Opts used: - nodes: list containing the name of target nodes; if empty, all nodes + @param opts: the command line options selected by the user + @type args: list + @param args: should contain the command to be run and its arguments + @rtype: int + @return: the desired exit code """ cl = GetClient() command = " ".join(args) - op = opcodes.OpQueryNodes(output_fields=["name"], names=opts.nodes) - nodes = [row[0] for row in SubmitOpCode(op, cl=cl)] + + nodes = GetOnlineNodes(nodes=opts.nodes, cl=cl) cluster_name, master_node = cl.QueryConfigValues(["cluster_name", "master_node"]) @@ -292,8 +334,11 @@ def RunClusterCommand(opts, args): def VerifyCluster(opts, args): """Verify integrity of cluster, performing various test on nodes. - Args: - opts - class with options as members + @param opts: the command line options selected by the user + @type args: list + @param args: should be an empty list + @rtype: int + @return: the desired exit code """ skip_checks = [] @@ -309,8 +354,11 @@ def VerifyCluster(opts, args): def VerifyDisks(opts, args): """Verify integrity of cluster disks. - Args: - opts - class with options as members + @param opts: the command line options selected by the user + @type args: list + @param args: should be an empty list + @rtype: int + @return: the desired exit code """ op = opcodes.OpVerifyDisks() @@ -329,7 +377,7 @@ def VerifyDisks(opts, args): if nlvm: for node, text in nlvm.iteritems(): ToStdout("Error on node %s: LVM error: %s", - node, text[-400:].encode('string_escape')) + node, utils.SafeEncode(text[-400:])) retcode |= 1 ToStdout("You need to fix these nodes first before fixing instances") @@ -367,6 +415,7 @@ def VerifyDisks(opts, args): return retcode +@UsesRPC def MasterFailover(opts, args): """Failover the master node. @@ -374,6 +423,12 @@ def MasterFailover(opts, args): master to cease being master, and the non-master to become new master. + @param opts: the command line options selected by the user + @type args: list + @param args: should be an empty list + @rtype: int + @return: the desired exit code + """ return bootstrap.MasterFailover() @@ -381,6 +436,12 @@ def MasterFailover(opts, args): def SearchTags(opts, args): """Searches the tags on all the cluster. + @param opts: the command line options selected by the user + @type args: list + @param args: should contain only one element, the tag pattern + @rtype: int + @return: the desired exit code + """ op = opcodes.OpSearchTags(pattern=args[0]) result = SubmitOpCode(op) @@ -395,13 +456,17 @@ def SearchTags(opts, args): def SetClusterParams(opts, args): """Modify the cluster. - Args: - opts - class with options as members + @param opts: the command line options selected by the user + @type args: list + @param args: should be an empty list + @rtype: int + @return: the desired exit code """ if not (not opts.lvm_storage or opts.vg_name or opts.enabled_hypervisors or opts.hvparams or - opts.beparams): + opts.beparams or opts.nicparams or + opts.candidate_pool_size is not None): ToStderr("Please give at least one of the parameters.") return 1 @@ -409,22 +474,30 @@ def SetClusterParams(opts, args): if not opts.lvm_storage and opts.vg_name: ToStdout("Options --no-lvm-storage and --vg-name conflict.") return 1 + elif not opts.lvm_storage: + vg_name = '' hvlist = opts.enabled_hypervisors if hvlist is not None: hvlist = hvlist.split(",") - hvparams = opts.hvparams - if hvparams: - # a list of (name, dict) we can pass directly to dict() - hvparams = dict(opts.hvparams) + # a list of (name, dict) we can pass directly to dict() (or []) + hvparams = dict(opts.hvparams) + for hv, hv_params in hvparams.iteritems(): + utils.ForceDictType(hv_params, constants.HVS_PARAMETER_TYPES) beparams = opts.beparams + utils.ForceDictType(beparams, constants.BES_PARAMETER_TYPES) + + nicparams = opts.nicparams + utils.ForceDictType(nicparams, constants.NICS_PARAMETER_TYPES) - op = opcodes.OpSetClusterParams(vg_name=opts.vg_name, + op = opcodes.OpSetClusterParams(vg_name=vg_name, enabled_hypervisors=hvlist, hvparams=hvparams, - beparams=beparams) + beparams=beparams, + nicparams=nicparams, + candidate_pool_size=opts.candidate_pool_size) SubmitOpCode(op) return 0 @@ -432,6 +505,12 @@ def SetClusterParams(opts, args): def QueueOps(opts, args): """Queue operations. + @param opts: the command line options selected by the user + @type args: list + @param args: should contain only one element, the subcommand + @rtype: int + @return: the desired exit code + """ command = args[0] client = GetClient() @@ -445,6 +524,9 @@ def QueueOps(opts, args): else: val = "unset" ToStdout("The drain flag is %s" % val) + else: + raise errors.OpPrereqError("Command '%s' is not valid." % command) + return 0 # this is an option common to more than one command, so we declare @@ -466,7 +548,7 @@ commands = { help="Specify the mac prefix for the instance IP" " addresses, in the format XX:XX:XX", metavar="PREFIX", - default="aa:00:00",), + default=constants.DEFAULT_MAC_PREFIX,), make_option("-g", "--vg-name", dest="vg_name", help="Specify the volume group name " " (cluster-wide) for disk allocation [xenvg]", @@ -494,6 +576,10 @@ commands = { help="No support for lvm based instances" " (cluster-wide)", action="store_false", default=True,), + make_option("--no-etc-hosts", dest="modify_etc_hosts", + help="Don't modify /etc/hosts" + " (cluster-wide)", + action="store_false", default=True,), make_option("--enabled-hypervisors", dest="enabled_hypervisors", help="Comma-separated list of hypervisors", type="string", default=None), @@ -512,6 +598,13 @@ commands = { keyval_option("-B", "--backend-parameters", dest="beparams", type="keyval", default={}, help="Backend parameters"), + keyval_option("-N", "--nic-parameters", dest="nicparams", + type="keyval", default={}, + help="NIC parameters"), + make_option("-C", "--candidate-pool-size", + default=constants.MASTER_POOL_SIZE_DEFAULT, + help="Set the candidate pool size", + dest="candidate_pool_size", type="int"), ], "[opts...] ", "Initialises a new cluster configuration"), @@ -525,6 +618,10 @@ commands = { 'rename': (RenameCluster, ARGS_ONE, [DEBUG_OPT, FORCE_OPT], "", "Renames the cluster"), + 'redist-conf': (RedistributeConfig, ARGS_NONE, [DEBUG_OPT, SUBMIT_OPT], + "", + "Forces a push of the configuration file and ssconf files" + " to the nodes in the cluster"), 'verify': (VerifyCluster, ARGS_NONE, [DEBUG_OPT, make_option("--no-nplus1-mem", dest="skip_nplusone_mem", help="Skip N+1 memory redundancy tests", @@ -583,6 +680,12 @@ commands = { keyval_option("-B", "--backend-parameters", dest="beparams", type="keyval", default={}, help="Backend parameters"), + keyval_option("-N", "--nic-parameters", dest="nicparams", + type="keyval", default={}, + help="NIC parameters"), + make_option("-C", "--candidate-pool-size", default=None, + help="Set the candidate pool size", + dest="candidate_pool_size", type="int"), ], "[opts...]", "Alters the parameters of the cluster"),