External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-26 07:36:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't try to activate cgroups if not present for LXC

Browse Source 
* src/lxc_controller.c: Don't throw error in LXC startup if
  the cgroups driver mount isn't available. Improve error
  logging for resource setup
This commit is contained in:
Daniel P. Berrange 2009-07-31 14:37:25 +01:00
parent 87f3d69dac
commit 53d9a92497
1 changed files with 36 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/lxc_controller.c
View File

@ -84,25 +84,38 @@ static int lxcSetContainerResources(virDomainDefPtr def)
rc = virCgroupForDriver("lxc", &driver, 1, 0); rc = virCgroupForDriver("lxc", &driver, 1, 0);
if (rc != 0) { if (rc != 0) {
lxcError(NULL, NULL, VIR_ERR_INTERNAL_ERROR, "%s", /* Skip all if no driver cgroup is configured */
if (rc == -ENXIO || rc == -ENOENT)
return 0;
virReportSystemError(NULL, -rc, "%s",
_("Unable to get cgroup for driver")); _("Unable to get cgroup for driver"));
return rc; return rc;
} }
rc = virCgroupForDomain(driver, def->name, &cgroup, 1); rc = virCgroupForDomain(driver, def->name, &cgroup, 1);
if (rc != 0) { if (rc != 0) {
lxcError(NULL, NULL, VIR_ERR_INTERNAL_ERROR, virReportSystemError(NULL, -rc,
_("Unable to create cgroup for domain %s"), def->name); _("Unable to create cgroup for domain %s"),
def->name);
goto cleanup; goto cleanup;
} }
rc = virCgroupSetMemory(cgroup, def->maxmem); rc = virCgroupSetMemory(cgroup, def->maxmem);
if (rc != 0) if (rc != 0) {
goto out; virReportSystemError(NULL, -rc,
_("Unable to set memory limit for domain %s"),
def->name);
goto cleanup;
}
rc = virCgroupDenyAllDevices(cgroup); rc = virCgroupDenyAllDevices(cgroup);
if (rc != 0) if (rc != 0) {
goto out; virReportSystemError(NULL, -rc,
_("Unable to deny devices for domain %s"),
def->name);
goto cleanup;
}
for (i = 0; devices[i].type != 0; i++) { for (i = 0; devices[i].type != 0; i++) {
struct cgroup_device_policy *dev = &devices[i]; struct cgroup_device_policy *dev = &devices[i];
@ -110,19 +123,27 @@ static int lxcSetContainerResources(virDomainDefPtr def)
dev->type, dev->type,
dev->major, dev->major,
dev->minor); dev->minor);
if (rc != 0) if (rc != 0) {
goto out; virReportSystemError(NULL, -rc,
_("Unable to allow device %c:%d:%d for domain %s"),
dev->type, dev->major, dev->minor, def->name);
goto cleanup;
}
} }
rc = virCgroupAllowDeviceMajor(cgroup, 'c', LXC_DEV_MAJ_PTY); rc = virCgroupAllowDeviceMajor(cgroup, 'c', LXC_DEV_MAJ_PTY);
if (rc != 0) if (rc != 0) {
goto out; virReportSystemError(NULL, -rc,
_("Unable to allow PYT devices for domain %s"),
def->name);
goto cleanup;
}
rc = virCgroupAddTask(cgroup, getpid()); rc = virCgroupAddTask(cgroup, getpid());
out:
if (rc != 0) { if (rc != 0) {
virReportSystemError(NULL, -rc, "%s", virReportSystemError(NULL, -rc,
_("Failed to set lxc resources")); _("Unable to add task %d to cgroup for domain %s"),
getpid(), def->name);
} }
cleanup: cleanup: