NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add misc extra debugging into cgroups code

Browse Source 
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2013-04-03 18:06:41 +01:00
parent 8d1c141a8d
commit 854a004fd6
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/util/vircgroup.c
View File

@ -663,12 +663,18 @@ static int virCgroupMakeGroup(virCgroupPtr parent,
char *path = NULL; char *path = NULL;
/* Skip over controllers that aren't mounted */ /* Skip over controllers that aren't mounted */
if (!group->controllers[i].mountPoint) if (!group->controllers[i].mountPoint) {
VIR_DEBUG("Skipping unmounted controller %s",
virCgroupControllerTypeToString(i));
continue; continue;
}
rc = virCgroupPathOfController(group, i, "", &path); rc = virCgroupPathOfController(group, i, "", &path);
if (rc < 0) if (rc < 0) {
VIR_DEBUG("Failed to find path of controller %s",
virCgroupControllerTypeToString(i));
return rc; return rc;
}
/* As of Feb 2011, clang can't see that the above function /* As of Feb 2011, clang can't see that the above function
* call did not modify group. */ * call did not modify group. */
sa_assert(group->controllers[i].mountPoint); sa_assert(group->controllers[i].mountPoint);
@ -682,11 +688,14 @@ static int virCgroupMakeGroup(virCgroupPtr parent,
* other controllers even though they are available. So * other controllers even though they are available. So
* treat blkio as unmounted if mkdir fails. */ * treat blkio as unmounted if mkdir fails. */
if (i == VIR_CGROUP_CONTROLLER_BLKIO) { if (i == VIR_CGROUP_CONTROLLER_BLKIO) {
VIR_DEBUG("Ignoring mkdir failure with blkio controller. Kernel probably too old");
rc = 0; rc = 0;
VIR_FREE(group->controllers[i].mountPoint); VIR_FREE(group->controllers[i].mountPoint);
VIR_FREE(path); VIR_FREE(path);
continue; continue;
} else { } else {
VIR_DEBUG("Failed to create controller %s for group",
virCgroupControllerTypeToString(i));
rc = -errno; rc = -errno;
VIR_FREE(path); VIR_FREE(path);
break; break;
@ -720,6 +729,7 @@ static int virCgroupMakeGroup(virCgroupPtr parent,
VIR_FREE(path); VIR_FREE(path);
} }
VIR_DEBUG("Done making controllers for group");
return rc; return rc;
} }
@ -904,6 +914,7 @@ int virCgroupRemove(virCgroupPtr group)
int i; int i;
char *grppath = NULL; char *grppath = NULL;
VIR_DEBUG("Removing cgroup %s", group->path);
for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) { for (i = 0 ; i < VIR_CGROUP_CONTROLLER_LAST ; i++) {
/* Skip over controllers not mounted */ /* Skip over controllers not mounted */
if (!group->controllers[i].mountPoint) if (!group->controllers[i].mountPoint)
@ -919,6 +930,7 @@ int virCgroupRemove(virCgroupPtr group)
rc = virCgroupRemoveRecursively(grppath); rc = virCgroupRemoveRecursively(grppath);
VIR_FREE(grppath); VIR_FREE(grppath);
} }
VIR_DEBUG("Done removing cgroup %s", group->path);
return rc; return rc;
} }