"dtotal": "DTotal", "dfree": "DFree",
"mtotal": "MTotal", "mnode": "MNode", "mfree": "MFree",
"bootid": "BootID",
- "ctotal": "CTotal",
+ "ctotal": "CTotal", "cnodes": "CNodes", "csockets": "CSockets",
"tags": "Tags",
"serial_no": "SerialNo",
"master_candidate": "MasterC",
"master": "IsMaster",
- "offline": "Offline",
+ "offline": "Offline", "drained": "Drained",
}
cl = GetClient()
dns_data = utils.HostInfo(args[0])
node = dns_data.name
-
- if not opts.readd:
- try:
- output = cl.QueryNodes(names=[node], fields=['name'], use_locking=True)
- except (errors.OpPrereqError, errors.OpExecError):
- pass
- else:
+ readd = opts.readd
+
+ try:
+ output = cl.QueryNodes(names=[node], fields=['name', 'sip'],
+ use_locking=False)
+ node_exists, sip = output[0]
+ except (errors.OpPrereqError, errors.OpExecError):
+ node_exists = ""
+ sip = None
+
+ if readd:
+ if not node_exists:
+ ToStderr("Node %s not in the cluster"
+ " - please retry without '--readd'", node)
+ return 1
+ else:
+ if node_exists:
ToStderr("Node %s already in the cluster (as %s)"
- " - please use --readd", args[0], output[0][0])
+ " - please retry with '--readd'", node, node_exists)
return 1
+ sip = opts.secondary_ip
# read the cluster name from the master
output = cl.QueryConfigValues(['cluster_name'])
cluster_name = output[0]
- ToStderr("-- WARNING -- \n"
- "Performing this operation is going to replace the ssh daemon"
- " keypair\n"
- "on the target machine (%s) with the ones of the"
- " current one\n"
- "and grant full intra-cluster ssh root access to/from it\n", node)
+ if readd:
+ # clear the offline and drain flags on the node
+ ToStdout("Resetting the 'offline' and 'drained' flags due to re-add")
+ op = opcodes.OpSetNodeParams(node_name=node, force=True,
+ offline=False, drained=False)
+
+ result = SubmitOpCode(op, cl=cl)
+ if result:
+ ToStdout("Modified:")
+ for param, data in result:
+ ToStdout(" - %-5s -> %s", param, data)
+ else:
+ ToStderr("-- WARNING -- \n"
+ "Performing this operation is going to replace the ssh daemon"
+ " keypair\n"
+ "on the target machine (%s) with the ones of the"
+ " current one\n"
+ "and grant full intra-cluster ssh root access to/from it\n", node)
bootstrap.SetupNodeDaemon(cluster_name, node, opts.ssh_key_check)
- op = opcodes.OpAddNode(node_name=args[0], secondary_ip=opts.secondary_ip,
+ op = opcodes.OpAddNode(node_name=args[0], secondary_ip=sip,
readd=opts.readd)
SubmitOpCode(op)
else:
selected_fields = opts.output.split(",")
- output = GetClient().QueryNodes([], selected_fields, opts.do_locking)
+ output = GetClient().QueryNodes(args, selected_fields, opts.do_locking)
if not opts.no_headers:
headers = _LIST_HEADERS
val = row[idx]
if field in list_type_fields:
val = ",".join(val)
- elif field in ('master', 'master_candidate', 'offline'):
+ elif field in ('master', 'master_candidate', 'offline', 'drained'):
if val:
val = 'Y'
else:
src_node = args[0]
result = cl.QueryNodes(names=[src_node], fields=selected_fields,
- use_locking=True)
+ use_locking=False)
src_node, sinst = result[0]
if not sinst:
return constants.EXIT_SUCCESS
if dst_node is not None:
- result = cl.QueryNodes(names=[dst_node], fields=["name"], use_locking=True)
+ result = cl.QueryNodes(names=[dst_node], fields=["name"],
+ use_locking=False)
dst_node = result[0][0]
if src_node == dst_node:
# these fields are static data anyway, so it doesn't matter, but
# locking=True should be safer
result = cl.QueryNodes(names=args, fields=selected_fields,
- use_locking=True)
+ use_locking=False)
node, pinst = result[0]
if not pinst:
force = opts.force
selected_fields = ["name", "pinst_list"]
- result = cl.QueryNodes(names=args, fields=selected_fields, use_locking=True)
+ result = cl.QueryNodes(names=args, fields=selected_fields, use_locking=False)
node, pinst = result[0]
if not pinst:
"""
cl = GetClient()
result = cl.QueryNodes(fields=["name", "pip", "sip",
- "pinst_list", "sinst_list"],
- names=args, use_locking=True)
+ "pinst_list", "sinst_list",
+ "master_candidate", "drained", "offline"],
+ names=args, use_locking=False)
- for name, primary_ip, secondary_ip, pinst, sinst in result:
+ for (name, primary_ip, secondary_ip, pinst, sinst,
+ is_mc, drained, offline) in result:
ToStdout("Node name: %s", name)
ToStdout(" primary ip: %s", primary_ip)
ToStdout(" secondary ip: %s", secondary_ip)
+ ToStdout(" master candidate: %s", is_mc)
+ ToStdout(" drained: %s", drained)
+ ToStdout(" offline: %s", offline)
if pinst:
ToStdout(" primary for instances:")
- for iname in pinst:
+ for iname in utils.NiceSort(pinst):
ToStdout(" - %s", iname)
else:
ToStdout(" primary for no instances")
if sinst:
ToStdout(" secondary for instances:")
- for iname in sinst:
+ for iname in utils.NiceSort(sinst):
ToStdout(" - %s", iname)
else:
ToStdout(" secondary for no instances")
return 0
+def PowercycleNode(opts, args):
+ """Remove a node from the cluster.
+
+ @param opts: the command line options selected by the user
+ @type args: list
+ @param args: should contain only one element, the name of
+ the node to be removed
+ @rtype: int
+ @return: the desired exit code
+
+ """
+ node = args[0]
+ if (not opts.confirm and
+ not AskUser("Are you sure you want to hard powercycle node %s?" % node)):
+ return 2
+
+ op = opcodes.OpPowercycleNode(node_name=node, force=opts.force)
+ result = SubmitOpCode(op)
+ ToStderr(result)
+ return 0
+
+
def ListVolumes(opts, args):
"""List logical volumes on node(s).
@return: the desired exit code
"""
- if opts.master_candidate is None and opts.offline is None:
+ if [opts.master_candidate, opts.drained, opts.offline].count(None) == 3:
ToStderr("Please give at least one of the parameters.")
return 1
offline = opts.offline == 'yes'
else:
offline = None
+
+ if opts.drained is not None:
+ drained = opts.drained == 'yes'
+ else:
+ drained = None
op = opcodes.OpSetNodeParams(node_name=args[0],
master_candidate=candidate,
offline=offline,
+ drained=drained,
force=opts.force)
# even if here we process the result, we allow submit only
make_option("-n", "--new-secondary", dest="dst_node",
help="New secondary node", metavar="NODE",
default=None),
- make_option("-i", "--iallocator", metavar="<NAME>",
+ make_option("-I", "--iallocator", metavar="<NAME>",
help="Select new secondary for the instance"
" automatically using the"
" <NAME> iallocator plugin",
default=None, type="string"),
],
- "[-f] {-i <iallocator> | -n <dst>} <node>",
+ "[-f] {-I <iallocator> | -n <dst>} <node>",
"Relocate the secondary instances from a node"
" to other nodes (only for instances with drbd disk template)"),
'failover': (FailoverNode, ARGS_ONE,
" (only for instances of type drbd)"),
'info': (ShowNodeConfig, ARGS_ANY, [DEBUG_OPT],
"[<node_name>...]", "Show information about the node(s)"),
- 'list': (ListNodes, ARGS_NONE,
- [DEBUG_OPT, NOHDR_OPT, SEP_OPT, USEUNITS_OPT, FIELDS_OPT,
- SUBMIT_OPT, SYNC_OPT],
- "", "Lists the nodes in the cluster. The available fields"
+ 'list': (ListNodes, ARGS_ANY,
+ [DEBUG_OPT, NOHDR_OPT, SEP_OPT, USEUNITS_OPT, FIELDS_OPT, SYNC_OPT],
+ "[nodes...]",
+ "Lists the nodes in the cluster. The available fields"
" are (see the man page for details): %s"
" The default field list is (in order): %s." %
(", ".join(_LIST_HEADERS), ", ".join(_LIST_DEF_FIELDS))),
SUBMIT_OPT,
make_option("-C", "--master-candidate", dest="master_candidate",
choices=('yes', 'no'), default=None,
+ metavar="yes|no",
help="Set the master_candidate flag on the node"),
- make_option("-O", "--offline", dest="offline",
+
+ make_option("-O", "--offline", dest="offline", metavar="yes|no",
choices=('yes', 'no'), default=None,
help="Set the offline flag on the node"),
+ make_option("-D", "--drained", dest="drained", metavar="yes|no",
+ choices=('yes', 'no'), default=None,
+ help="Set the drained flag on the node"),
],
"<instance>", "Alters the parameters of an instance"),
+ 'powercycle': (PowercycleNode, ARGS_ONE, [DEBUG_OPT, FORCE_OPT, CONFIRM_OPT],
+ "<node_name>", "Tries to forcefully powercycle a node"),
'remove': (RemoveNode, ARGS_ONE, [DEBUG_OPT],
"<node_name>", "Removes a node from the cluster"),
'volumes': (ListVolumes, ARGS_ANY,
projects / ganeti-local / blobdiff