Commit 97cd9092 authored by Dimitris Aragiorgis's avatar Dimitris Aragiorgis Committed by Thomas Thrainer
Browse files

Helper methods that check for hotplug support



Hotplug is currently *not* supported for:

 - KVM < 1.0
 - existing devices in the cluster
 - python-fdsend module is not installed (NIC hotplug)
 - chroot (Disk hotplug)
 - security mode other than None (Disk hotplug)

For the above reasons raise HotplugError exception and
let masterd handle it.

TODO: modify CallHotplugCommand() so that it parses
monitor output and reports whether the command
succeeded or not.
Signed-off-by: default avatarDimitris Aragiorgis <dimara@grnet.gr>
Signed-off-by: default avatarThomas Thrainer <thomasth@google.com>
Reviewed-by: default avatarThomas Thrainer <thomasth@google.com>
parent a7ccf635
......@@ -42,6 +42,10 @@ try:
import affinity # pylint: disable=F0401
except ImportError:
affinity = None
try:
import fdsend # pylint: disable=F0401
except ImportError:
fdsend = None
from ganeti import utils
from ganeti import constants
......@@ -1954,6 +1958,49 @@ class KVMHypervisor(hv_base.BaseHypervisor):
dev.pci = int(free)
def HotplugSupported(self, instance, action, dev_type):
"""Check if hotplug is supported.
Hotplug is *not* supported in case of:
- qemu versions < 1.0
- security models and chroot (disk hotplug)
- fdsend module is missing (nic hot-add)
@raise errors.HypervisorError: in previous cases
"""
output = self._CallMonitorCommand(instance.name, self._INFO_VERSION_CMD)
# TODO: search for netdev_add, drive_add, device_add.....
match = self._INFO_VERSION_RE.search(output.stdout)
if not match:
raise errors.HotplugError("Try hotplug only in running instances.")
v_major, v_min, _, _ = match.groups()
if (v_major, v_min) < (1, 0):
raise errors.HotplugError("Hotplug not supported for qemu versions < 1.0")
if dev_type == constants.HOTPLUG_TARGET_DISK:
hvp = instance.hvparams
security_model = hvp[constants.HV_SECURITY_MODEL]
use_chroot = hvp[constants.HV_KVM_USE_CHROOT]
if use_chroot:
raise errors.HotplugError("Disk hotplug is not supported"
" in case of chroot.")
if security_model != constants.HT_SM_NONE:
raise errors.HotplugError("Disk Hotplug is not supported in case"
" security models are used.")
if (dev_type == constants.HOTPLUG_TARGET_NIC and
action == constants.HOTPLUG_ACTION_ADD and not fdsend):
raise errors.HotplugError("Cannot hot-add NIC."
" fdsend python module is missing.")
return True
def _CallHotplugCommand(self, name, cmd):
output = self._CallMonitorCommand(name, cmd)
# TODO: parse output and check if succeeded
for line in output.stdout.splitlines():
logging.info("%s", line)
@classmethod
def _ParseKVMVersion(cls, text):
"""Parse the KVM version from the --help output.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment