X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/a0c3fea1f56906ee5c21e09b44a4ff178f3dfd16..153d9724f6045a7f08d1e64352ff68993408fa01:/lib/cmdlib.py diff --git a/lib/cmdlib.py b/lib/cmdlib.py index 8f5216f..04612d7 100644 --- a/lib/cmdlib.py +++ b/lib/cmdlib.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +# # # Copyright (C) 2006, 2007 Google Inc. @@ -77,17 +77,17 @@ class LogicalUnit(object): for attr_name in self._OP_REQP: attr_val = getattr(op, attr_name, None) if attr_val is None: - raise errors.OpPrereqError, ("Required parameter '%s' missing" % - attr_name) + raise errors.OpPrereqError("Required parameter '%s' missing" % + attr_name) if self.REQ_CLUSTER: if not cfg.IsCluster(): - raise errors.OpPrereqError, ("Cluster not initialized yet," - " use 'gnt-cluster init' first.") + raise errors.OpPrereqError("Cluster not initialized yet," + " use 'gnt-cluster init' first.") if self.REQ_MASTER: master = sstore.GetMasterNode() - if master != socket.gethostname(): - raise errors.OpPrereqError, ("Commands must be run on the master" - " node %s" % master) + if master != utils.HostInfo().name: + raise errors.OpPrereqError("Commands must be run on the master" + " node %s" % master) def CheckPrereq(self): """Check prerequisites for this LU. @@ -161,31 +161,55 @@ class NoHooksLU(LogicalUnit): This is a no-op, since we don't run hooks. """ - return + return {}, [], [] def _GetWantedNodes(lu, nodes): - """Returns list of checked and expanded nodes. + """Returns list of checked and expanded node names. Args: nodes: List of nodes (strings) or None for all """ - if nodes is not None and not isinstance(nodes, list): - raise errors.OpPrereqError, "Invalid argument type 'nodes'" + if not isinstance(nodes, list): + raise errors.OpPrereqError("Invalid argument type 'nodes'") if nodes: - wanted_nodes = [] + wanted = [] for name in nodes: - node = lu.cfg.GetNodeInfo(lu.cfg.ExpandNodeName(name)) + node = lu.cfg.ExpandNodeName(name) if node is None: - raise errors.OpPrereqError, ("No such node name '%s'" % name) - wanted_nodes.append(node) + raise errors.OpPrereqError("No such node name '%s'" % name) + wanted.append(node) - return wanted_nodes else: - return [lu.cfg.GetNodeInfo(name) for name in lu.cfg.GetNodeList()] + wanted = lu.cfg.GetNodeList() + return utils.NiceSort(wanted) + + +def _GetWantedInstances(lu, instances): + """Returns list of checked and expanded instance names. + + Args: + instances: List of instances (strings) or None for all + + """ + if not isinstance(instances, list): + raise errors.OpPrereqError("Invalid argument type 'instances'") + + if instances: + wanted = [] + + for name in instances: + instance = lu.cfg.ExpandInstanceName(name) + if instance is None: + raise errors.OpPrereqError("No such instance name '%s'" % name) + wanted.append(instance) + + else: + wanted = lu.cfg.GetInstanceList() + return utils.NiceSort(wanted) def _CheckOutputFields(static, dynamic, selected): @@ -202,9 +226,9 @@ def _CheckOutputFields(static, dynamic, selected): all_fields = static_fields | dynamic_fields if not all_fields.issuperset(selected): - raise errors.OpPrereqError, ("Unknown output fields selected: %s" - % ",".join(frozenset(selected). - difference(all_fields))) + raise errors.OpPrereqError("Unknown output fields selected: %s" + % ",".join(frozenset(selected). + difference(all_fields))) def _BuildInstanceHookEnv(name, primary_node, secondary_nodes, os_type, status, @@ -215,6 +239,7 @@ def _BuildInstanceHookEnv(name, primary_node, secondary_nodes, os_type, status, secondary_nodes: List of secondary nodes as strings """ env = { + "OP_TARGET": name, "INSTANCE_NAME": name, "INSTANCE_PRIMARY": primary_node, "INSTANCE_SECONDARIES": " ".join(secondary_nodes), @@ -350,10 +375,10 @@ def _UpdateKnownHosts(fullnode, ip, pubkey): pubkey - the public key of the cluster """ - if os.path.exists('/etc/ssh/ssh_known_hosts'): - f = open('/etc/ssh/ssh_known_hosts', 'r+') + if os.path.exists(constants.SSH_KNOWN_HOSTS_FILE): + f = open(constants.SSH_KNOWN_HOSTS_FILE, 'r+') else: - f = open('/etc/ssh/ssh_known_hosts', 'w+') + f = open(constants.SSH_KNOWN_HOSTS_FILE, 'w+') inthere = False @@ -405,12 +430,15 @@ def _UpdateKnownHosts(fullnode, ip, pubkey): save_lines = save_lines + add_lines # Write a new file and replace old. - fd, tmpname = tempfile.mkstemp('tmp', 'ssh_known_hosts_', '/etc/ssh') + fd, tmpname = tempfile.mkstemp('.tmp', 'known_hosts.', + constants.DATA_DIR) newfile = os.fdopen(fd, 'w') - newfile.write(''.join(save_lines)) - newfile.close() + try: + newfile.write(''.join(save_lines)) + finally: + newfile.close() logger.Debug("Wrote new known_hosts.") - os.rename(tmpname, '/etc/ssh/ssh_known_hosts') + os.rename(tmpname, constants.SSH_KNOWN_HOSTS_FILE) elif add_lines: # Simply appending a new line will do the trick. @@ -448,26 +476,23 @@ def _InitSSHSetup(node): node: the name of this host as a fqdn """ - utils.RemoveFile('/root/.ssh/known_hosts') - - if os.path.exists('/root/.ssh/id_dsa'): - utils.CreateBackup('/root/.ssh/id_dsa') - if os.path.exists('/root/.ssh/id_dsa.pub'): - utils.CreateBackup('/root/.ssh/id_dsa.pub') + priv_key, pub_key, auth_keys = ssh.GetUserFiles(constants.GANETI_RUNAS) - utils.RemoveFile('/root/.ssh/id_dsa') - utils.RemoveFile('/root/.ssh/id_dsa.pub') + for name in priv_key, pub_key: + if os.path.exists(name): + utils.CreateBackup(name) + utils.RemoveFile(name) result = utils.RunCmd(["ssh-keygen", "-t", "dsa", - "-f", "/root/.ssh/id_dsa", + "-f", priv_key, "-q", "-N", ""]) if result.failed: - raise errors.OpExecError, ("could not generate ssh keypair, error %s" % - result.output) + raise errors.OpExecError("Could not generate ssh keypair, error %s" % + result.output) - f = open('/root/.ssh/id_dsa.pub', 'r') + f = open(pub_key, 'r') try: - utils.AddAuthorizedKey('/root/.ssh/authorized_keys', f.read(8192)) + utils.AddAuthorizedKey(auth_keys, f.read(8192)) finally: f.close() @@ -489,18 +514,30 @@ def _InitGanetiServerSetup(ss): "-keyout", constants.SSL_CERT_FILE, "-out", constants.SSL_CERT_FILE, "-batch"]) if result.failed: - raise errors.OpExecError, ("could not generate server ssl cert, command" - " %s had exitcode %s and error message %s" % - (result.cmd, result.exit_code, result.output)) + raise errors.OpExecError("could not generate server ssl cert, command" + " %s had exitcode %s and error message %s" % + (result.cmd, result.exit_code, result.output)) os.chmod(constants.SSL_CERT_FILE, 0400) result = utils.RunCmd([constants.NODE_INITD_SCRIPT, "restart"]) if result.failed: - raise errors.OpExecError, ("could not start the node daemon, command %s" - " had exitcode %s and error %s" % - (result.cmd, result.exit_code, result.output)) + raise errors.OpExecError("Could not start the node daemon, command %s" + " had exitcode %s and error %s" % + (result.cmd, result.exit_code, result.output)) + + +def _CheckInstanceBridgesExist(instance): + """Check that the brigdes needed by an instance exist. + + """ + # check bridges existance + brlist = [nic.bridge for nic in instance.nics] + if not rpc.call_bridges_exist(instance.primary_node, brlist): + raise errors.OpPrereqError("one or more target bridges %s does not" + " exist on destination node '%s'" % + (brlist, instance.primary_node)) class LUInitCluster(LogicalUnit): @@ -520,67 +557,64 @@ class LUInitCluster(LogicalUnit): ourselves in the post-run node list. """ - env = { - "CLUSTER": self.op.cluster_name, - "MASTER": self.hostname['hostname_full'], - } - return env, [], [self.hostname['hostname_full']] + env = {"OP_TARGET": self.op.cluster_name} + return env, [], [self.hostname.name] def CheckPrereq(self): """Verify that the passed name is a valid one. """ if config.ConfigWriter.IsCluster(): - raise errors.OpPrereqError, ("Cluster is already initialised") + raise errors.OpPrereqError("Cluster is already initialised") - hostname_local = socket.gethostname() - self.hostname = hostname = utils.LookupHostname(hostname_local) - if not hostname: - raise errors.OpPrereqError, ("Cannot resolve my own hostname ('%s')" % - hostname_local) + self.hostname = hostname = utils.HostInfo() - self.clustername = clustername = utils.LookupHostname(self.op.cluster_name) - if not clustername: - raise errors.OpPrereqError, ("Cannot resolve given cluster name ('%s')" - % self.op.cluster_name) + if hostname.ip.startswith("127."): + raise errors.OpPrereqError("This host's IP resolves to the private" + " range (%s). Please fix DNS or /etc/hosts." % + (hostname.ip,)) - result = utils.RunCmd(["fping", "-S127.0.0.1", "-q", hostname['ip']]) - if result.failed: - raise errors.OpPrereqError, ("Inconsistency: this host's name resolves" - " to %s,\nbut this ip address does not" - " belong to this host." - " Aborting." % hostname['ip']) + self.clustername = clustername = utils.HostInfo(self.op.cluster_name) + + if not utils.TcpPing(constants.LOCALHOST_IP_ADDRESS, hostname.ip, + constants.DEFAULT_NODED_PORT): + raise errors.OpPrereqError("Inconsistency: this host's name resolves" + " to %s,\nbut this ip address does not" + " belong to this host." + " Aborting." % hostname.ip) secondary_ip = getattr(self.op, "secondary_ip", None) if secondary_ip and not utils.IsValidIP(secondary_ip): - raise errors.OpPrereqError, ("Invalid secondary ip given") - if secondary_ip and secondary_ip != hostname['ip']: - result = utils.RunCmd(["fping", "-S127.0.0.1", "-q", secondary_ip]) - if result.failed: - raise errors.OpPrereqError, ("You gave %s as secondary IP,\n" - "but it does not belong to this host." % - secondary_ip) + raise errors.OpPrereqError("Invalid secondary ip given") + if (secondary_ip and + secondary_ip != hostname.ip and + (not utils.TcpPing(constants.LOCALHOST_IP_ADDRESS, secondary_ip, + constants.DEFAULT_NODED_PORT))): + raise errors.OpPrereqError("You gave %s as secondary IP,\n" + "but it does not belong to this host." % + secondary_ip) self.secondary_ip = secondary_ip # checks presence of the volume group given vgstatus = _HasValidVG(utils.ListVolumeGroups(), self.op.vg_name) if vgstatus: - raise errors.OpPrereqError, ("Error: %s" % vgstatus) + raise errors.OpPrereqError("Error: %s" % vgstatus) if not re.match("^[0-9a-z]{2}:[0-9a-z]{2}:[0-9a-z]{2}$", self.op.mac_prefix): - raise errors.OpPrereqError, ("Invalid mac prefix given '%s'" % - self.op.mac_prefix) + raise errors.OpPrereqError("Invalid mac prefix given '%s'" % + self.op.mac_prefix) if self.op.hypervisor_type not in hypervisor.VALID_HTYPES: - raise errors.OpPrereqError, ("Invalid hypervisor type given '%s'" % - self.op.hypervisor_type) + raise errors.OpPrereqError("Invalid hypervisor type given '%s'" % + self.op.hypervisor_type) result = utils.RunCmd(["ip", "link", "show", "dev", self.op.master_netdev]) if result.failed: - raise errors.OpPrereqError, ("Invalid master netdev given (%s): '%s'" % - (self.op.master_netdev, result.output)) + raise errors.OpPrereqError("Invalid master netdev given (%s): '%s'" % + (self.op.master_netdev, + result.output.strip())) def Exec(self, feedback_fn): """Initialize the cluster. @@ -590,41 +624,36 @@ class LUInitCluster(LogicalUnit): hostname = self.hostname # set up the simple store - ss = ssconf.SimpleStore() + self.sstore = ss = ssconf.SimpleStore() ss.SetKey(ss.SS_HYPERVISOR, self.op.hypervisor_type) - ss.SetKey(ss.SS_MASTER_NODE, hostname['hostname_full']) - ss.SetKey(ss.SS_MASTER_IP, clustername['ip']) + ss.SetKey(ss.SS_MASTER_NODE, hostname.name) + ss.SetKey(ss.SS_MASTER_IP, clustername.ip) ss.SetKey(ss.SS_MASTER_NETDEV, self.op.master_netdev) - ss.SetKey(ss.SS_CLUSTER_NAME, clustername['hostname']) + ss.SetKey(ss.SS_CLUSTER_NAME, clustername.name) # set up the inter-node password and certificate _InitGanetiServerSetup(ss) # start the master ip - rpc.call_node_start_master(hostname['hostname_full']) + rpc.call_node_start_master(hostname.name) # set up ssh config and /etc/hosts - f = open('/etc/ssh/ssh_host_rsa_key.pub', 'r') + f = open(constants.SSH_HOST_RSA_PUB, 'r') try: sshline = f.read() finally: f.close() sshkey = sshline.split(" ")[1] - _UpdateEtcHosts(hostname['hostname_full'], - hostname['ip'], - ) + _UpdateEtcHosts(hostname.name, hostname.ip) - _UpdateKnownHosts(hostname['hostname_full'], - hostname['ip'], - sshkey, - ) + _UpdateKnownHosts(hostname.name, hostname.ip, sshkey) - _InitSSHSetup(hostname['hostname']) + _InitSSHSetup(hostname.name) # init of cluster config file - cfgw = config.ConfigWriter() - cfgw.InitConfig(hostname['hostname'], hostname['ip'], self.secondary_ip, + self.cfg = cfgw = config.ConfigWriter() + cfgw.InitConfig(hostname.name, hostname.ip, self.secondary_ip, sshkey, self.op.mac_prefix, self.op.vg_name, self.op.def_bridge) @@ -647,19 +676,20 @@ class LUDestroyCluster(NoHooksLU): nodelist = self.cfg.GetNodeList() if len(nodelist) != 1 or nodelist[0] != master: - raise errors.OpPrereqError, ("There are still %d node(s) in " - "this cluster." % (len(nodelist) - 1)) + raise errors.OpPrereqError("There are still %d node(s) in" + " this cluster." % (len(nodelist) - 1)) instancelist = self.cfg.GetInstanceList() if instancelist: - raise errors.OpPrereqError, ("There are still %d instance(s) in " - "this cluster." % len(instancelist)) + raise errors.OpPrereqError("There are still %d instance(s) in" + " this cluster." % len(instancelist)) def Exec(self, feedback_fn): """Destroys the cluster. """ - utils.CreateBackup('/root/.ssh/id_dsa') - utils.CreateBackup('/root/.ssh/id_dsa.pub') + priv_key, pub_key, _ = ssh.GetUserFiles(constants.GANETI_RUNAS) + utils.CreateBackup(priv_key) + utils.CreateBackup(pub_key) rpc.call_node_leave_cluster(self.sstore.GetMasterNode()) @@ -780,7 +810,7 @@ class LUVerifyCluster(NoHooksLU): (instance, node)) bad = True - return not bad + return bad def _VerifyOrphanVolumes(self, node_vol_should, node_vol_is, feedback_fn): """Verify if there are any unknown volumes in the cluster. @@ -907,6 +937,85 @@ class LUVerifyCluster(NoHooksLU): return int(bad) +class LURenameCluster(LogicalUnit): + """Rename the cluster. + + """ + HPATH = "cluster-rename" + HTYPE = constants.HTYPE_CLUSTER + _OP_REQP = ["name"] + + def BuildHooksEnv(self): + """Build hooks env. + + """ + env = { + "OP_TARGET": self.op.sstore.GetClusterName(), + "NEW_NAME": self.op.name, + } + mn = self.sstore.GetMasterNode() + return env, [mn], [mn] + + def CheckPrereq(self): + """Verify that the passed name is a valid one. + + """ + hostname = utils.HostInfo(self.op.name) + + new_name = hostname.name + self.ip = new_ip = hostname.ip + old_name = self.sstore.GetClusterName() + old_ip = self.sstore.GetMasterIP() + if new_name == old_name and new_ip == old_ip: + raise errors.OpPrereqError("Neither the name nor the IP address of the" + " cluster has changed") + if new_ip != old_ip: + result = utils.RunCmd(["fping", "-q", new_ip]) + if not result.failed: + raise errors.OpPrereqError("The given cluster IP address (%s) is" + " reachable on the network. Aborting." % + new_ip) + + self.op.name = new_name + + def Exec(self, feedback_fn): + """Rename the cluster. + + """ + clustername = self.op.name + ip = self.ip + ss = self.sstore + + # shutdown the master IP + master = ss.GetMasterNode() + if not rpc.call_node_stop_master(master): + raise errors.OpExecError("Could not disable the master role") + + try: + # modify the sstore + ss.SetKey(ss.SS_MASTER_IP, ip) + ss.SetKey(ss.SS_CLUSTER_NAME, clustername) + + # Distribute updated ss config to all nodes + myself = self.cfg.GetNodeInfo(master) + dist_nodes = self.cfg.GetNodeList() + if myself.name in dist_nodes: + dist_nodes.remove(myself.name) + + logger.Debug("Copying updated ssconf data to all nodes") + for keyname in [ss.SS_CLUSTER_NAME, ss.SS_MASTER_IP]: + fname = ss.KeyToFilename(keyname) + result = rpc.call_upload_file(dist_nodes, fname) + for to_node in dist_nodes: + if not result[to_node]: + logger.Error("copy of file %s to node %s failed" % + (fname, to_node)) + finally: + if not rpc.call_node_start_master(master): + logger.Error("Could not re-enable the master role on the master,\n" + "please restart manually.") + + def _WaitForSync(cfgw, instance, oneshot=False, unlock=False): """Sleep and poll for an instance's disk to sync. @@ -932,8 +1041,8 @@ def _WaitForSync(cfgw, instance, oneshot=False, unlock=False): logger.ToStderr("Can't get any data from node %s" % node) retries += 1 if retries >= 10: - raise errors.RemoteError, ("Can't contact node %s for mirror data," - " aborting." % node) + raise errors.RemoteError("Can't contact node %s for mirror data," + " aborting." % node) time.sleep(6) continue retries = 0 @@ -1012,7 +1121,7 @@ class LUDiagnoseOS(NoHooksLU): node_list = self.cfg.GetNodeList() node_data = rpc.call_os_diagnose(node_list) if node_data == False: - raise errors.OpExecError, "Can't gather the list of OSes" + raise errors.OpExecError("Can't gather the list of OSes") return node_data @@ -1032,6 +1141,7 @@ class LURemoveNode(LogicalUnit): """ env = { + "OP_TARGET": self.op.node_name, "NODE_NAME": self.op.node_name, } all_nodes = self.cfg.GetNodeList() @@ -1051,24 +1161,23 @@ class LURemoveNode(LogicalUnit): """ node = self.cfg.GetNodeInfo(self.cfg.ExpandNodeName(self.op.node_name)) if node is None: - logger.Error("Error: Node '%s' is unknown." % self.op.node_name) - return 1 + raise errors.OpPrereqError, ("Node '%s' is unknown." % self.op.node_name) instance_list = self.cfg.GetInstanceList() masternode = self.sstore.GetMasterNode() if node.name == masternode: - raise errors.OpPrereqError, ("Node is the master node," - " you need to failover first.") + raise errors.OpPrereqError("Node is the master node," + " you need to failover first.") for instance_name in instance_list: instance = self.cfg.GetInstanceInfo(instance_name) if node.name == instance.primary_node: - raise errors.OpPrereqError, ("Instance %s still running on the node," - " please remove first." % instance_name) + raise errors.OpPrereqError("Instance %s still running on the node," + " please remove first." % instance_name) if node.name in instance.secondary_nodes: - raise errors.OpPrereqError, ("Instance %s has node as a secondary," - " please remove first." % instance_name) + raise errors.OpPrereqError("Instance %s has node as a secondary," + " please remove first." % instance_name) self.op.node_name = node.name self.node = node @@ -1093,7 +1202,7 @@ class LUQueryNodes(NoHooksLU): """Logical unit for querying nodes. """ - _OP_REQP = ["output_fields"] + _OP_REQP = ["output_fields", "names"] def CheckPrereq(self): """Check prerequisites. @@ -1102,21 +1211,24 @@ class LUQueryNodes(NoHooksLU): """ self.dynamic_fields = frozenset(["dtotal", "dfree", - "mtotal", "mnode", "mfree"]) + "mtotal", "mnode", "mfree", + "bootid"]) - _CheckOutputFields(static=["name", "pinst", "sinst", "pip", "sip"], + _CheckOutputFields(static=["name", "pinst_cnt", "sinst_cnt", + "pinst_list", "sinst_list", + "pip", "sip"], dynamic=self.dynamic_fields, selected=self.op.output_fields) + self.wanted = _GetWantedNodes(self, self.op.names) def Exec(self, feedback_fn): """Computes the list of nodes and their attributes. """ - nodenames = utils.NiceSort(self.cfg.GetNodeList()) + nodenames = self.wanted nodelist = [self.cfg.GetNodeInfo(name) for name in nodenames] - # begin data gathering if self.dynamic_fields.intersection(self.op.output_fields): @@ -1131,23 +1243,28 @@ class LUQueryNodes(NoHooksLU): "mfree": utils.TryConvert(int, nodeinfo['memory_free']), "dtotal": utils.TryConvert(int, nodeinfo['vg_size']), "dfree": utils.TryConvert(int, nodeinfo['vg_free']), + "bootid": nodeinfo['bootid'], } else: live_data[name] = {} else: live_data = dict.fromkeys(nodenames, {}) - node_to_primary = dict.fromkeys(nodenames, 0) - node_to_secondary = dict.fromkeys(nodenames, 0) + node_to_primary = dict([(name, set()) for name in nodenames]) + node_to_secondary = dict([(name, set()) for name in nodenames]) - if "pinst" in self.op.output_fields or "sinst" in self.op.output_fields: + inst_fields = frozenset(("pinst_cnt", "pinst_list", + "sinst_cnt", "sinst_list")) + if inst_fields & frozenset(self.op.output_fields): instancelist = self.cfg.GetInstanceList() - for instance in instancelist: - instanceinfo = self.cfg.GetInstanceInfo(instance) - node_to_primary[instanceinfo.primary_node] += 1 - for secnode in instanceinfo.secondary_nodes: - node_to_secondary[secnode] += 1 + for instance_name in instancelist: + inst = self.cfg.GetInstanceInfo(instance_name) + if inst.primary_node in node_to_primary: + node_to_primary[inst.primary_node].add(inst.name) + for secnode in inst.secondary_nodes: + if secnode in node_to_secondary: + node_to_secondary[secnode].add(inst.name) # end data gathering @@ -1157,19 +1274,22 @@ class LUQueryNodes(NoHooksLU): for field in self.op.output_fields: if field == "name": val = node.name - elif field == "pinst": - val = node_to_primary[node.name] - elif field == "sinst": - val = node_to_secondary[node.name] + elif field == "pinst_list": + val = list(node_to_primary[node.name]) + elif field == "sinst_list": + val = list(node_to_secondary[node.name]) + elif field == "pinst_cnt": + val = len(node_to_primary[node.name]) + elif field == "sinst_cnt": + val = len(node_to_secondary[node.name]) elif field == "pip": val = node.primary_ip elif field == "sip": val = node.secondary_ip elif field in self.dynamic_fields: - val = live_data[node.name].get(field, "?") + val = live_data[node.name].get(field, None) else: - raise errors.ParameterError, field - val = str(val) + raise errors.ParameterError(field) node_output.append(val) output.append(node_output) @@ -1199,7 +1319,7 @@ class LUQueryNodeVolumes(NoHooksLU): """Computes the list of nodes and their attributes. """ - nodenames = utils.NiceSort([node.name for node in self.nodes]) + nodenames = self.nodes volumes = rpc.call_node_volumes(nodenames) ilist = [self.cfg.GetInstanceInfo(iname) for iname @@ -1209,6 +1329,9 @@ class LUQueryNodeVolumes(NoHooksLU): output = [] for node in nodenames: + if node not in volumes or not volumes[node]: + continue + node_vols = volumes[node][:] node_vols.sort(key=lambda vol: vol['dev']) @@ -1235,7 +1358,7 @@ class LUQueryNodeVolumes(NoHooksLU): else: val = '-' else: - raise errors.ParameterError, field + raise errors.ParameterError(field) node_output.append(str(val)) output.append(node_output) @@ -1258,6 +1381,7 @@ class LUAddNode(LogicalUnit): """ env = { + "OP_TARGET": self.op.node_name, "NODE_NAME": self.op.node_name, "NODE_PIP": self.op.primary_ip, "NODE_SIP": self.op.secondary_ip, @@ -1280,22 +1404,20 @@ class LUAddNode(LogicalUnit): node_name = self.op.node_name cfg = self.cfg - dns_data = utils.LookupHostname(node_name) - if not dns_data: - raise errors.OpPrereqError, ("Node %s is not resolvable" % node_name) + dns_data = utils.HostInfo(node_name) - node = dns_data['hostname'] - primary_ip = self.op.primary_ip = dns_data['ip'] + node = dns_data.name + primary_ip = self.op.primary_ip = dns_data.ip secondary_ip = getattr(self.op, "secondary_ip", None) if secondary_ip is None: secondary_ip = primary_ip if not utils.IsValidIP(secondary_ip): - raise errors.OpPrereqError, ("Invalid secondary IP given") + raise errors.OpPrereqError("Invalid secondary IP given") self.op.secondary_ip = secondary_ip node_list = cfg.GetNodeList() if node in node_list: - raise errors.OpPrereqError, ("Node %s is already in the configuration" - % node) + raise errors.OpPrereqError("Node %s is already in the configuration" + % node) for existing_node_name in node_list: existing_node = cfg.GetNodeInfo(existing_node_name) @@ -1303,8 +1425,8 @@ class LUAddNode(LogicalUnit): existing_node.secondary_ip == primary_ip or existing_node.primary_ip == secondary_ip or existing_node.secondary_ip == secondary_ip): - raise errors.OpPrereqError, ("New node ip address(es) conflict with" - " existing node %s" % existing_node.name) + raise errors.OpPrereqError("New node ip address(es) conflict with" + " existing node %s" % existing_node.name) # check that the type of the node (single versus dual homed) is the # same as for the master @@ -1313,24 +1435,25 @@ class LUAddNode(LogicalUnit): newbie_singlehomed = secondary_ip == primary_ip if master_singlehomed != newbie_singlehomed: if master_singlehomed: - raise errors.OpPrereqError, ("The master has no private ip but the" - " new node has one") + raise errors.OpPrereqError("The master has no private ip but the" + " new node has one") else: - raise errors.OpPrereqError ("The master has a private ip but the" - " new node doesn't have one") + raise errors.OpPrereqError("The master has a private ip but the" + " new node doesn't have one") # checks reachablity - command = ["fping", "-q", primary_ip] - result = utils.RunCmd(command) - if result.failed: - raise errors.OpPrereqError, ("Node not reachable by ping") + if not utils.TcpPing(utils.HostInfo().name, + primary_ip, + constants.DEFAULT_NODED_PORT): + raise errors.OpPrereqError("Node not reachable by ping") if not newbie_singlehomed: # check reachability from my secondary ip to newbie's secondary ip - command = ["fping", "-S%s" % myself.secondary_ip, "-q", secondary_ip] - result = utils.RunCmd(command) - if result.failed: - raise errors.OpPrereqError, ("Node secondary ip not reachable by ping") + if not utils.TcpPing(myself.secondary_ip, + secondary_ip, + constants.DEFAULT_NODED_PORT): + raise errors.OpPrereqError( + "Node secondary ip not reachable by TCP based ping to noded port") self.new_node = objects.Node(name=node, primary_ip=primary_ip, @@ -1346,7 +1469,7 @@ class LUAddNode(LogicalUnit): # set up inter-node password and certificate and restarts the node daemon gntpass = self.sstore.GetNodeDaemonPassword() if not re.match('^[a-zA-Z0-9.]{1,64}$', gntpass): - raise errors.OpExecError, ("ganeti password corruption detected") + raise errors.OpExecError("ganeti password corruption detected") f = open(constants.SSL_CERT_FILE) try: gntpem = f.read(8192) @@ -1357,13 +1480,11 @@ class LUAddNode(LogicalUnit): # cert doesn't contain this, the here-document will be correctly # parsed by the shell sequence below if re.search('^!EOF\.', gntpem, re.MULTILINE): - raise errors.OpExecError, ("invalid PEM encoding in the SSL certificate") + raise errors.OpExecError("invalid PEM encoding in the SSL certificate") if not gntpem.endswith("\n"): - raise errors.OpExecError, ("PEM must end with newline") + raise errors.OpExecError("PEM must end with newline") logger.Info("copy cluster pass to %s and starting the node daemon" % node) - # remove first the root's known_hosts file - utils.RemoveFile("/root/.ssh/known_hosts") # and then connect with ssh to set password and start ganeti-noded # note that all the below variables are sanitized at this point, # either by being constants or by the checks above @@ -1378,9 +1499,9 @@ class LUAddNode(LogicalUnit): result = ssh.SSHCall(node, 'root', mycommand, batch=False, ask_key=True) if result.failed: - raise errors.OpExecError, ("Remote command on node %s, error: %s," - " output: %s" % - (node, result.fail_reason, result.output)) + raise errors.OpExecError("Remote command on node %s, error: %s," + " output: %s" % + (node, result.fail_reason, result.output)) # check connectivity time.sleep(4) @@ -1391,18 +1512,19 @@ class LUAddNode(LogicalUnit): logger.Info("communication to node %s fine, sw version %s match" % (node, result)) else: - raise errors.OpExecError, ("Version mismatch master version %s," - " node version %s" % - (constants.PROTOCOL_VERSION, result)) + raise errors.OpExecError("Version mismatch master version %s," + " node version %s" % + (constants.PROTOCOL_VERSION, result)) else: - raise errors.OpExecError, ("Cannot get version from the new node") + raise errors.OpExecError("Cannot get version from the new node") # setup ssh on node logger.Info("copy ssh key to node %s" % node) + priv_key, pub_key, _ = ssh.GetUserFiles(constants.GANETI_RUNAS) keyarray = [] - keyfiles = ["/etc/ssh/ssh_host_dsa_key", "/etc/ssh/ssh_host_dsa_key.pub", - "/etc/ssh/ssh_host_rsa_key", "/etc/ssh/ssh_host_rsa_key.pub", - "/root/.ssh/id_dsa", "/root/.ssh/id_dsa.pub"] + keyfiles = [constants.SSH_HOST_DSA_PRIV, constants.SSH_HOST_DSA_PUB, + constants.SSH_HOST_RSA_PRIV, constants.SSH_HOST_RSA_PUB, + priv_key, pub_key] for i in keyfiles: f = open(i, 'r') @@ -1415,7 +1537,7 @@ class LUAddNode(LogicalUnit): keyarray[3], keyarray[4], keyarray[5]) if not result: - raise errors.OpExecError, ("Cannot transfer ssh keys to the new node") + raise errors.OpExecError("Cannot transfer ssh keys to the new node") # Add node to our /etc/hosts, and add key to known_hosts _UpdateEtcHosts(new_node.name, new_node.primary_ip) @@ -1423,13 +1545,22 @@ class LUAddNode(LogicalUnit): self.cfg.GetHostKey()) if new_node.secondary_ip != new_node.primary_ip: - result = ssh.SSHCall(node, "root", - "fping -S 127.0.0.1 -q %s" % new_node.secondary_ip) - if result.failed: - raise errors.OpExecError, ("Node claims it doesn't have the" - " secondary ip you gave (%s).\n" - "Please fix and re-run this command." % - new_node.secondary_ip) + if not rpc.call_node_tcp_ping(new_node.name, + constants.LOCALHOST_IP_ADDRESS, + new_node.secondary_ip, + constants.DEFAULT_NODED_PORT, + 10, False): + raise errors.OpExecError("Node claims it doesn't have the" + " secondary ip you gave (%s).\n" + "Please fix and re-run this command." % + new_node.secondary_ip) + + success, msg = ssh.VerifyNodeHostname(node) + if not success: + raise errors.OpExecError("Node '%s' claims it has a different hostname" + " than the one the resolver gives: %s.\n" + "Please fix and re-run this command." % + (node, msg)) # Distribute updated /etc/hosts and known_hosts to all nodes, # including the node just added @@ -1439,7 +1570,7 @@ class LUAddNode(LogicalUnit): dist_nodes.remove(myself.name) logger.Debug("Copying hosts and known_hosts to all nodes") - for fname in ("/etc/hosts", "/etc/ssh/ssh_known_hosts"): + for fname in ("/etc/hosts", constants.SSH_KNOWN_HOSTS_FILE): result = rpc.call_upload_file(dist_nodes, fname) for to_node in dist_nodes: if not result[to_node]: @@ -1474,6 +1605,7 @@ class LUMasterFailover(LogicalUnit): """ env = { + "OP_TARGET": self.new_master, "NEW_MASTER": self.new_master, "OLD_MASTER": self.old_master, } @@ -1485,15 +1617,14 @@ class LUMasterFailover(LogicalUnit): This checks that we are not already the master. """ - self.new_master = socket.gethostname() - + self.new_master = utils.HostInfo().name self.old_master = self.sstore.GetMasterNode() if self.old_master == self.new_master: - raise errors.OpPrereqError, ("This commands must be run on the node" - " where you want the new master to be.\n" - "%s is already the master" % - self.old_master) + raise errors.OpPrereqError("This commands must be run on the node" + " where you want the new master to be.\n" + "%s is already the master" % + self.old_master) def Exec(self, feedback_fn): """Failover the master node. @@ -1587,7 +1718,7 @@ class LUClusterCopyFile(NoHooksLU): """ filename = self.op.filename - myname = socket.gethostname() + myname = utils.HostInfo().name for node in self.nodes: if node == myname: @@ -1635,8 +1766,8 @@ class LURunClusterCommand(NoHooksLU): """ data = [] for node in self.nodes: - result = utils.RunCmd(["ssh", node.name, self.op.command]) - data.append((node.name, result.cmd, result.output, result.exit_code)) + result = ssh.SSHCall(node, "root", self.op.command) + data.append((node, result.output, result.exit_code)) return data @@ -1656,8 +1787,8 @@ class LUActivateInstanceDisks(NoHooksLU): instance = self.cfg.GetInstanceInfo( self.cfg.ExpandInstanceName(self.op.instance_name)) if instance is None: - raise errors.OpPrereqError, ("Instance '%s' not known" % - self.op.instance_name) + raise errors.OpPrereqError("Instance '%s' not known" % + self.op.instance_name) self.instance = instance @@ -1667,7 +1798,7 @@ class LUActivateInstanceDisks(NoHooksLU): """ disks_ok, disks_info = _AssembleInstanceDisks(self.instance, self.cfg) if not disks_ok: - raise errors.OpExecError, ("Cannot activate block devices") + raise errors.OpExecError("Cannot activate block devices") return disks_info @@ -1705,10 +1836,19 @@ def _AssembleInstanceDisks(instance, cfg, ignore_secondaries=False): device_info.append((instance.primary_node, inst_disk.iv_name, master_result)) + # leave the disks configured for the primary node + # this is a workaround that would be fixed better by + # improving the logical/physical id handling + for disk in instance.disks: + cfg.SetDiskID(disk, instance.primary_node) + return disks_ok, device_info def _StartInstanceDisks(cfg, instance, force): + """Start the disks of an instance. + + """ disks_ok, dummy = _AssembleInstanceDisks(instance, cfg, ignore_secondaries=force) if not disks_ok: @@ -1716,7 +1856,7 @@ def _StartInstanceDisks(cfg, instance, force): if force is not None and not force: logger.Error("If the message above refers to a secondary node," " you can retry the operation using '--force'.") - raise errors.OpExecError, ("Disk consistency error") + raise errors.OpExecError("Disk consistency error") class LUDeactivateInstanceDisks(NoHooksLU): @@ -1734,8 +1874,8 @@ class LUDeactivateInstanceDisks(NoHooksLU): instance = self.cfg.GetInstanceInfo( self.cfg.ExpandInstanceName(self.op.instance_name)) if instance is None: - raise errors.OpPrereqError, ("Instance '%s' not known" % - self.op.instance_name) + raise errors.OpPrereqError("Instance '%s' not known" % + self.op.instance_name) self.instance = instance def Exec(self, feedback_fn): @@ -1746,12 +1886,12 @@ class LUDeactivateInstanceDisks(NoHooksLU): ins_l = rpc.call_instance_list([instance.primary_node]) ins_l = ins_l[instance.primary_node] if not type(ins_l) is list: - raise errors.OpExecError, ("Can't contact node '%s'" % - instance.primary_node) + raise errors.OpExecError("Can't contact node '%s'" % + instance.primary_node) if self.instance.name in ins_l: - raise errors.OpExecError, ("Instance is running, can't shutdown" - " block devices.") + raise errors.OpExecError("Instance is running, can't shutdown" + " block devices.") _ShutdownInstanceDisks(instance, self.cfg) @@ -1808,15 +1948,11 @@ class LUStartupInstance(LogicalUnit): instance = self.cfg.GetInstanceInfo( self.cfg.ExpandInstanceName(self.op.instance_name)) if instance is None: - raise errors.OpPrereqError, ("Instance '%s' not known" % - self.op.instance_name) + raise errors.OpPrereqError("Instance '%s' not known" % + self.op.instance_name) # check bridges existance - brlist = [nic.bridge for nic in instance.nics] - if not rpc.call_bridges_exist(instance.primary_node, brlist): - raise errors.OpPrereqError, ("one or more target bridges %s does not" - " exist on destination node '%s'" % - (brlist, instance.primary_node)) + _CheckInstanceBridgesExist(instance) self.instance = instance self.op.instance_name = instance.name @@ -1833,23 +1969,99 @@ class LUStartupInstance(LogicalUnit): nodeinfo = rpc.call_node_info([node_current], self.cfg.GetVGName()) if not nodeinfo: - raise errors.OpExecError, ("Could not contact node %s for infos" % - (node_current)) + raise errors.OpExecError("Could not contact node %s for infos" % + (node_current)) freememory = nodeinfo[node_current]['memory_free'] memory = instance.memory if memory > freememory: - raise errors.OpExecError, ("Not enough memory to start instance" - " %s on node %s" - " needed %s MiB, available %s MiB" % - (instance.name, node_current, memory, - freememory)) + raise errors.OpExecError("Not enough memory to start instance" + " %s on node %s" + " needed %s MiB, available %s MiB" % + (instance.name, node_current, memory, + freememory)) _StartInstanceDisks(self.cfg, instance, force) if not rpc.call_instance_start(node_current, instance, extra_args): _ShutdownInstanceDisks(instance, self.cfg) - raise errors.OpExecError, ("Could not start instance") + raise errors.OpExecError("Could not start instance") + + self.cfg.MarkInstanceUp(instance.name) + + +class LURebootInstance(LogicalUnit): + """Reboot an instance. + + """ + HPATH = "instance-reboot" + HTYPE = constants.HTYPE_INSTANCE + _OP_REQP = ["instance_name", "ignore_secondaries", "reboot_type"] + + def BuildHooksEnv(self): + """Build hooks env. + + This runs on master, primary and secondary nodes of the instance. + + """ + env = { + "IGNORE_SECONDARIES": self.op.ignore_secondaries, + } + env.update(_BuildInstanceHookEnvByObject(self.instance)) + nl = ([self.sstore.GetMasterNode(), self.instance.primary_node] + + list(self.instance.secondary_nodes)) + return env, nl, nl + + def CheckPrereq(self): + """Check prerequisites. + + This checks that the instance is in the cluster. + + """ + instance = self.cfg.GetInstanceInfo( + self.cfg.ExpandInstanceName(self.op.instance_name)) + if instance is None: + raise errors.OpPrereqError("Instance '%s' not known" % + self.op.instance_name) + + # check bridges existance + _CheckInstanceBridgesExist(instance) + + self.instance = instance + self.op.instance_name = instance.name + + def Exec(self, feedback_fn): + """Reboot the instance. + + """ + instance = self.instance + ignore_secondaries = self.op.ignore_secondaries + reboot_type = self.op.reboot_type + extra_args = getattr(self.op, "extra_args", "") + + node_current = instance.primary_node + + if reboot_type not in [constants.INSTANCE_REBOOT_SOFT, + constants.INSTANCE_REBOOT_HARD, + constants.INSTANCE_REBOOT_FULL]: + raise errors.ParameterError("reboot type not in [%s, %s, %s]" % + (constants.INSTANCE_REBOOT_SOFT, + constants.INSTANCE_REBOOT_HARD, + constants.INSTANCE_REBOOT_FULL)) + + if reboot_type in [constants.INSTANCE_REBOOT_SOFT, + constants.INSTANCE_REBOOT_HARD]: + if not rpc.call_instance_reboot(node_current, instance, + reboot_type, extra_args): + raise errors.OpExecError("Could not reboot instance") + else: + if not rpc.call_instance_shutdown(node_current, instance): + raise errors.OpExecError("could not shutdown instance for full reboot") + _ShutdownInstanceDisks(instance, self.cfg) + _StartInstanceDisks(self.cfg, instance, ignore_secondaries) + if not rpc.call_instance_start(node_current, instance, extra_args): + _ShutdownInstanceDisks(instance, self.cfg) + raise errors.OpExecError("Could not start instance for full reboot") self.cfg.MarkInstanceUp(instance.name) @@ -1882,8 +2094,8 @@ class LUShutdownInstance(LogicalUnit): instance = self.cfg.GetInstanceInfo( self.cfg.ExpandInstanceName(self.op.instance_name)) if instance is None: - raise errors.OpPrereqError, ("Instance '%s' not known" % - self.op.instance_name) + raise errors.OpPrereqError("Instance '%s' not known" % + self.op.instance_name) self.instance = instance def Exec(self, feedback_fn): @@ -1927,19 +2139,19 @@ class LUReinstallInstance(LogicalUnit): instance = self.cfg.GetInstanceInfo( self.cfg.ExpandInstanceName(self.op.instance_name)) if instance is None: - raise errors.OpPrereqError, ("Instance '%s' not known" % - self.op.instance_name) + raise errors.OpPrereqError("Instance '%s' not known" % + self.op.instance_name) if instance.disk_template == constants.DT_DISKLESS: - raise errors.OpPrereqError, ("Instance '%s' has no disks" % - self.op.instance_name) + raise errors.OpPrereqError("Instance '%s' has no disks" % + self.op.instance_name) if instance.status != "down": - raise errors.OpPrereqError, ("Instance '%s' is marked to be up" % - self.op.instance_name) + raise errors.OpPrereqError("Instance '%s' is marked to be up" % + self.op.instance_name) remote_info = rpc.call_instance_info(instance.primary_node, instance.name) if remote_info: - raise errors.OpPrereqError, ("Instance '%s' is running on the node %s" % - (self.op.instance_name, - instance.primary_node)) + raise errors.OpPrereqError("Instance '%s' is running on the node %s" % + (self.op.instance_name, + instance.primary_node)) self.op.os_type = getattr(self.op, "os_type", None) if self.op.os_type is not None: @@ -1947,12 +2159,12 @@ class LUReinstallInstance(LogicalUnit): pnode = self.cfg.GetNodeInfo( self.cfg.ExpandNodeName(instance.primary_node)) if pnode is None: - raise errors.OpPrereqError, ("Primary node '%s' is unknown" % - self.op.pnode) + raise errors.OpPrereqError("Primary node '%s' is unknown" % + self.op.pnode) os_obj = rpc.call_os_get([pnode.name], self.op.os_type)[pnode.name] if not isinstance(os_obj, objects.OS): - raise errors.OpPrereqError, ("OS '%s' not in supported OS list for" - " primary node" % self.op.os_type) + raise errors.OpPrereqError("OS '%s' not in supported OS list for" + " primary node" % self.op.os_type) self.instance = instance @@ -1971,9 +2183,87 @@ class LUReinstallInstance(LogicalUnit): try: feedback_fn("Running the instance OS create scripts...") if not rpc.call_instance_os_add(inst.primary_node, inst, "sda", "sdb"): - raise errors.OpExecError, ("Could not install OS for instance %s " - "on node %s" % - (inst.name, inst.primary_node)) + raise errors.OpExecError("Could not install OS for instance %s " + "on node %s" % + (inst.name, inst.primary_node)) + finally: + _ShutdownInstanceDisks(inst, self.cfg) + + +class LURenameInstance(LogicalUnit): + """Rename an instance. + + """ + HPATH = "instance-rename" + HTYPE = constants.HTYPE_INSTANCE + _OP_REQP = ["instance_name", "new_name"] + + def BuildHooksEnv(self): + """Build hooks env. + + This runs on master, primary and secondary nodes of the instance. + + """ + env = _BuildInstanceHookEnvByObject(self.instance) + env["INSTANCE_NEW_NAME"] = self.op.new_name + nl = ([self.sstore.GetMasterNode(), self.instance.primary_node] + + list(self.instance.secondary_nodes)) + return env, nl, nl + + def CheckPrereq(self): + """Check prerequisites. + + This checks that the instance is in the cluster and is not running. + + """ + instance = self.cfg.GetInstanceInfo( + self.cfg.ExpandInstanceName(self.op.instance_name)) + if instance is None: + raise errors.OpPrereqError("Instance '%s' not known" % + self.op.instance_name) + if instance.status != "down": + raise errors.OpPrereqError("Instance '%s' is marked to be up" % + self.op.instance_name) + remote_info = rpc.call_instance_info(instance.primary_node, instance.name) + if remote_info: + raise errors.OpPrereqError("Instance '%s' is running on the node %s" % + (self.op.instance_name, + instance.primary_node)) + self.instance = instance + + # new name verification + name_info = utils.HostInfo(self.op.new_name) + + self.op.new_name = new_name = name_info.name + if not getattr(self.op, "ignore_ip", False): + command = ["fping", "-q", name_info.ip] + result = utils.RunCmd(command) + if not result.failed: + raise errors.OpPrereqError("IP %s of instance %s already in use" % + (name_info.ip, new_name)) + + + def Exec(self, feedback_fn): + """Reinstall the instance. + + """ + inst = self.instance + old_name = inst.name + + self.cfg.RenameInstance(inst.name, self.op.new_name) + + # re-read the instance from the configuration after rename + inst = self.cfg.GetInstanceInfo(self.op.new_name) + + _StartInstanceDisks(self.cfg, inst, None) + try: + if not rpc.call_instance_run_rename(inst.primary_node, inst, old_name, + "sda", "sdb"): + msg = ("Could run OS rename script for instance %s\n" + "on node %s\n" + "(but the instance has been renamed in Ganeti)" % + (inst.name, inst.primary_node)) + logger.Error(msg) finally: _ShutdownInstanceDisks(inst, self.cfg) @@ -1993,8 +2283,7 @@ class LURemoveInstance(LogicalUnit): """ env = _BuildInstanceHookEnvByObject(self.instance) - nl = ([self.sstore.GetMasterNode(), self.instance.primary_node] + - list(self.instance.secondary_nodes)) + nl = [self.sstore.GetMasterNode()] return env, nl, nl def CheckPrereq(self): @@ -2006,8 +2295,8 @@ class LURemoveInstance(LogicalUnit): instance = self.cfg.GetInstanceInfo( self.cfg.ExpandInstanceName(self.op.instance_name)) if instance is None: - raise errors.OpPrereqError, ("Instance '%s' not known" % - self.op.instance_name) + raise errors.OpPrereqError("Instance '%s' not known" % + self.op.instance_name) self.instance = instance def Exec(self, feedback_fn): @@ -2019,12 +2308,19 @@ class LURemoveInstance(LogicalUnit): (instance.name, instance.primary_node)) if not rpc.call_instance_shutdown(instance.primary_node, instance): - raise errors.OpExecError, ("Could not shutdown instance %s on node %s" % + if self.op.ignore_failures: + feedback_fn("Warning: can't shutdown instance") + else: + raise errors.OpExecError("Could not shutdown instance %s on node %s" % (instance.name, instance.primary_node)) logger.Info("removing block devices for instance %s" % instance.name) - _RemoveDisks(instance, self.cfg) + if not _RemoveDisks(instance, self.cfg): + if self.op.ignore_failures: + feedback_fn("Warning: can't remove instance's disks") + else: + raise errors.OpExecError("Can't remove instance's disks") logger.Info("removing instance %s out of cluster config" % instance.name) @@ -2035,7 +2331,7 @@ class LUQueryInstances(NoHooksLU): """Logical unit for querying instances. """ - _OP_REQP = ["output_fields"] + _OP_REQP = ["output_fields", "names"] def CheckPrereq(self): """Check prerequisites. @@ -2046,15 +2342,18 @@ class LUQueryInstances(NoHooksLU): self.dynamic_fields = frozenset(["oper_state", "oper_ram"]) _CheckOutputFields(static=["name", "os", "pnode", "snodes", "admin_state", "admin_ram", - "disk_template", "ip", "mac", "bridge"], + "disk_template", "ip", "mac", "bridge", + "sda_size", "sdb_size"], dynamic=self.dynamic_fields, selected=self.op.output_fields) + self.wanted = _GetWantedInstances(self, self.op.names) + def Exec(self, feedback_fn): """Computes the list of nodes and their attributes. """ - instance_names = utils.NiceSort(self.cfg.GetInstanceList()) + instance_names = self.wanted instance_list = [self.cfg.GetInstanceInfo(iname) for iname in instance_names] @@ -2089,25 +2388,19 @@ class LUQueryInstances(NoHooksLU): elif field == "pnode": val = instance.primary_node elif field == "snodes": - val = ",".join(instance.secondary_nodes) or "-" + val = list(instance.secondary_nodes) elif field == "admin_state": - if instance.status == "down": - val = "no" - else: - val = "yes" + val = (instance.status != "down") elif field == "oper_state": if instance.primary_node in bad_nodes: - val = "(node down)" + val = None else: - if live_data.get(instance.name): - val = "running" - else: - val = "stopped" + val = bool(live_data.get(instance.name)) elif field == "admin_ram": val = instance.memory elif field == "oper_ram": if instance.primary_node in bad_nodes: - val = "(node down)" + val = None elif instance.name in live_data: val = live_data[instance.name].get("memory", "?") else: @@ -2120,9 +2413,14 @@ class LUQueryInstances(NoHooksLU): val = instance.nics[0].bridge elif field == "mac": val = instance.nics[0].mac + elif field == "sda_size" or field == "sdb_size": + disk = instance.FindDisk(field[:3]) + if disk is None: + val = None + else: + val = disk.size else: - raise errors.ParameterError, field - val = str(val) + raise errors.ParameterError(field) iout.append(val) output.append(iout) @@ -2159,28 +2457,37 @@ class LUFailoverInstance(LogicalUnit): instance = self.cfg.GetInstanceInfo( self.cfg.ExpandInstanceName(self.op.instance_name)) if instance is None: - raise errors.OpPrereqError, ("Instance '%s' not known" % - self.op.instance_name) + raise errors.OpPrereqError("Instance '%s' not known" % + self.op.instance_name) + + if instance.disk_template not in constants.DTS_NET_MIRROR: + raise errors.OpPrereqError("Instance's disk layout is not" + " network mirrored, cannot failover.") + + secondary_nodes = instance.secondary_nodes + if not secondary_nodes: + raise errors.ProgrammerError("no secondary node but using " + "DT_REMOTE_RAID1 template") # check memory requirements on the secondary node - target_node = instance.secondary_nodes[0] + target_node = secondary_nodes[0] nodeinfo = rpc.call_node_info([target_node], self.cfg.GetVGName()) info = nodeinfo.get(target_node, None) if not info: - raise errors.OpPrereqError, ("Cannot get current information" - " from node '%s'" % nodeinfo) + raise errors.OpPrereqError("Cannot get current information" + " from node '%s'" % nodeinfo) if instance.memory > info['memory_free']: - raise errors.OpPrereqError, ("Not enough memory on target node %s." - " %d MB available, %d MB required" % - (target_node, info['memory_free'], - instance.memory)) + raise errors.OpPrereqError("Not enough memory on target node %s." + " %d MB available, %d MB required" % + (target_node, info['memory_free'], + instance.memory)) # check bridge existance brlist = [nic.bridge for nic in instance.nics] if not rpc.call_bridges_exist(instance.primary_node, brlist): - raise errors.OpPrereqError, ("one or more target bridges %s does not" - " exist on destination node '%s'" % - (brlist, instance.primary_node)) + raise errors.OpPrereqError("One or more target bridges %s does not" + " exist on destination node '%s'" % + (brlist, instance.primary_node)) self.instance = instance @@ -2201,23 +2508,23 @@ class LUFailoverInstance(LogicalUnit): # for remote_raid1, these are md over drbd if not _CheckDiskConsistency(self.cfg, dev, target_node, False): if not self.op.ignore_consistency: - raise errors.OpExecError, ("Disk %s is degraded on target node," - " aborting failover." % dev.iv_name) + raise errors.OpExecError("Disk %s is degraded on target node," + " aborting failover." % dev.iv_name) feedback_fn("* checking target node resource availability") nodeinfo = rpc.call_node_info([target_node], self.cfg.GetVGName()) if not nodeinfo: - raise errors.OpExecError, ("Could not contact target node %s." % - target_node) + raise errors.OpExecError("Could not contact target node %s." % + target_node) free_memory = int(nodeinfo[target_node]['memory_free']) memory = instance.memory if memory > free_memory: - raise errors.OpExecError, ("Not enough memory to create instance %s on" - " node %s. needed %s MiB, available %s MiB" % - (instance.name, target_node, memory, - free_memory)) + raise errors.OpExecError("Not enough memory to create instance %s on" + " node %s. needed %s MiB, available %s MiB" % + (instance.name, target_node, memory, + free_memory)) feedback_fn("* shutting down instance on source node") logger.Info("Shutting down instance %s on node %s" % @@ -2230,7 +2537,7 @@ class LUFailoverInstance(LogicalUnit): feedback_fn("* deactivating the instance's disks on source node") if not _ShutdownInstanceDisks(instance, self.cfg, ignore_primary=True): - raise errors.OpExecError, ("Can't shut down the instance's disks.") + raise errors.OpExecError("Can't shut down the instance's disks.") instance.primary_node = target_node # distribute new instance config to the other nodes @@ -2244,7 +2551,7 @@ class LUFailoverInstance(LogicalUnit): ignore_secondaries=True) if not disks_ok: _ShutdownInstanceDisks(instance, self.cfg) - raise errors.OpExecError, ("Can't activate the instance's disks") + raise errors.OpExecError("Can't activate the instance's disks") feedback_fn("* starting the instance on the target node") if not rpc.call_instance_start(target_node, instance, None): @@ -2319,16 +2626,32 @@ def _GenerateMDDRBDBranch(cfg, primary, secondary, size, names): """ port = cfg.AllocatePort() vgname = cfg.GetVGName() - dev_data = objects.Disk(dev_type="lvm", size=size, + dev_data = objects.Disk(dev_type=constants.LD_LV, size=size, logical_id=(vgname, names[0])) - dev_meta = objects.Disk(dev_type="lvm", size=128, + dev_meta = objects.Disk(dev_type=constants.LD_LV, size=128, logical_id=(vgname, names[1])) - drbd_dev = objects.Disk(dev_type="drbd", size=size, + drbd_dev = objects.Disk(dev_type=constants.LD_DRBD7, size=size, logical_id = (primary, secondary, port), children = [dev_data, dev_meta]) return drbd_dev +def _GenerateDRBD8Branch(cfg, primary, secondary, size, names, iv_name): + """Generate a drbd8 device complete with its children. + + """ + port = cfg.AllocatePort() + vgname = cfg.GetVGName() + dev_data = objects.Disk(dev_type=constants.LD_LV, size=size, + logical_id=(vgname, names[0])) + dev_meta = objects.Disk(dev_type=constants.LD_LV, size=128, + logical_id=(vgname, names[1])) + drbd_dev = objects.Disk(dev_type=constants.LD_DRBD8, size=size, + logical_id = (primary, secondary, port), + children = [dev_data, dev_meta], + iv_name=iv_name) + return drbd_dev + def _GenerateDiskTemplate(cfg, template_name, instance_name, primary_node, secondary_nodes, disk_sz, swap_sz): @@ -2345,10 +2668,10 @@ def _GenerateDiskTemplate(cfg, template_name, raise errors.ProgrammerError("Wrong template configuration") names = _GenerateUniqueNames(cfg, [".sda", ".sdb"]) - sda_dev = objects.Disk(dev_type="lvm", size=disk_sz, + sda_dev = objects.Disk(dev_type=constants.LD_LV, size=disk_sz, logical_id=(vgname, names[0]), iv_name = "sda") - sdb_dev = objects.Disk(dev_type="lvm", size=swap_sz, + sdb_dev = objects.Disk(dev_type=constants.LD_LV, size=swap_sz, logical_id=(vgname, names[1]), iv_name = "sdb") disks = [sda_dev, sdb_dev] @@ -2359,22 +2682,22 @@ def _GenerateDiskTemplate(cfg, template_name, names = _GenerateUniqueNames(cfg, [".sda_m1", ".sda_m2", ".sdb_m1", ".sdb_m2"]) - sda_dev_m1 = objects.Disk(dev_type="lvm", size=disk_sz, + sda_dev_m1 = objects.Disk(dev_type=constants.LD_LV, size=disk_sz, logical_id=(vgname, names[0])) - sda_dev_m2 = objects.Disk(dev_type="lvm", size=disk_sz, + sda_dev_m2 = objects.Disk(dev_type=constants.LD_LV, size=disk_sz, logical_id=(vgname, names[1])) - md_sda_dev = objects.Disk(dev_type="md_raid1", iv_name = "sda", + md_sda_dev = objects.Disk(dev_type=constants.LD_MD_R1, iv_name = "sda", size=disk_sz, children = [sda_dev_m1, sda_dev_m2]) - sdb_dev_m1 = objects.Disk(dev_type="lvm", size=swap_sz, + sdb_dev_m1 = objects.Disk(dev_type=constants.LD_LV, size=swap_sz, logical_id=(vgname, names[2])) - sdb_dev_m2 = objects.Disk(dev_type="lvm", size=swap_sz, + sdb_dev_m2 = objects.Disk(dev_type=constants.LD_LV, size=swap_sz, logical_id=(vgname, names[3])) - md_sdb_dev = objects.Disk(dev_type="md_raid1", iv_name = "sdb", + md_sdb_dev = objects.Disk(dev_type=constants.LD_MD_R1, iv_name = "sdb", size=swap_sz, children = [sdb_dev_m1, sdb_dev_m2]) disks = [md_sda_dev, md_sdb_dev] - elif template_name == "remote_raid1": + elif template_name == constants.DT_REMOTE_RAID1: if len(secondary_nodes) != 1: raise errors.ProgrammerError("Wrong template configuration") remote_node = secondary_nodes[0] @@ -2382,19 +2705,33 @@ def _GenerateDiskTemplate(cfg, template_name, ".sdb_data", ".sdb_meta"]) drbd_sda_dev = _GenerateMDDRBDBranch(cfg, primary_node, remote_node, disk_sz, names[0:2]) - md_sda_dev = objects.Disk(dev_type="md_raid1", iv_name="sda", + md_sda_dev = objects.Disk(dev_type=constants.LD_MD_R1, iv_name="sda", children = [drbd_sda_dev], size=disk_sz) drbd_sdb_dev = _GenerateMDDRBDBranch(cfg, primary_node, remote_node, swap_sz, names[2:4]) - md_sdb_dev = objects.Disk(dev_type="md_raid1", iv_name="sdb", + md_sdb_dev = objects.Disk(dev_type=constants.LD_MD_R1, iv_name="sdb", children = [drbd_sdb_dev], size=swap_sz) disks = [md_sda_dev, md_sdb_dev] + elif template_name == constants.DT_DRBD8: + if len(secondary_nodes) != 1: + raise errors.ProgrammerError("Wrong template configuration") + remote_node = secondary_nodes[0] + names = _GenerateUniqueNames(cfg, [".sda_data", ".sda_meta", + ".sdb_data", ".sdb_meta"]) + drbd_sda_dev = _GenerateDRBD8Branch(cfg, primary_node, remote_node, + disk_sz, names[0:2], "sda") + drbd_sdb_dev = _GenerateDRBD8Branch(cfg, primary_node, remote_node, + swap_sz, names[2:4], "sdb") + disks = [drbd_sda_dev, drbd_sdb_dev] else: raise errors.ProgrammerError("Invalid disk template '%s'" % template_name) return disks def _GetInstanceInfoText(instance): + """Compute that text that should be added to the disk's metadata. + + """ return "originstname+%s" % instance.name @@ -2435,7 +2772,7 @@ def _RemoveDisks(instance, cfg): This abstracts away some work from `AddInstance()` and `RemoveInstance()`. Note that in case some of the devices couldn't - be remove, the removal will continue with the other ones (compare + be removed, the removal will continue with the other ones (compare with `_CreateDisks()`). Args: @@ -2467,7 +2804,7 @@ class LUCreateInstance(LogicalUnit): HTYPE = constants.HTYPE_INSTANCE _OP_REQP = ["instance_name", "mem_size", "disk_size", "pnode", "disk_template", "swap_size", "mode", "start", "vcpus", - "wait_for_sync"] + "wait_for_sync", "ip_check"] def BuildHooksEnv(self): """Build hooks env. @@ -2507,39 +2844,39 @@ class LUCreateInstance(LogicalUnit): """ if self.op.mode not in (constants.INSTANCE_CREATE, constants.INSTANCE_IMPORT): - raise errors.OpPrereqError, ("Invalid instance creation mode '%s'" % - self.op.mode) + raise errors.OpPrereqError("Invalid instance creation mode '%s'" % + self.op.mode) if self.op.mode == constants.INSTANCE_IMPORT: src_node = getattr(self.op, "src_node", None) src_path = getattr(self.op, "src_path", None) if src_node is None or src_path is None: - raise errors.OpPrereqError, ("Importing an instance requires source" - " node and path options") + raise errors.OpPrereqError("Importing an instance requires source" + " node and path options") src_node_full = self.cfg.ExpandNodeName(src_node) if src_node_full is None: - raise errors.OpPrereqError, ("Unknown source node '%s'" % src_node) + raise errors.OpPrereqError("Unknown source node '%s'" % src_node) self.op.src_node = src_node = src_node_full if not os.path.isabs(src_path): - raise errors.OpPrereqError, ("The source path must be absolute") + raise errors.OpPrereqError("The source path must be absolute") export_info = rpc.call_export_info(src_node, src_path) if not export_info: - raise errors.OpPrereqError, ("No export found in dir %s" % src_path) + raise errors.OpPrereqError("No export found in dir %s" % src_path) if not export_info.has_section(constants.INISECT_EXP): - raise errors.ProgrammerError, ("Corrupted export config") + raise errors.ProgrammerError("Corrupted export config") ei_version = export_info.get(constants.INISECT_EXP, 'version') if (int(ei_version) != constants.EXPORT_VERSION): - raise errors.OpPrereqError, ("Wrong export version %s (wanted %d)" % - (ei_version, constants.EXPORT_VERSION)) + raise errors.OpPrereqError("Wrong export version %s (wanted %d)" % + (ei_version, constants.EXPORT_VERSION)) if int(export_info.get(constants.INISECT_INS, 'disk_count')) > 1: - raise errors.OpPrereqError, ("Can't import instance with more than" - " one data disk") + raise errors.OpPrereqError("Can't import instance with more than" + " one data disk") # FIXME: are the old os-es, disk sizes, etc. useful? self.op.os_type = export_info.get(constants.INISECT_EXP, 'os') @@ -2548,32 +2885,32 @@ class LUCreateInstance(LogicalUnit): self.src_image = diskimage else: # INSTANCE_CREATE if getattr(self.op, "os_type", None) is None: - raise errors.OpPrereqError, ("No guest OS specified") + raise errors.OpPrereqError("No guest OS specified") # check primary node pnode = self.cfg.GetNodeInfo(self.cfg.ExpandNodeName(self.op.pnode)) if pnode is None: - raise errors.OpPrereqError, ("Primary node '%s' is unknown" % - self.op.pnode) + raise errors.OpPrereqError("Primary node '%s' is unknown" % + self.op.pnode) self.op.pnode = pnode.name self.pnode = pnode self.secondaries = [] # disk template and mirror node verification if self.op.disk_template not in constants.DISK_TEMPLATES: - raise errors.OpPrereqError, ("Invalid disk template name") + raise errors.OpPrereqError("Invalid disk template name") - if self.op.disk_template == constants.DT_REMOTE_RAID1: + if self.op.disk_template in constants.DTS_NET_MIRROR: if getattr(self.op, "snode", None) is None: - raise errors.OpPrereqError, ("The 'remote_raid1' disk template needs" - " a mirror node") + raise errors.OpPrereqError("The networked disk templates need" + " a mirror node") snode_name = self.cfg.ExpandNodeName(self.op.snode) if snode_name is None: - raise errors.OpPrereqError, ("Unknown secondary node '%s'" % - self.op.snode) + raise errors.OpPrereqError("Unknown secondary node '%s'" % + self.op.snode) elif snode_name == pnode.name: - raise errors.OpPrereqError, ("The secondary node cannot be" - " the primary node.") + raise errors.OpPrereqError("The secondary node cannot be" + " the primary node.") self.secondaries.append(snode_name) # Check lv size requirements @@ -2587,59 +2924,61 @@ class LUCreateInstance(LogicalUnit): constants.DT_LOCAL_RAID1: (self.op.disk_size + self.op.swap_size) * 2, # 256 MB are added for drbd metadata, 128MB for each drbd device constants.DT_REMOTE_RAID1: self.op.disk_size + self.op.swap_size + 256, + constants.DT_DRBD8: self.op.disk_size + self.op.swap_size + 256, } if self.op.disk_template not in req_size_dict: - raise errors.ProgrammerError, ("Disk template '%s' size requirement" - " is unknown" % self.op.disk_template) + raise errors.ProgrammerError("Disk template '%s' size requirement" + " is unknown" % self.op.disk_template) req_size = req_size_dict[self.op.disk_template] for node in nodenames: info = nodeinfo.get(node, None) if not info: - raise errors.OpPrereqError, ("Cannot get current information" - " from node '%s'" % nodeinfo) + raise errors.OpPrereqError("Cannot get current information" + " from node '%s'" % nodeinfo) if req_size > info['vg_free']: - raise errors.OpPrereqError, ("Not enough disk space on target node %s." - " %d MB available, %d MB required" % - (node, info['vg_free'], req_size)) + raise errors.OpPrereqError("Not enough disk space on target node %s." + " %d MB available, %d MB required" % + (node, info['vg_free'], req_size)) # os verification os_obj = rpc.call_os_get([pnode.name], self.op.os_type)[pnode.name] if not isinstance(os_obj, objects.OS): - raise errors.OpPrereqError, ("OS '%s' not in supported os list for" - " primary node" % self.op.os_type) + raise errors.OpPrereqError("OS '%s' not in supported os list for" + " primary node" % self.op.os_type) # instance verification - hostname1 = utils.LookupHostname(self.op.instance_name) - if not hostname1: - raise errors.OpPrereqError, ("Instance name '%s' not found in dns" % - self.op.instance_name) + hostname1 = utils.HostInfo(self.op.instance_name) - self.op.instance_name = instance_name = hostname1['hostname'] + self.op.instance_name = instance_name = hostname1.name instance_list = self.cfg.GetInstanceList() if instance_name in instance_list: - raise errors.OpPrereqError, ("Instance '%s' is already in the cluster" % - instance_name) + raise errors.OpPrereqError("Instance '%s' is already in the cluster" % + instance_name) ip = getattr(self.op, "ip", None) if ip is None or ip.lower() == "none": inst_ip = None elif ip.lower() == "auto": - inst_ip = hostname1['ip'] + inst_ip = hostname1.ip else: if not utils.IsValidIP(ip): - raise errors.OpPrereqError, ("given IP address '%s' doesn't look" - " like a valid IP" % ip) + raise errors.OpPrereqError("given IP address '%s' doesn't look" + " like a valid IP" % ip) inst_ip = ip self.inst_ip = inst_ip - command = ["fping", "-q", hostname1['ip']] - result = utils.RunCmd(command) - if not result.failed: - raise errors.OpPrereqError, ("IP %s of instance %s already in use" % - (hostname1['ip'], instance_name)) + if self.op.start and not self.op.ip_check: + raise errors.OpPrereqError("Cannot ignore IP address conflicts when" + " adding an instance in start mode") + + if self.op.ip_check: + if utils.TcpPing(utils.HostInfo().name, hostname1.ip, + constants.DEFAULT_NODED_PORT): + raise errors.OpPrereqError("IP %s of instance %s already in use" % + (hostname1.ip, instance_name)) # bridge verification bridge = getattr(self.op, "bridge", None) @@ -2649,9 +2988,9 @@ class LUCreateInstance(LogicalUnit): self.op.bridge = bridge if not rpc.call_bridges_exist(self.pnode.name, [self.op.bridge]): - raise errors.OpPrereqError, ("target bridge '%s' does not exist on" - " destination node '%s'" % - (self.op.bridge, pnode.name)) + raise errors.OpPrereqError("target bridge '%s' does not exist on" + " destination node '%s'" % + (self.op.bridge, pnode.name)) if self.op.start: self.instance_status = 'up' @@ -2687,7 +3026,7 @@ class LUCreateInstance(LogicalUnit): feedback_fn("* creating instance disks...") if not _CreateDisks(self.cfg, iobj): _RemoveDisks(iobj, self.cfg) - raise errors.OpExecError, ("Device creation failed, reverting...") + raise errors.OpExecError("Device creation failed, reverting...") feedback_fn("adding instance %s to cluster config" % instance) @@ -2695,7 +3034,7 @@ class LUCreateInstance(LogicalUnit): if self.op.wait_for_sync: disk_abort = not _WaitForSync(self.cfg, iobj) - elif iobj.disk_template == "remote_raid1": + elif iobj.disk_template in constants.DTS_NET_MIRROR: # make sure the disks are not degraded (still sync-ing is ok) time.sleep(15) feedback_fn("* checking mirrors status") @@ -2706,8 +3045,8 @@ class LUCreateInstance(LogicalUnit): if disk_abort: _RemoveDisks(iobj, self.cfg) self.cfg.RemoveInstance(iobj.name) - raise errors.OpExecError, ("There are some degraded disks for" - " this instance") + raise errors.OpExecError("There are some degraded disks for" + " this instance") feedback_fn("creating os for instance %s on node %s" % (instance, pnode_name)) @@ -2716,9 +3055,9 @@ class LUCreateInstance(LogicalUnit): if self.op.mode == constants.INSTANCE_CREATE: feedback_fn("* running the instance OS create scripts...") if not rpc.call_instance_os_add(pnode_name, iobj, "sda", "sdb"): - raise errors.OpExecError, ("could not add os for instance %s" - " on node %s" % - (instance, pnode_name)) + raise errors.OpExecError("could not add os for instance %s" + " on node %s" % + (instance, pnode_name)) elif self.op.mode == constants.INSTANCE_IMPORT: feedback_fn("* running the instance OS import scripts...") @@ -2726,19 +3065,19 @@ class LUCreateInstance(LogicalUnit): src_image = self.src_image if not rpc.call_instance_os_import(pnode_name, iobj, "sda", "sdb", src_node, src_image): - raise errors.OpExecError, ("Could not import os for instance" - " %s on node %s" % - (instance, pnode_name)) + raise errors.OpExecError("Could not import os for instance" + " %s on node %s" % + (instance, pnode_name)) else: # also checked in the prereq part - raise errors.ProgrammerError, ("Unknown OS initialization mode '%s'" - % self.op.mode) + raise errors.ProgrammerError("Unknown OS initialization mode '%s'" + % self.op.mode) if self.op.start: logger.Info("starting instance %s on node %s" % (instance, pnode_name)) feedback_fn("* starting instance...") if not rpc.call_instance_start(pnode_name, iobj, None): - raise errors.OpExecError, ("Could not start instance") + raise errors.OpExecError("Could not start instance") class LUConnectConsole(NoHooksLU): @@ -2760,8 +3099,8 @@ class LUConnectConsole(NoHooksLU): instance = self.cfg.GetInstanceInfo( self.cfg.ExpandInstanceName(self.op.instance_name)) if instance is None: - raise errors.OpPrereqError, ("Instance '%s' not known" % - self.op.instance_name) + raise errors.OpPrereqError("Instance '%s' not known" % + self.op.instance_name) self.instance = instance def Exec(self, feedback_fn): @@ -2773,16 +3112,22 @@ class LUConnectConsole(NoHooksLU): node_insts = rpc.call_instance_list([node])[node] if node_insts is False: - raise errors.OpExecError, ("Can't connect to node %s." % node) + raise errors.OpExecError("Can't connect to node %s." % node) if instance.name not in node_insts: - raise errors.OpExecError, ("Instance %s is not running." % instance.name) + raise errors.OpExecError("Instance %s is not running." % instance.name) logger.Debug("connecting to console of %s on %s" % (instance.name, node)) hyper = hypervisor.GetHypervisor() console_cmd = hyper.GetShellCommandForConsole(instance.name) - return node, console_cmd + # build ssh cmdline + argv = ["ssh", "-q", "-t"] + argv.extend(ssh.KNOWN_HOSTS_OPTS) + argv.extend(ssh.BATCH_MODE_OPTS) + argv.append(node) + argv.append(console_cmd) + return "ssh", argv class LUAddMDDRBDComponent(LogicalUnit): @@ -2817,33 +3162,33 @@ class LUAddMDDRBDComponent(LogicalUnit): instance = self.cfg.GetInstanceInfo( self.cfg.ExpandInstanceName(self.op.instance_name)) if instance is None: - raise errors.OpPrereqError, ("Instance '%s' not known" % - self.op.instance_name) + raise errors.OpPrereqError("Instance '%s' not known" % + self.op.instance_name) self.instance = instance remote_node = self.cfg.ExpandNodeName(self.op.remote_node) if remote_node is None: - raise errors.OpPrereqError, ("Node '%s' not known" % self.op.remote_node) + raise errors.OpPrereqError("Node '%s' not known" % self.op.remote_node) self.remote_node = remote_node if remote_node == instance.primary_node: - raise errors.OpPrereqError, ("The specified node is the primary node of" - " the instance.") + raise errors.OpPrereqError("The specified node is the primary node of" + " the instance.") if instance.disk_template != constants.DT_REMOTE_RAID1: - raise errors.OpPrereqError, ("Instance's disk layout is not" - " remote_raid1.") + raise errors.OpPrereqError("Instance's disk layout is not" + " remote_raid1.") for disk in instance.disks: if disk.iv_name == self.op.disk_name: break else: - raise errors.OpPrereqError, ("Can't find this device ('%s') in the" - " instance." % self.op.disk_name) + raise errors.OpPrereqError("Can't find this device ('%s') in the" + " instance." % self.op.disk_name) if len(disk.children) > 1: - raise errors.OpPrereqError, ("The device already has two slave" - " devices.\n" - "This would create a 3-disk raid1" - " which we don't allow.") + raise errors.OpPrereqError("The device already has two slave" + " devices.\n" + "This would create a 3-disk raid1" + " which we don't allow.") self.disk = disk def Exec(self, feedback_fn): @@ -2863,8 +3208,8 @@ class LUAddMDDRBDComponent(LogicalUnit): #HARDCODE if not _CreateBlockDevOnSecondary(self.cfg, remote_node, new_drbd, False, _GetInstanceInfoText(instance)): - raise errors.OpExecError, ("Failed to create new component on secondary" - " node %s" % remote_node) + raise errors.OpExecError("Failed to create new component on secondary" + " node %s" % remote_node) logger.Info("adding new mirror component on primary") #HARDCODE @@ -2873,13 +3218,13 @@ class LUAddMDDRBDComponent(LogicalUnit): # remove secondary dev self.cfg.SetDiskID(new_drbd, remote_node) rpc.call_blockdev_remove(remote_node, new_drbd) - raise errors.OpExecError, ("Failed to create volume on primary") + raise errors.OpExecError("Failed to create volume on primary") # the device exists now # call the primary node to add the mirror to md logger.Info("adding new mirror component to md") - if not rpc.call_blockdev_addchild(instance.primary_node, - disk, new_drbd): + if not rpc.call_blockdev_addchildren(instance.primary_node, + disk, [new_drbd]): logger.Error("Can't add mirror compoment to md!") self.cfg.SetDiskID(new_drbd, remote_node) if not rpc.call_blockdev_remove(remote_node, new_drbd): @@ -2887,7 +3232,7 @@ class LUAddMDDRBDComponent(LogicalUnit): self.cfg.SetDiskID(new_drbd, instance.primary_node) if not rpc.call_blockdev_remove(instance.primary_node, new_drbd): logger.Error("Can't rollback on primary") - raise errors.OpExecError, "Can't add mirror component to md array" + raise errors.OpExecError("Can't add mirror component to md array") disk.children.append(new_drbd) @@ -2931,28 +3276,29 @@ class LURemoveMDDRBDComponent(LogicalUnit): instance = self.cfg.GetInstanceInfo( self.cfg.ExpandInstanceName(self.op.instance_name)) if instance is None: - raise errors.OpPrereqError, ("Instance '%s' not known" % - self.op.instance_name) + raise errors.OpPrereqError("Instance '%s' not known" % + self.op.instance_name) self.instance = instance if instance.disk_template != constants.DT_REMOTE_RAID1: - raise errors.OpPrereqError, ("Instance's disk layout is not" - " remote_raid1.") + raise errors.OpPrereqError("Instance's disk layout is not" + " remote_raid1.") for disk in instance.disks: if disk.iv_name == self.op.disk_name: break else: - raise errors.OpPrereqError, ("Can't find this device ('%s') in the" - " instance." % self.op.disk_name) + raise errors.OpPrereqError("Can't find this device ('%s') in the" + " instance." % self.op.disk_name) for child in disk.children: - if child.dev_type == "drbd" and child.logical_id[2] == self.op.disk_id: + if (child.dev_type == constants.LD_DRBD7 and + child.logical_id[2] == self.op.disk_id): break else: - raise errors.OpPrereqError, ("Can't find the device with this port.") + raise errors.OpPrereqError("Can't find the device with this port.") if len(disk.children) < 2: - raise errors.OpPrereqError, ("Cannot remove the last component from" - " a mirror.") + raise errors.OpPrereqError("Cannot remove the last component from" + " a mirror.") self.disk = disk self.child = child if self.child.logical_id[0] == instance.primary_node: @@ -2970,9 +3316,9 @@ class LURemoveMDDRBDComponent(LogicalUnit): child = self.child logger.Info("remove mirror component") self.cfg.SetDiskID(disk, instance.primary_node) - if not rpc.call_blockdev_removechild(instance.primary_node, - disk, child): - raise errors.OpExecError, ("Can't remove child from mirror.") + if not rpc.call_blockdev_removechildren(instance.primary_node, + disk, [child]): + raise errors.OpExecError("Can't remove child from mirror.") for node in child.logical_id[:2]: self.cfg.SetDiskID(child, node) @@ -3016,18 +3362,18 @@ class LUReplaceDisks(LogicalUnit): instance = self.cfg.GetInstanceInfo( self.cfg.ExpandInstanceName(self.op.instance_name)) if instance is None: - raise errors.OpPrereqError, ("Instance '%s' not known" % - self.op.instance_name) + raise errors.OpPrereqError("Instance '%s' not known" % + self.op.instance_name) self.instance = instance if instance.disk_template != constants.DT_REMOTE_RAID1: - raise errors.OpPrereqError, ("Instance's disk layout is not" - " remote_raid1.") + raise errors.OpPrereqError("Instance's disk layout is not" + " remote_raid1.") if len(instance.secondary_nodes) != 1: - raise errors.OpPrereqError, ("The instance has a strange layout," - " expected one secondary but found %d" % - len(instance.secondary_nodes)) + raise errors.OpPrereqError("The instance has a strange layout," + " expected one secondary but found %d" % + len(instance.secondary_nodes)) remote_node = getattr(self.op, "remote_node", None) if remote_node is None: @@ -3035,11 +3381,11 @@ class LUReplaceDisks(LogicalUnit): else: remote_node = self.cfg.ExpandNodeName(remote_node) if remote_node is None: - raise errors.OpPrereqError, ("Node '%s' not known" % - self.op.remote_node) + raise errors.OpPrereqError("Node '%s' not known" % + self.op.remote_node) if remote_node == instance.primary_node: - raise errors.OpPrereqError, ("The specified node is the primary node of" - " the instance.") + raise errors.OpPrereqError("The specified node is the primary node of" + " the instance.") self.op.remote_node = remote_node def Exec(self, feedback_fn): @@ -3051,7 +3397,6 @@ class LUReplaceDisks(LogicalUnit): # start of work remote_node = self.op.remote_node cfg = self.cfg - vgname = cfg.GetVGName() for dev in instance.disks: size = dev.size lv_names = [".%s_%s" % (dev.iv_name, suf) for suf in ["data", "meta"]] @@ -3064,10 +3409,10 @@ class LUReplaceDisks(LogicalUnit): #HARDCODE if not _CreateBlockDevOnSecondary(cfg, remote_node, new_drbd, False, _GetInstanceInfoText(instance)): - raise errors.OpExecError, ("Failed to create new component on" - " secondary node %s\n" - "Full abort, cleanup manually!" % - remote_node) + raise errors.OpExecError("Failed to create new component on" + " secondary node %s\n" + "Full abort, cleanup manually!" % + remote_node) logger.Info("adding new mirror component on primary") #HARDCODE @@ -3082,8 +3427,8 @@ class LUReplaceDisks(LogicalUnit): # the device exists now # call the primary node to add the mirror to md logger.Info("adding new mirror component to md") - if not rpc.call_blockdev_addchild(instance.primary_node, dev, - new_drbd): + if not rpc.call_blockdev_addchildren(instance.primary_node, dev, + [new_drbd]): logger.Error("Can't add mirror compoment to md!") cfg.SetDiskID(new_drbd, remote_node) if not rpc.call_blockdev_remove(remote_node, new_drbd): @@ -3091,7 +3436,7 @@ class LUReplaceDisks(LogicalUnit): cfg.SetDiskID(new_drbd, instance.primary_node) if not rpc.call_blockdev_remove(instance.primary_node, new_drbd): logger.Error("Can't rollback on primary") - raise errors.OpExecError, ("Full abort, cleanup manually!!") + raise errors.OpExecError("Full abort, cleanup manually!!") dev.children.append(new_drbd) cfg.AddInstance(instance) @@ -3107,18 +3452,18 @@ class LUReplaceDisks(LogicalUnit): cfg.SetDiskID(dev, instance.primary_node) is_degr = rpc.call_blockdev_find(instance.primary_node, dev)[5] if is_degr: - raise errors.OpExecError, ("MD device %s is degraded!" % name) + raise errors.OpExecError("MD device %s is degraded!" % name) cfg.SetDiskID(new_drbd, instance.primary_node) is_degr = rpc.call_blockdev_find(instance.primary_node, new_drbd)[5] if is_degr: - raise errors.OpExecError, ("New drbd device %s is degraded!" % name) + raise errors.OpExecError("New drbd device %s is degraded!" % name) for name in iv_names: dev, child, new_drbd = iv_names[name] logger.Info("remove mirror %s component" % name) cfg.SetDiskID(dev, instance.primary_node) - if not rpc.call_blockdev_removechild(instance.primary_node, - dev, child): + if not rpc.call_blockdev_removechildren(instance.primary_node, + dev, [child]): logger.Error("Can't remove child from mirror, aborting" " *this device cleanup*.\nYou need to cleanup manually!!") continue @@ -3148,14 +3493,14 @@ class LUQueryInstanceData(NoHooksLU): """ if not isinstance(self.op.instances, list): - raise errors.OpPrereqError, "Invalid argument type 'instances'" + raise errors.OpPrereqError("Invalid argument type 'instances'") if self.op.instances: self.wanted_instances = [] names = self.op.instances for name in names: instance = self.cfg.GetInstanceInfo(self.cfg.ExpandInstanceName(name)) if instance is None: - raise errors.OpPrereqError, ("No such instance name '%s'" % name) + raise errors.OpPrereqError("No such instance name '%s'" % name) self.wanted_instances.append(instance) else: self.wanted_instances = [self.cfg.GetInstanceInfo(name) for name @@ -3169,7 +3514,7 @@ class LUQueryInstanceData(NoHooksLU): """ self.cfg.SetDiskID(dev, instance.primary_node) dev_pstatus = rpc.call_blockdev_find(instance.primary_node, dev) - if dev.dev_type == "drbd": + if dev.dev_type in constants.LDS_DRBD: # we change the snode then (otherwise we use the one passed in) if dev.logical_id[0] == instance.primary_node: snode = dev.logical_id[1] @@ -3228,6 +3573,7 @@ class LUQueryInstanceData(NoHooksLU): "memory": instance.memory, "nics": [(nic.mac, nic.ip, nic.bridge) for nic in instance.nics], "disks": disks, + "vcpus": instance.vcpus, } result[instance.name] = idict @@ -3235,37 +3581,6 @@ class LUQueryInstanceData(NoHooksLU): return result -class LUQueryNodeData(NoHooksLU): - """Logical unit for querying node data. - - """ - _OP_REQP = ["nodes"] - - def CheckPrereq(self): - """Check prerequisites. - - This only checks the optional node list against the existing names. - - """ - self.wanted_nodes = _GetWantedNodes(self, self.op.nodes) - - def Exec(self, feedback_fn): - """Compute and return the list of nodes. - - """ - ilist = [self.cfg.GetInstanceInfo(iname) for iname - in self.cfg.GetInstanceList()] - result = [] - for node in self.wanted_nodes: - result.append((node.name, node.primary_ip, node.secondary_ip, - [inst.name for inst in ilist - if inst.primary_node == node.name], - [inst.name for inst in ilist - if node.name in inst.secondary_nodes], - )) - return result - - class LUSetInstanceParms(LogicalUnit): """Modifies an instances's parameters. @@ -3311,24 +3626,24 @@ class LUSetInstanceParms(LogicalUnit): self.ip = getattr(self.op, "ip", None) self.bridge = getattr(self.op, "bridge", None) if [self.mem, self.vcpus, self.ip, self.bridge].count(None) == 4: - raise errors.OpPrereqError, ("No changes submitted") + raise errors.OpPrereqError("No changes submitted") if self.mem is not None: try: self.mem = int(self.mem) except ValueError, err: - raise errors.OpPrereqError, ("Invalid memory size: %s" % str(err)) + raise errors.OpPrereqError("Invalid memory size: %s" % str(err)) if self.vcpus is not None: try: self.vcpus = int(self.vcpus) except ValueError, err: - raise errors.OpPrereqError, ("Invalid vcpus number: %s" % str(err)) + raise errors.OpPrereqError("Invalid vcpus number: %s" % str(err)) if self.ip is not None: self.do_ip = True if self.ip.lower() == "none": self.ip = None else: if not utils.IsValidIP(self.ip): - raise errors.OpPrereqError, ("Invalid IP address '%s'." % self.ip) + raise errors.OpPrereqError("Invalid IP address '%s'." % self.ip) else: self.do_ip = False self.do_bridge = (self.bridge is not None) @@ -3336,8 +3651,8 @@ class LUSetInstanceParms(LogicalUnit): instance = self.cfg.GetInstanceInfo( self.cfg.ExpandInstanceName(self.op.instance_name)) if instance is None: - raise errors.OpPrereqError, ("No such instance name '%s'" % - self.op.instance_name) + raise errors.OpPrereqError("No such instance name '%s'" % + self.op.instance_name) self.op.instance_name = instance.name self.instance = instance return @@ -3388,7 +3703,7 @@ class LUQueryExports(NoHooksLU): that node. """ - return rpc.call_export_list([node.name for node in self.nodes]) + return rpc.call_export_list(self.nodes) class LUExportInstance(LogicalUnit): @@ -3423,16 +3738,16 @@ class LUExportInstance(LogicalUnit): instance_name = self.cfg.ExpandInstanceName(self.op.instance_name) self.instance = self.cfg.GetInstanceInfo(instance_name) if self.instance is None: - raise errors.OpPrereqError, ("Instance '%s' not found" % - self.op.instance_name) + raise errors.OpPrereqError("Instance '%s' not found" % + self.op.instance_name) # node verification dst_node_short = self.cfg.ExpandNodeName(self.op.target_node) self.dst_node = self.cfg.GetNodeInfo(dst_node_short) if self.dst_node is None: - raise errors.OpPrereqError, ("Destination node '%s' is unknown." % - self.op.target_node) + raise errors.OpPrereqError("Destination node '%s' is unknown." % + self.op.target_node) self.op.target_node = self.dst_node.name def Exec(self, feedback_fn): @@ -3461,7 +3776,7 @@ class LUExportInstance(LogicalUnit): logger.Error("could not snapshot block device %s on node %s" % (disk.logical_id[1], src_node)) else: - new_dev = objects.Disk(dev_type="lvm", size=disk.size, + new_dev = objects.Disk(dev_type=constants.LD_LV, size=disk.size, logical_id=(vgname, new_dev_name), physical_id=(vgname, new_dev_name), iv_name=disk.iv_name) @@ -3503,3 +3818,118 @@ class LUExportInstance(LogicalUnit): if not rpc.call_export_remove(node, instance.name): logger.Error("could not remove older export for instance %s" " on node %s" % (instance.name, node)) + + +class TagsLU(NoHooksLU): + """Generic tags LU. + + This is an abstract class which is the parent of all the other tags LUs. + + """ + def CheckPrereq(self): + """Check prerequisites. + + """ + if self.op.kind == constants.TAG_CLUSTER: + self.target = self.cfg.GetClusterInfo() + elif self.op.kind == constants.TAG_NODE: + name = self.cfg.ExpandNodeName(self.op.name) + if name is None: + raise errors.OpPrereqError("Invalid node name (%s)" % + (self.op.name,)) + self.op.name = name + self.target = self.cfg.GetNodeInfo(name) + elif self.op.kind == constants.TAG_INSTANCE: + name = self.cfg.ExpandInstanceName(self.op.name) + if name is None: + raise errors.OpPrereqError("Invalid instance name (%s)" % + (self.op.name,)) + self.op.name = name + self.target = self.cfg.GetInstanceInfo(name) + else: + raise errors.OpPrereqError("Wrong tag type requested (%s)" % + str(self.op.kind)) + + +class LUGetTags(TagsLU): + """Returns the tags of a given object. + + """ + _OP_REQP = ["kind", "name"] + + def Exec(self, feedback_fn): + """Returns the tag list. + + """ + return self.target.GetTags() + + +class LUAddTags(TagsLU): + """Sets a tag on a given object. + + """ + _OP_REQP = ["kind", "name", "tags"] + + def CheckPrereq(self): + """Check prerequisites. + + This checks the type and length of the tag name and value. + + """ + TagsLU.CheckPrereq(self) + for tag in self.op.tags: + objects.TaggableObject.ValidateTag(tag) + + def Exec(self, feedback_fn): + """Sets the tag. + + """ + try: + for tag in self.op.tags: + self.target.AddTag(tag) + except errors.TagError, err: + raise errors.OpExecError("Error while setting tag: %s" % str(err)) + try: + self.cfg.Update(self.target) + except errors.ConfigurationError: + raise errors.OpRetryError("There has been a modification to the" + " config file and the operation has been" + " aborted. Please retry.") + + +class LUDelTags(TagsLU): + """Delete a list of tags from a given object. + + """ + _OP_REQP = ["kind", "name", "tags"] + + def CheckPrereq(self): + """Check prerequisites. + + This checks that we have the given tag. + + """ + TagsLU.CheckPrereq(self) + for tag in self.op.tags: + objects.TaggableObject.ValidateTag(tag) + del_tags = frozenset(self.op.tags) + cur_tags = self.target.GetTags() + if not del_tags <= cur_tags: + diff_tags = del_tags - cur_tags + diff_names = ["'%s'" % tag for tag in diff_tags] + diff_names.sort() + raise errors.OpPrereqError("Tag(s) %s not found" % + (",".join(diff_names))) + + def Exec(self, feedback_fn): + """Remove the tag from the object. + + """ + for tag in self.op.tags: + self.target.RemoveTag(tag) + try: + self.cfg.Update(self.target) + except errors.ConfigurationError: + raise errors.OpRetryError("There has been a modification to the" + " config file and the operation has been" + " aborted. Please retry.")