vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #17438 from pmalmgren/17037-systemd226-cgroup

Browse source 
Fix docker status incorrectly reports containerized
This commit is contained in:
David Calavera 2015-11-30 11:47:16 -08:00
commit c631a9bec7
2 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
parsers/operatingsystem/operatingsystem_linux.go
View file

@ -69,7 +69,7 @@ func IsContainerized() (bool, error) {
return false, err
}
for _, line := range bytes.Split(b, []byte{'\n'}) {
if len(line) > 0 && !bytes.HasSuffix(line, []byte{'/'}) {
if len(line) > 0 && !bytes.HasSuffix(line, []byte{'/'}) && !bytes.HasSuffix(line, []byte("init.scope")) {
return true, nil
}
}

23
parsers/operatingsystem/operatingsystem_unix_test.go
View file

@ -139,7 +139,17 @@ PRETTY_NAME="Source Mage"`,
func TestIsContainerized(t *testing.T) {
var (
backup = proc1Cgroup
backup = proc1Cgroup
nonContainerizedProc1Cgroupsystemd226 = []byte(`9:memory:/init.scope
8:net_cls,net_prio:/
7:cpuset:/
6:freezer:/
5:devices:/init.scope
4:blkio:/init.scope
3:cpu,cpuacct:/init.scope
2:perf_event:/
1:name=systemd:/init.scope
`)
nonContainerizedProc1Cgroup = []byte(`14:name=systemd:/
13:hugetlb:/
12:net_prio:/
@ -184,6 +194,17 @@ func TestIsContainerized(t *testing.T) {
t.Fatal("Wrongly assuming containerized")
}
if err := ioutil.WriteFile(proc1Cgroup, nonContainerizedProc1Cgroupsystemd226, 0600); err != nil {
t.Fatalf("failed to write to %s: %v", proc1Cgroup, err)
}
inContainer, err = IsContainerized()
if err != nil {
t.Fatal(err)
}
if inContainer {
t.Fatal("Wrongly assuming containerized for systemd /init.scope cgroup layout")
}
if err := ioutil.WriteFile(proc1Cgroup, containerizedProc1Cgroup, 0600); err != nil {
t.Fatalf("failed to write to %s: %v", proc1Cgroup, err)
}