X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/c26724668d51d15b2592a3e34676af03cffca2c5..ac061be9ee8e66e0e93e86b607f19593bca8ee4a:/lib/hypervisor/hv_kvm.py diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py index 9baf279..e211475 100644 --- a/lib/hypervisor/hv_kvm.py +++ b/lib/hypervisor/hv_kvm.py @@ -48,32 +48,46 @@ class KVMHypervisor(hv_base.BaseHypervisor): _CONF_DIR = _ROOT_DIR + "/conf" # contains instances startup data _DIRS = [_ROOT_DIR, _PIDS_DIR, _CTRL_DIR, _CONF_DIR] - PARAMETERS = [ - constants.HV_KERNEL_PATH, - constants.HV_INITRD_PATH, - constants.HV_ROOT_PATH, - constants.HV_ACPI, - constants.HV_SERIAL_CONSOLE, - constants.HV_VNC_BIND_ADDRESS, - constants.HV_VNC_TLS, - constants.HV_VNC_X509, - constants.HV_VNC_X509_VERIFY, - constants.HV_CDROM_IMAGE_PATH, - constants.HV_BOOT_ORDER, - constants.HV_NIC_TYPE, - constants.HV_DISK_TYPE, - ] + PARAMETERS = { + constants.HV_KERNEL_PATH: hv_base.OPT_FILE_CHECK, + constants.HV_INITRD_PATH: hv_base.OPT_FILE_CHECK, + constants.HV_ROOT_PATH: hv_base.NO_CHECK, + constants.HV_KERNEL_ARGS: hv_base.NO_CHECK, + constants.HV_ACPI: hv_base.NO_CHECK, + constants.HV_SERIAL_CONSOLE: hv_base.NO_CHECK, + constants.HV_VNC_BIND_ADDRESS: \ + (False, lambda x: (utils.IsValidIP(x) or utils.IsAbsNormPath(x)), + "the VNC bind address must be either a valid IP address or an absolute" + " pathname", None, None), + constants.HV_VNC_TLS: hv_base.NO_CHECK, + constants.HV_VNC_X509: hv_base.OPT_DIR_CHECK, + constants.HV_VNC_X509_VERIFY: hv_base.NO_CHECK, + constants.HV_CDROM_IMAGE_PATH: hv_base.OPT_FILE_CHECK, + constants.HV_BOOT_ORDER: \ + hv_base.ParamInSet(True, constants.HT_KVM_VALID_BO_TYPES), + constants.HV_NIC_TYPE: \ + hv_base.ParamInSet(True, constants.HT_KVM_VALID_NIC_TYPES), + constants.HV_DISK_TYPE: \ + hv_base.ParamInSet(True, constants.HT_KVM_VALID_DISK_TYPES), + constants.HV_USB_MOUSE: \ + hv_base.ParamInSet(False, constants.HT_KVM_VALID_MOUSE_TYPES), + } _MIGRATION_STATUS_RE = re.compile('Migration\s+status:\s+(\w+)', re.M | re.I) + _KVM_NETWORK_SCRIPT = constants.SYSCONFDIR + "/ganeti/kvm-vif-bridge" + + ANCILLARY_FILES = [ + _KVM_NETWORK_SCRIPT, + ] + def __init__(self): hv_base.BaseHypervisor.__init__(self) # Let's make sure the directories we need exist, even if the RUN_DIR lives # in a tmpfs filesystem or has been otherwise wiped out. - for mydir in self._DIRS: - if not os.path.exists(mydir): - os.mkdir(mydir) + dirs = [(dir, constants.RUN_DIRS_MODE) for dir in self._DIRS] + utils.EnsureDirs(dirs) def _InstancePidAlive(self, instance_name): """Returns the instance pid and pidfile @@ -106,6 +120,16 @@ class KVMHypervisor(hv_base.BaseHypervisor): """ return '%s/%s.runtime' % (cls._CONF_DIR, instance_name) + @classmethod + def _RemoveInstanceRuntimeFiles(cls, pidfile, instance_name): + """Removes an instance's rutime sockets/files. + + """ + utils.RemoveFile(pidfile) + utils.RemoveFile(cls._InstanceMonitor(instance_name)) + utils.RemoveFile(cls._InstanceSerial(instance_name)) + utils.RemoveFile(cls._InstanceKVMRuntime(instance_name)) + def _WriteNetScript(self, instance, seq, nic): """Write a script to connect a net interface to the proper bridge. @@ -130,9 +154,9 @@ class KVMHypervisor(hv_base.BaseHypervisor): script.write("export BRIDGE=%s\n" % nic.bridge) script.write("export INTERFACE=$1\n") # TODO: make this configurable at ./configure time - script.write("if [ -x /etc/ganeti/kvm-vif-bridge ]; then\n") + script.write("if [ -x '%s' ]; then\n" % self._KVM_NETWORK_SCRIPT) script.write(" # Execute the user-specific vif file\n") - script.write(" /etc/ganeti/kvm-vif-bridge\n") + script.write(" %s\n" % self._KVM_NETWORK_SCRIPT) script.write("else\n") script.write(" # Connect the interface to the bridge\n") script.write(" /sbin/ifconfig $INTERFACE 0.0.0.0 up\n") @@ -193,9 +217,9 @@ class KVMHypervisor(hv_base.BaseHypervisor): while arg_list: arg = arg_list.pop(0) if arg == '-m': - memory = arg_list.pop(0) + memory = int(arg_list.pop(0)) elif arg == '-smp': - vcpus = arg_list.pop(0) + vcpus = int(arg_list.pop(0)) return (instance_name, pid, memory, vcpus, stat, times) @@ -218,7 +242,7 @@ class KVMHypervisor(hv_base.BaseHypervisor): return data - def _GenerateKVMRuntime(self, instance, block_devices, extra_args): + def _GenerateKVMRuntime(self, instance, block_devices): """Generate KVM information to start an instance. """ @@ -234,10 +258,15 @@ class KVMHypervisor(hv_base.BaseHypervisor): if not instance.hvparams[constants.HV_ACPI]: kvm_cmd.extend(['-no-acpi']) - boot_disk = (instance.hvparams[constants.HV_BOOT_ORDER] == "disk") - boot_cdrom = (instance.hvparams[constants.HV_BOOT_ORDER] == "cdrom") + hvp = instance.hvparams + boot_disk = hvp[constants.HV_BOOT_ORDER] == constants.HT_BO_DISK + boot_cdrom = hvp[constants.HV_BOOT_ORDER] == constants.HT_BO_CDROM + boot_network = hvp[constants.HV_BOOT_ORDER] == constants.HT_BO_NETWORK + + if boot_network: + kvm_cmd.extend(['-boot', 'n']) - disk_type = instance.hvparams[constants.HV_DISK_TYPE] + disk_type = hvp[constants.HV_DISK_TYPE] if disk_type == constants.HT_DISK_PARAVIRTUAL: if_val = ',if=virtio' else: @@ -250,6 +279,7 @@ class KVMHypervisor(hv_base.BaseHypervisor): if boot_disk: kvm_cmd.extend(['-boot', 'c']) boot_val = ',boot=on' + # We only boot from the first disk boot_disk = False else: boot_val = '' @@ -257,7 +287,7 @@ class KVMHypervisor(hv_base.BaseHypervisor): drive_val = 'file=%s,format=raw%s%s' % (dev_path, if_val, boot_val) kvm_cmd.extend(['-drive', drive_val]) - iso_image = instance.hvparams[constants.HV_CDROM_IMAGE_PATH] + iso_image = hvp[constants.HV_CDROM_IMAGE_PATH] if iso_image: options = ',format=raw,media=cdrom' if boot_cdrom: @@ -268,29 +298,33 @@ class KVMHypervisor(hv_base.BaseHypervisor): drive_val = 'file=%s%s' % (iso_image, options) kvm_cmd.extend(['-drive', drive_val]) - kernel_path = instance.hvparams[constants.HV_KERNEL_PATH] + kernel_path = hvp[constants.HV_KERNEL_PATH] if kernel_path: kvm_cmd.extend(['-kernel', kernel_path]) - initrd_path = instance.hvparams[constants.HV_INITRD_PATH] + initrd_path = hvp[constants.HV_INITRD_PATH] if initrd_path: kvm_cmd.extend(['-initrd', initrd_path]) - root_append = 'root=%s ro' % instance.hvparams[constants.HV_ROOT_PATH] - if instance.hvparams[constants.HV_SERIAL_CONSOLE]: - kvm_cmd.extend(['-append', 'console=ttyS0,38400 %s' % root_append]) - else: - kvm_cmd.extend(['-append', root_append]) + root_append = ['root=%s' % hvp[constants.HV_ROOT_PATH], + hvp[constants.HV_KERNEL_ARGS]] + if hvp[constants.HV_SERIAL_CONSOLE]: + root_append.append('console=ttyS0,38400') + kvm_cmd.extend(['-append', ' '.join(root_append)]) + + mouse_type = hvp[constants.HV_USB_MOUSE] + if mouse_type: + kvm_cmd.extend(['-usb']) + kvm_cmd.extend(['-usbdevice', mouse_type]) # FIXME: handle vnc password - vnc_bind_address = instance.hvparams[constants.HV_VNC_BIND_ADDRESS] + vnc_bind_address = hvp[constants.HV_VNC_BIND_ADDRESS] if vnc_bind_address: - kvm_cmd.extend(['-usbdevice', 'tablet']) if utils.IsValidIP(vnc_bind_address): if instance.network_port > constants.VNC_BASE_PORT: display = instance.network_port - constants.VNC_BASE_PORT if vnc_bind_address == '0.0.0.0': vnc_arg = ':%d' % (display) else: - vnc_arg = '%s:%d' % (constants.HV_VNC_BIND_ADDRESS, display) + vnc_arg = '%s:%d' % (vnc_bind_address, display) else: logging.error("Network port is not a valid VNC display (%d < %d)." " Not starting VNC" % @@ -301,14 +335,14 @@ class KVMHypervisor(hv_base.BaseHypervisor): # Only allow tls and other option when not binding to a file, for now. # kvm/qemu gets confused otherwise about the filename to use. vnc_append = '' - if instance.hvparams[constants.HV_VNC_TLS]: + if hvp[constants.HV_VNC_TLS]: vnc_append = '%s,tls' % vnc_append - if instance.hvparams[constants.HV_VNC_X509_VERIFY]: + if hvp[constants.HV_VNC_X509_VERIFY]: vnc_append = '%s,x509verify=%s' % (vnc_append, - instance.hvparams[constants.HV_VNC_X509]) - elif instance.hvparams[constants.HV_VNC_X509]: + hvp[constants.HV_VNC_X509]) + elif hvp[constants.HV_VNC_X509]: vnc_append = '%s,x509=%s' % (vnc_append, - instance.hvparams[constants.HV_VNC_X509]) + hvp[constants.HV_VNC_X509]) vnc_arg = '%s%s' % (vnc_arg, vnc_append) else: @@ -321,8 +355,9 @@ class KVMHypervisor(hv_base.BaseHypervisor): monitor_dev = 'unix:%s,server,nowait' % \ self._InstanceMonitor(instance.name) kvm_cmd.extend(['-monitor', monitor_dev]) - if instance.hvparams[constants.HV_SERIAL_CONSOLE]: - serial_dev = 'unix:%s,server,nowait' % self._InstanceSerial(instance.name) + if hvp[constants.HV_SERIAL_CONSOLE]: + serial_dev = ('unix:%s,server,nowait' % + self._InstanceSerial(instance.name)) kvm_cmd.extend(['-serial', serial_dev]) else: kvm_cmd.extend(['-serial', 'none']) @@ -330,7 +365,7 @@ class KVMHypervisor(hv_base.BaseHypervisor): # Save the current instance nics, but defer their expansion as parameters, # as we'll need to generate executable temp files for them. kvm_nics = instance.nics - hvparams = instance.hvparams + hvparams = hvp return (kvm_cmd, kvm_nics, hvparams) @@ -393,8 +428,14 @@ class KVMHypervisor(hv_base.BaseHypervisor): if not kvm_nics: kvm_cmd.extend(['-net', 'none']) else: + nic_type = hvparams[constants.HV_NIC_TYPE] + if nic_type == constants.HT_NIC_PARAVIRTUAL: + nic_model = "model=virtio" + else: + nic_model = "model=%s" % nic_type + for nic_seq, nic in enumerate(kvm_nics): - nic_val = "nic,macaddr=%s,model=virtio" % nic.mac + nic_val = "nic,macaddr=%s,%s" % (nic.mac, nic_model) script = self._WriteNetScript(instance, nic_seq, nic) kvm_cmd.extend(['-net', nic_val]) kvm_cmd.extend(['-net', 'tap,script=%s' % script]) @@ -417,7 +458,7 @@ class KVMHypervisor(hv_base.BaseHypervisor): for filename in temp_files: utils.RemoveFile(filename) - def StartInstance(self, instance, block_devices, extra_args): + def StartInstance(self, instance, block_devices): """Start an instance. """ @@ -426,7 +467,7 @@ class KVMHypervisor(hv_base.BaseHypervisor): raise errors.HypervisorError("Failed to start instance %s: %s" % (instance.name, "already running")) - kvm_runtime = self._GenerateKVMRuntime(instance, block_devices, extra_args) + kvm_runtime = self._GenerateKVMRuntime(instance, block_devices) self._SaveKVMRuntime(instance, kvm_runtime) self._ExecuteKVMRuntime(instance, kvm_runtime) @@ -442,7 +483,8 @@ class KVMHypervisor(hv_base.BaseHypervisor): if result.failed: msg = ("Failed to send command '%s' to instance %s." " output: %s, error: %s, fail_reason: %s" % - (instance.name, result.stdout, result.stderr, result.fail_reason)) + (command, instance_name, + result.stdout, result.stderr, result.fail_reason)) raise errors.HypervisorError(msg) return result @@ -473,10 +515,7 @@ class KVMHypervisor(hv_base.BaseHypervisor): self._RetryInstancePowerdown(instance, pid) if not utils.IsProcessAlive(pid): - utils.RemoveFile(pidfile) - utils.RemoveFile(self._InstanceMonitor(instance.name)) - utils.RemoveFile(self._InstanceSerial(instance.name)) - utils.RemoveFile(self._InstanceKVMRuntime(instance.name)) + self._RemoveInstanceRuntimeFiles(pidfile, instance.name) return True else: return False @@ -591,65 +630,20 @@ class KVMHypervisor(hv_base.BaseHypervisor): time.sleep(2) utils.KillProcess(pid) - utils.RemoveFile(pidfile) - utils.RemoveFile(self._InstanceMonitor(instance_name)) - utils.RemoveFile(self._InstanceSerial(instance_name)) - utils.RemoveFile(self._InstanceKVMRuntime(instance_name)) + self._RemoveInstanceRuntimeFiles(pidfile, instance.name) def GetNodeInfo(self): """Return information about the node. + This is just a wrapper over the base GetLinuxNodeInfo method. + @return: a dict with the following keys (values in MiB): - memory_total: the total memory size on the node - memory_free: the available memory on the node for instances - memory_dom0: the memory used by the node itself, if available """ - # global ram usage from the xm info command - # memory : 3583 - # free_memory : 747 - # note: in xen 3, memory has changed to total_memory - try: - fh = file("/proc/meminfo") - try: - data = fh.readlines() - finally: - fh.close() - except EnvironmentError, err: - raise errors.HypervisorError("Failed to list node info: %s" % err) - - result = {} - sum_free = 0 - for line in data: - splitfields = line.split(":", 1) - - if len(splitfields) > 1: - key = splitfields[0].strip() - val = splitfields[1].strip() - if key == 'MemTotal': - result['memory_total'] = int(val.split()[0])/1024 - elif key in ('MemFree', 'Buffers', 'Cached'): - sum_free += int(val.split()[0])/1024 - elif key == 'Active': - result['memory_dom0'] = int(val.split()[0])/1024 - result['memory_free'] = sum_free - - cpu_total = 0 - try: - fh = open("/proc/cpuinfo") - try: - cpu_total = len(re.findall("(?m)^processor\s*:\s*[0-9]+\s*$", - fh.read())) - finally: - fh.close() - except EnvironmentError, err: - raise errors.HypervisorError("Failed to list node info: %s" % err) - result['cpu_total'] = cpu_total - # FIXME: export correct data here - result['cpu_nodes'] = 1 - result['cpu_sockets'] = 1 - - return result + return self.GetLinuxNodeInfo() @classmethod def GetShellCommandForConsole(cls, instance, hvparams, beparams): @@ -698,9 +692,6 @@ class KVMHypervisor(hv_base.BaseHypervisor): def CheckParameterSyntax(cls, hvparams): """Check the given parameters for validity. - For the KVM hypervisor, this only check the existence of the - kernel. - @type hvparams: dict @param hvparams: dictionary with parameter names/value @raise errors.HypervisorError: when a parameter is not valid @@ -710,95 +701,30 @@ class KVMHypervisor(hv_base.BaseHypervisor): kernel_path = hvparams[constants.HV_KERNEL_PATH] if kernel_path: - if not os.path.isabs(hvparams[constants.HV_KERNEL_PATH]): - raise errors.HypervisorError("The kernel path must be an absolute path" - ", if defined") - if not hvparams[constants.HV_ROOT_PATH]: - raise errors.HypervisorError("Need a root partition for the instance" - ", if a kernel is defined") + raise errors.HypervisorError("Need a root partition for the instance," + " if a kernel is defined") - if hvparams[constants.HV_INITRD_PATH]: - if not os.path.isabs(hvparams[constants.HV_INITRD_PATH]): - raise errors.HypervisorError("The initrd path must an absolute path" - ", if defined") - - vnc_bind_address = hvparams[constants.HV_VNC_BIND_ADDRESS] - if vnc_bind_address: - if not utils.IsValidIP(vnc_bind_address): - if not os.path.isabs(vnc_bind_address): - raise errors.HypervisorError("The VNC bind address must be either" - " a valid IP address or an absolute" - " pathname. '%s' given" % - vnc_bind_address) - - if hvparams[constants.HV_VNC_X509_VERIFY] and \ - not hvparams[constants.HV_VNC_X509]: - raise errors.HypervisorError("%s must be defined, if %s is" % - (constants.HV_VNC_X509, - constants.HV_VNC_X509_VERIFY)) - - if hvparams[constants.HV_VNC_X509]: - if not os.path.isabs(hvparams[constants.HV_VNC_X509]): - raise errors.HypervisorError("The vnc x509 path must an absolute path" - ", if defined") - - iso_path = hvparams[constants.HV_CDROM_IMAGE_PATH] - if iso_path and not os.path.isabs(iso_path): - raise errors.HypervisorError("The path to the CDROM image must be" - " an absolute path, if defined") + if (hvparams[constants.HV_VNC_X509_VERIFY] and + not hvparams[constants.HV_VNC_X509]): + raise errors.HypervisorError("%s must be defined, if %s is" % + (constants.HV_VNC_X509, + constants.HV_VNC_X509_VERIFY)) boot_order = hvparams[constants.HV_BOOT_ORDER] - if boot_order not in ('cdrom', 'disk'): - raise errors.HypervisorError("The boot order must be 'cdrom' or 'disk'") - - if boot_order == 'cdrom' and not iso_path: - raise errors.HypervisorError("Cannot boot from cdrom without an ISO path") - - nic_type = hvparams[constants.HV_NIC_TYPE] - if nic_type not in constants.HT_KVM_VALID_NIC_TYPES: - raise errors.HypervisorError("Invalid NIC type %s specified for the KVM" - " hypervisor. Please choose one of: %s" % - (nic_type, - constants.HT_KVM_VALID_NIC_TYPES)) - - disk_type = hvparams[constants.HV_DISK_TYPE] - if disk_type not in constants.HT_KVM_VALID_DISK_TYPES: - raise errors.HypervisorError("Invalid disk type %s specified for the KVM" - " hypervisor. Please choose one of: %s" % - (disk_type, - constants.HT_KVM_VALID_DISK_TYPES)) - - def ValidateParameters(self, hvparams): - """Check the given parameters for validity. - - For the KVM hypervisor, this checks the existence of the - kernel. - """ - super(KVMHypervisor, self).ValidateParameters(hvparams) + if (boot_order == constants.HT_BO_CDROM and + not hvparams[constants.HV_CDROM_IMAGE_PATH]): + raise errors.HypervisorError("Cannot boot from cdrom without an" + " ISO path") + if (boot_order == constants.HT_BO_NETWORK and + hvparams[constants.HV_NIC_TYPE] == constants.HT_NIC_PARAVIRTUAL): + raise errors.HypervisorError("Cannot boot from a paravirtual NIC. Please" + " change the NIC type.") - kernel_path = hvparams[constants.HV_KERNEL_PATH] - if kernel_path and not os.path.isfile(kernel_path): - raise errors.HypervisorError("Instance kernel '%s' not found or" - " not a file" % kernel_path) - initrd_path = hvparams[constants.HV_INITRD_PATH] - if initrd_path and not os.path.isfile(initrd_path): - raise errors.HypervisorError("Instance initrd '%s' not found or" - " not a file" % initrd_path) + @classmethod + def PowercycleNode(cls): + """KVM powercycle, just a wrapper over Linux powercycle. - vnc_bind_address = hvparams[constants.HV_VNC_BIND_ADDRESS] - if vnc_bind_address and not utils.IsValidIP(vnc_bind_address) and \ - not os.path.isdir(vnc_bind_address): - raise errors.HypervisorError("Instance vnc bind address must be either" - " an ip address or an existing directory") - - vnc_x509 = hvparams[constants.HV_VNC_X509] - if vnc_x509 and not os.path.isdir(vnc_x509): - raise errors.HypervisorError("Instance vnc x509 path '%s' not found" - " or not a directory" % vnc_x509) - - iso_path = hvparams[constants.HV_CDROM_IMAGE_PATH] - if iso_path and not os.path.isfile(iso_path): - raise errors.HypervisorError("Instance cdrom image '%s' not found or" - " not a file" % iso_path) + """ + cls.LinuxPowercycle()