from ganeti import objects
from ganeti import pathutils
from ganeti import vcluster
+from ganeti import ssconf
XEND_CONFIG_FILE = vcluster.AddNodePrefix("/etc/xen/xend-config.sxp")
# VM) to one physical CPU, using format 'cpu = "C"'
return "cpu = \"%s\"" % ",".join(map(str, all_cpu_mapping))
else:
+
def _GetCPUMap(vcpu):
if vcpu[0] == constants.CPU_PINNING_ALL_VAL:
cpu_map = constants.CPU_PINNING_ALL_XEN
kind=constants.CONS_SSH,
host=instance.primary_node,
user=constants.SSH_CONSOLE_USER,
- command=[pathutils.XM_CONSOLE_WRAPPER,
- instance.name])
+ command=[pathutils.XEN_CONSOLE_WRAPPER,
+ constants.XEN_CMD, instance.name])
def Verify(self):
"""Verify the hypervisor.
port = instance.hvparams[constants.HV_MIGRATION_PORT]
- if not netutils.TcpPing(target, port, live_port_needed=True):
+ if (constants.XEN_CMD == constants.XEN_CMD_XM and
+ not netutils.TcpPing(target, port, live_port_needed=True)):
raise errors.HypervisorError("Remote host %s not listening on port"
" %s, cannot migrate" % (target, port))
if live:
args.append("-l")
elif constants.XEN_CMD == constants.XEN_CMD_XL:
+ cluster_name = ssconf.SimpleStore().GetClusterName()
+ args.extend(["-s", constants.XL_SSH_CMD % cluster_name])
args.extend(["-C", self._ConfigFileName(instance.name)])
else:
raise errors.HypervisorError("Unsupported xen command: %s" %
constants.HV_REBOOT_BEHAVIOR:
hv_base.ParamInSet(True, constants.REBOOT_BEHAVIORS),
constants.HV_CPU_MASK: hv_base.OPT_MULTI_CPU_MASK_CHECK,
+ constants.HV_CPU_CAP: hv_base.NO_CHECK,
+ constants.HV_CPU_WEIGHT:
+ (False, lambda x: 0 < x < 65536, "invalid weight", None, None),
}
@classmethod
cpu_pinning = cls._CreateConfigCpus(hvp[constants.HV_CPU_MASK])
if cpu_pinning:
config.write("%s\n" % cpu_pinning)
+ cpu_cap = hvp[constants.HV_CPU_CAP]
+ if cpu_cap:
+ config.write("cpu_cap=%d\n" % cpu_cap)
+ cpu_weight = hvp[constants.HV_CPU_WEIGHT]
+ if cpu_weight:
+ config.write("cpu_weight=%d\n" % cpu_weight)
config.write("name = '%s'\n" % instance.name)
constants.HV_REBOOT_BEHAVIOR:
hv_base.ParamInSet(True, constants.REBOOT_BEHAVIORS),
constants.HV_CPU_MASK: hv_base.OPT_MULTI_CPU_MASK_CHECK,
+ constants.HV_CPU_CAP: hv_base.NO_CHECK,
+ constants.HV_CPU_WEIGHT:
+ (False, lambda x: 0 < x < 65535, "invalid weight", None, None),
}
@classmethod
cpu_pinning = cls._CreateConfigCpus(hvp[constants.HV_CPU_MASK])
if cpu_pinning:
config.write("%s\n" % cpu_pinning)
+ cpu_cap = hvp[constants.HV_CPU_CAP]
+ if cpu_cap:
+ config.write("cpu_cap=%d\n" % cpu_cap)
+ cpu_weight = hvp[constants.HV_CPU_WEIGHT]
+ if cpu_weight:
+ config.write("cpu_weight=%d\n" % cpu_weight)
config.write("name = '%s'\n" % instance.name)
if hvp[constants.HV_PAE]: