Merge pull request #13220 from Microsoft/10662-sysinfo
Windows: Refactor sysinfo for compilation
This commit is contained in:
commit
70a497a7e9
3 changed files with 87 additions and 78 deletions
|
@ -1,17 +1,7 @@
|
|||
package sysinfo
|
||||
|
||||
import (
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/Sirupsen/logrus"
|
||||
"github.com/docker/libcontainer/cgroups"
|
||||
)
|
||||
|
||||
// SysInfo stores information about which features a kernel supports.
|
||||
// TODO Windows: Factor out platform specific capabilities.
|
||||
type SysInfo struct {
|
||||
MemoryLimit bool
|
||||
SwapLimit bool
|
||||
|
@ -21,70 +11,3 @@ type SysInfo struct {
|
|||
AppArmor bool
|
||||
OomKillDisable bool
|
||||
}
|
||||
|
||||
// New returns a new SysInfo, using the filesystem to detect which features the kernel supports.
|
||||
func New(quiet bool) *SysInfo {
|
||||
sysInfo := &SysInfo{}
|
||||
if cgroupMemoryMountpoint, err := cgroups.FindCgroupMountpoint("memory"); err != nil {
|
||||
if !quiet {
|
||||
logrus.Warnf("Your kernel does not support cgroup memory limit: %v", err)
|
||||
}
|
||||
} else {
|
||||
// If memory cgroup is mounted, MemoryLimit is always enabled.
|
||||
sysInfo.MemoryLimit = true
|
||||
|
||||
_, err1 := ioutil.ReadFile(path.Join(cgroupMemoryMountpoint, "memory.memsw.limit_in_bytes"))
|
||||
sysInfo.SwapLimit = err1 == nil
|
||||
if !sysInfo.SwapLimit && !quiet {
|
||||
logrus.Warn("Your kernel does not support swap memory limit.")
|
||||
}
|
||||
|
||||
_, err = ioutil.ReadFile(path.Join(cgroupMemoryMountpoint, "memory.oom_control"))
|
||||
sysInfo.OomKillDisable = err == nil
|
||||
if !sysInfo.OomKillDisable && !quiet {
|
||||
logrus.Warnf("Your kernel does not support oom control.")
|
||||
}
|
||||
}
|
||||
|
||||
if cgroupCpuMountpoint, err := cgroups.FindCgroupMountpoint("cpu"); err != nil {
|
||||
if !quiet {
|
||||
logrus.Warnf("%v", err)
|
||||
}
|
||||
} else {
|
||||
_, err := ioutil.ReadFile(path.Join(cgroupCpuMountpoint, "cpu.cfs_period_us"))
|
||||
sysInfo.CpuCfsPeriod = err == nil
|
||||
if !sysInfo.CpuCfsPeriod && !quiet {
|
||||
logrus.Warn("Your kernel does not support cgroup cfs period")
|
||||
}
|
||||
_, err = ioutil.ReadFile(path.Join(cgroupCpuMountpoint, "cpu.cfs_quota_us"))
|
||||
sysInfo.CpuCfsQuota = err == nil
|
||||
if !sysInfo.CpuCfsQuota && !quiet {
|
||||
logrus.Warn("Your kernel does not support cgroup cfs quotas")
|
||||
}
|
||||
}
|
||||
|
||||
// Checek if ipv4_forward is disabled.
|
||||
if data, err := ioutil.ReadFile("/proc/sys/net/ipv4/ip_forward"); os.IsNotExist(err) {
|
||||
sysInfo.IPv4ForwardingDisabled = true
|
||||
} else {
|
||||
if enabled, _ := strconv.Atoi(strings.TrimSpace(string(data))); enabled == 0 {
|
||||
sysInfo.IPv4ForwardingDisabled = true
|
||||
} else {
|
||||
sysInfo.IPv4ForwardingDisabled = false
|
||||
}
|
||||
}
|
||||
|
||||
// Check if AppArmor is supported.
|
||||
if _, err := os.Stat("/sys/kernel/security/apparmor"); os.IsNotExist(err) {
|
||||
sysInfo.AppArmor = false
|
||||
} else {
|
||||
sysInfo.AppArmor = true
|
||||
}
|
||||
|
||||
// Check if Devices cgroup is mounted, it is hard requirement for container security.
|
||||
if _, err := cgroups.FindCgroupMountpoint("devices"); err != nil {
|
||||
logrus.Fatalf("Error mounting devices cgroup: %v", err)
|
||||
}
|
||||
|
||||
return sysInfo
|
||||
}
|
||||
|
|
79
sysinfo/sysinfo_linux.go
Normal file
79
sysinfo/sysinfo_linux.go
Normal file
|
@ -0,0 +1,79 @@
|
|||
package sysinfo
|
||||
|
||||
import (
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"path"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/Sirupsen/logrus"
|
||||
"github.com/docker/libcontainer/cgroups"
|
||||
)
|
||||
|
||||
// New returns a new SysInfo, using the filesystem to detect which features the kernel supports.
|
||||
func New(quiet bool) *SysInfo {
|
||||
sysInfo := &SysInfo{}
|
||||
if cgroupMemoryMountpoint, err := cgroups.FindCgroupMountpoint("memory"); err != nil {
|
||||
if !quiet {
|
||||
logrus.Warnf("Your kernel does not support cgroup memory limit: %v", err)
|
||||
}
|
||||
} else {
|
||||
// If memory cgroup is mounted, MemoryLimit is always enabled.
|
||||
sysInfo.MemoryLimit = true
|
||||
|
||||
_, err1 := ioutil.ReadFile(path.Join(cgroupMemoryMountpoint, "memory.memsw.limit_in_bytes"))
|
||||
sysInfo.SwapLimit = err1 == nil
|
||||
if !sysInfo.SwapLimit && !quiet {
|
||||
logrus.Warn("Your kernel does not support swap memory limit.")
|
||||
}
|
||||
|
||||
_, err = ioutil.ReadFile(path.Join(cgroupMemoryMountpoint, "memory.oom_control"))
|
||||
sysInfo.OomKillDisable = err == nil
|
||||
if !sysInfo.OomKillDisable && !quiet {
|
||||
logrus.Warnf("Your kernel does not support oom control.")
|
||||
}
|
||||
}
|
||||
|
||||
if cgroupCpuMountpoint, err := cgroups.FindCgroupMountpoint("cpu"); err != nil {
|
||||
if !quiet {
|
||||
logrus.Warnf("%v", err)
|
||||
}
|
||||
} else {
|
||||
_, err := ioutil.ReadFile(path.Join(cgroupCpuMountpoint, "cpu.cfs_period_us"))
|
||||
sysInfo.CpuCfsPeriod = err == nil
|
||||
if !sysInfo.CpuCfsPeriod && !quiet {
|
||||
logrus.Warn("Your kernel does not support cgroup cfs period")
|
||||
}
|
||||
_, err = ioutil.ReadFile(path.Join(cgroupCpuMountpoint, "cpu.cfs_quota_us"))
|
||||
sysInfo.CpuCfsQuota = err == nil
|
||||
if !sysInfo.CpuCfsQuota && !quiet {
|
||||
logrus.Warn("Your kernel does not support cgroup cfs quotas")
|
||||
}
|
||||
}
|
||||
|
||||
// Checek if ipv4_forward is disabled.
|
||||
if data, err := ioutil.ReadFile("/proc/sys/net/ipv4/ip_forward"); os.IsNotExist(err) {
|
||||
sysInfo.IPv4ForwardingDisabled = true
|
||||
} else {
|
||||
if enabled, _ := strconv.Atoi(strings.TrimSpace(string(data))); enabled == 0 {
|
||||
sysInfo.IPv4ForwardingDisabled = true
|
||||
} else {
|
||||
sysInfo.IPv4ForwardingDisabled = false
|
||||
}
|
||||
}
|
||||
|
||||
// Check if AppArmor is supported.
|
||||
if _, err := os.Stat("/sys/kernel/security/apparmor"); os.IsNotExist(err) {
|
||||
sysInfo.AppArmor = false
|
||||
} else {
|
||||
sysInfo.AppArmor = true
|
||||
}
|
||||
|
||||
// Check if Devices cgroup is mounted, it is hard requirement for container security.
|
||||
if _, err := cgroups.FindCgroupMountpoint("devices"); err != nil {
|
||||
logrus.Fatalf("Error mounting devices cgroup: %v", err)
|
||||
}
|
||||
|
||||
return sysInfo
|
||||
}
|
7
sysinfo/sysinfo_windows.go
Normal file
7
sysinfo/sysinfo_windows.go
Normal file
|
@ -0,0 +1,7 @@
|
|||
package sysinfo
|
||||
|
||||
// TODO Windows
|
||||
func New(quiet bool) *SysInfo {
|
||||
sysInfo := &SysInfo{}
|
||||
return sysInfo
|
||||
}
|
Loading…
Reference in a new issue