log error if cgroup mount points cannot be found
Costa Tsaousis (ktsaou) committed
Jun 16, 2016 at 21:06 UTC
f7882e69c7a28aef730a8938fdcffb1b2d4fcb7b
1 file changed
+12
-3
src/sys_fs_cgroup.c
+12
-3
@@ -48,21 +48,30 @@ void read_cgroup_plugin_configuration() {
48
49
mi = mountinfo_find_by_filesystem_mount_source(root, "cgroup", "cpuacct");
50
if(!mi) mi = mountinfo_find_by_filesystem_super_option(root, "cgroup", "cpuacct");
51
- if(!mi) s = "/sys/fs/cgroup/cpuacct";
51
+ if(!mi) {
52
+ error("Cannot find cgroup cpuacct mountinfo. Assuming default: /sys/fs/cgroup/cpuacct");
53
+ s = "/sys/fs/cgroup/cpuacct";
54
+ }
55
else s = mi->mount_point;
56
snprintfz(filename, FILENAME_MAX, "%s%s", global_host_prefix, s);
57
cgroup_cpuacct_base = config_get("plugin:cgroups", "path to /sys/fs/cgroup/cpuacct", filename);
58
59
mi = mountinfo_find_by_filesystem_mount_source(root, "cgroup", "blkio");
60
if(!mi) mi = mountinfo_find_by_filesystem_super_option(root, "cgroup", "blkio");
58
- if(!mi) s = "/sys/fs/cgroup/blkio";
61
+ if(!mi) {
62
+ error("Cannot find cgroup blkio mountinfo. Assuming default: /sys/fs/cgroup/blkio");
63
+ s = "/sys/fs/cgroup/blkio";
64
+ }
65
else s = mi->mount_point;
66
snprintfz(filename, FILENAME_MAX, "%s%s", global_host_prefix, s);
67
cgroup_blkio_base = config_get("plugin:cgroups", "path to /sys/fs/cgroup/blkio", filename);
68
69
mi = mountinfo_find_by_filesystem_mount_source(root, "cgroup", "memory");
70
if(!mi) mi = mountinfo_find_by_filesystem_super_option(root, "cgroup", "memory");
65
- if(!mi) s = "/sys/fs/cgroup/memory";
71
+ if(!mi) {
72
+ error("Cannot find cgroup memory mountinfo. Assuming default: /sys/fs/cgroup/memory");
73
+ s = "/sys/fs/cgroup/memory";
74
+ }
75
else s = mi->mount_point;
76
snprintfz(filename, FILENAME_MAX, "%s%s", global_host_prefix, s);
77
cgroup_memory_base = config_get("plugin:cgroups", "path to /sys/fs/cgroup/memory", filename);