#
#
-# Copyright (C) 2006, 2007, 2008, 2009, 2010 Google Inc.
+# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Google Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
from ganeti.hypervisor import hv_base
from ganeti import netutils
from ganeti import objects
+from ganeti import pathutils
XEND_CONFIG_FILE = "/etc/xen/xend-config.sxp"
XL_CONFIG_FILE = "/etc/xen/xl.conf"
VIF_BRIDGE_SCRIPT = "/etc/xen/scripts/vif-bridge"
+_DOM0_NAME = "Domain-0"
class XenHypervisor(hv_base.BaseHypervisor):
return "/etc/xen/%s" % instance_name
@classmethod
- def _WriteConfigFile(cls, instance, block_devices):
+ def _WriteConfigFile(cls, instance, startup_memory, block_devices):
"""Write the Xen config file for the instance.
"""
This version of the function just writes the config file from static data.
"""
- utils.WriteFile(XenHypervisor._ConfigFileName(instance_name), data=data)
+ # just in case it exists
+ utils.RemoveFile("/etc/xen/auto/%s" % instance_name)
+ cfg_file = XenHypervisor._ConfigFileName(instance_name)
+ try:
+ utils.WriteFile(cfg_file, data=data)
+ except EnvironmentError, err:
+ raise errors.HypervisorError("Cannot write Xen instance configuration"
+ " file %s: %s" % (cfg_file, err))
@staticmethod
def _ReadConfigFile(instance_name):
" line: %s, error: %s" % (line, err))
# skip the Domain-0 (optional)
- if include_node or data[0] != "Domain-0":
+ if include_node or data[0] != _DOM0_NAME:
result.append(data)
return result
@return: tuple (name, id, memory, vcpus, stat, times)
"""
- xm_list = self._GetXMList(instance_name == "Domain-0")
+ xm_list = self._GetXMList(instance_name == _DOM0_NAME)
result = None
for data in xm_list:
if data[0] == instance_name:
"""Start an instance.
"""
- self._WriteConfigFile(instance, block_devices)
+ startup_memory = self._InstanceStartupMemory(instance)
+ self._WriteConfigFile(instance, startup_memory, block_devices)
cmd = [constants.XEN_CMD, "create"]
if startup_paused:
cmd.extend(["-p"])
" did not reboot in the expected interval" %
(instance.name, ))
+ def BalloonInstanceMemory(self, instance, mem):
+ """Balloon an instance memory to a certain value.
+
+ @type instance: L{objects.Instance}
+ @param instance: instance to be accepted
+ @type mem: int
+ @param mem: actual memory size to use for instance runtime
+
+ """
+ cmd = [constants.XEN_CMD, "mem-set", instance.name, mem]
+ result = utils.RunCmd(cmd)
+ if result.failed:
+ raise errors.HypervisorError("Failed to balloon instance %s: %s (%s)" %
+ (instance.name, result.fail_reason,
+ result.output))
+ cmd = ["sed", "-ie", "s/^memory.*$/memory = %s/" % mem]
+ cmd.append(XenHypervisor._ConfigFileName(instance.name))
+ result = utils.RunCmd(cmd)
+ if result.failed:
+ raise errors.HypervisorError("Failed to update memory for %s: %s (%s)" %
+ (instance.name, result.fail_reason,
+ result.output))
+
def GetNodeInfo(self):
"""Return information about the node.
- hv_version: the hypervisor version in the form (major, minor)
"""
- # note: in xen 3, memory has changed to total_memory
result = utils.RunCmd([constants.XEN_CMD, "info"])
if result.failed:
logging.error("Can't run 'xm info' (%s): %s", result.fail_reason,
result = {}
cores_per_socket = threads_per_core = nr_cpus = None
xen_major, xen_minor = None, None
+ memory_total = None
+ memory_free = None
+
for line in xmoutput:
splitfields = line.split(":", 1)
if len(splitfields) > 1:
key = splitfields[0].strip()
val = splitfields[1].strip()
+
+ # note: in xen 3, memory has changed to total_memory
if key == "memory" or key == "total_memory":
- result["memory_total"] = int(val)
+ memory_total = int(val)
elif key == "free_memory":
- result["memory_free"] = int(val)
+ memory_free = int(val)
elif key == "nr_cpus":
nr_cpus = result["cpu_total"] = int(val)
elif key == "nr_nodes":
elif key == "xen_minor":
xen_minor = int(val)
- if (cores_per_socket is not None and
- threads_per_core is not None and nr_cpus is not None):
+ if None not in [cores_per_socket, threads_per_core, nr_cpus]:
result["cpu_sockets"] = nr_cpus / (cores_per_socket * threads_per_core)
- dom0_info = self.GetInstanceInfo("Domain-0")
- if dom0_info is not None:
- result["memory_dom0"] = dom0_info[2]
+ total_instmem = 0
+ for (name, _, mem, vcpus, _, _) in self._GetXMList(True):
+ if name == _DOM0_NAME:
+ result["memory_dom0"] = mem
+ result["dom0_cpus"] = vcpus
+
+ # Include Dom0 in total memory usage
+ total_instmem += mem
+
+ if memory_free is not None:
+ result["memory_free"] = memory_free
+
+ if memory_total is not None:
+ result["memory_total"] = memory_total
+
+ # Calculate memory used by hypervisor
+ if None not in [memory_total, memory_free, total_instmem]:
+ result["memory_hv"] = memory_total - memory_free - total_instmem
if not (xen_major is None or xen_minor is None):
result[constants.HV_NODEINFO_KEY_VERSION] = (xen_major, xen_minor)
kind=constants.CONS_SSH,
host=instance.primary_node,
user=constants.GANETI_RUNAS,
- command=[constants.XM_CONSOLE_WRAPPER,
+ command=[pathutils.XM_CONSOLE_WRAPPER,
instance.name])
def Verify(self):
" %s, cannot migrate" % (target, port))
# FIXME: migrate must be upgraded for transitioning to "xl" (xen 4.1).
- # -l doesn't exist anymore
- # -p doesn't exist anymore
- # -C config_file must be passed
+ # This should be reworked in Ganeti 2.7
# ssh must recognize the key of the target host for the migration
- args = [constants.XEN_CMD, "migrate", "-p", "%d" % port]
- if live:
- args.append("-l")
+ args = [constants.XEN_CMD, "migrate"]
+ if constants.XEN_CMD == constants.XEN_CMD_XM:
+ args.extend(["-p", "%d" % port])
+ if live:
+ args.append("-l")
+ elif constants.XEN_CMD == constants.XEN_CMD_XL:
+ args.extend(["-C", self._ConfigFileName(instance.name)])
+ else:
+ raise errors.HypervisorError("Unsupported xen command: %s" %
+ constants.XEN_CMD)
+
args.extend([instance.name, target])
result = utils.RunCmd(args)
if result.failed:
}
@classmethod
- def _WriteConfigFile(cls, instance, block_devices):
+ def _WriteConfigFile(cls, instance, startup_memory, block_devices):
"""Write the Xen config file for the instance.
"""
config.write("ramdisk = '%s'\n" % initrd_path)
# rest of the settings
- config.write("memory = %d\n" % instance.beparams[constants.BE_MAXMEM])
+ config.write("memory = %d\n" % startup_memory)
+ config.write("maxmem = %d\n" % instance.beparams[constants.BE_MAXMEM])
config.write("vcpus = %d\n" % instance.beparams[constants.BE_VCPUS])
cpu_pinning = cls._CreateConfigCpus(hvp[constants.HV_CPU_MASK])
if cpu_pinning:
config.write("on_reboot = 'destroy'\n")
config.write("on_crash = 'restart'\n")
config.write("extra = '%s'\n" % hvp[constants.HV_KERNEL_ARGS])
- # just in case it exists
- utils.RemoveFile("/etc/xen/auto/%s" % instance.name)
- try:
- utils.WriteFile(cls._ConfigFileName(instance.name),
- data=config.getvalue())
- except EnvironmentError, err:
- raise errors.HypervisorError("Cannot write Xen instance confile"
- " file %s: %s" %
- (cls._ConfigFileName(instance.name), err))
+ cls._WriteConfigFileStatic(instance.name, config.getvalue())
return True
"""Xen HVM hypervisor interface"""
ANCILLARY_FILES = XenHypervisor.ANCILLARY_FILES + [
- constants.VNC_PASSWORD_FILE,
+ pathutils.VNC_PASSWORD_FILE,
]
ANCILLARY_FILES_OPT = XenHypervisor.ANCILLARY_FILES_OPT + [
- constants.VNC_PASSWORD_FILE,
+ pathutils.VNC_PASSWORD_FILE,
]
PARAMETERS = {
constants.HV_USE_LOCALTIME: hv_base.NO_CHECK,
# TODO: Add a check for the blockdev prefix (matching [a-z:] or similar).
constants.HV_BLOCKDEV_PREFIX: hv_base.NO_CHECK,
+ # Add PCI passthrough
+ constants.HV_PASSTHROUGH: hv_base.NO_CHECK,
constants.HV_REBOOT_BEHAVIOR:
hv_base.ParamInSet(True, constants.REBOOT_BEHAVIORS),
constants.HV_CPU_MASK: hv_base.OPT_MULTI_CPU_MASK_CHECK,
}
@classmethod
- def _WriteConfigFile(cls, instance, block_devices):
+ def _WriteConfigFile(cls, instance, startup_memory, block_devices):
"""Create a Xen 3.1 HVM config file.
"""
config.write("kernel = '%s'\n" % kpath)
config.write("builder = 'hvm'\n")
- config.write("memory = %d\n" % instance.beparams[constants.BE_MAXMEM])
+ config.write("memory = %d\n" % startup_memory)
+ config.write("maxmem = %d\n" % instance.beparams[constants.BE_MAXMEM])
config.write("vcpus = %d\n" % instance.beparams[constants.BE_VCPUS])
cpu_pinning = cls._CreateConfigCpus(hvp[constants.HV_CPU_MASK])
if cpu_pinning:
disk_data.append(iso)
config.write("disk = [%s]\n" % (",".join(disk_data)))
-
+ # Add PCI passthrough
+ pci_pass_arr = []
+ pci_pass = hvp[constants.HV_PASSTHROUGH]
+ if pci_pass:
+ pci_pass_arr = pci_pass.split(";")
+ config.write("pci = %s\n" % pci_pass_arr)
config.write("on_poweroff = 'destroy'\n")
if hvp[constants.HV_REBOOT_BEHAVIOR] == constants.INSTANCE_REBOOT_ALLOWED:
config.write("on_reboot = 'restart'\n")
else:
config.write("on_reboot = 'destroy'\n")
config.write("on_crash = 'restart'\n")
- # just in case it exists
- utils.RemoveFile("/etc/xen/auto/%s" % instance.name)
- try:
- utils.WriteFile(cls._ConfigFileName(instance.name),
- data=config.getvalue())
- except EnvironmentError, err:
- raise errors.HypervisorError("Cannot write Xen instance confile"
- " file %s: %s" %
- (cls._ConfigFileName(instance.name), err))
+ cls._WriteConfigFileStatic(instance.name, config.getvalue())
return True
projects / ganeti-local / blobdiff