clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 15:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14840 from HuKeping/golint-pkg-sysinfo

Browse Source 
Fix golint warning on pkg/sysinfo
This commit is contained in:
Antonio Murdaca
2015-08-04 20:57:39 +02:00
parent 0f49141150 7390cc5300
commit 23dab01ed2
7 changed files with 47 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/daemon_unix.go
+2 -2
View File
@@ -166,12 +166,12 @@ func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *runconfig.HostC
return warnings, fmt.Errorf("Invalid value: %v, valid memory swappiness range is 0-100.", swappiness)
}
}
if hostConfig.CPUPeriod > 0 && !daemon.SystemConfig().CpuCfsPeriod {
if hostConfig.CPUPeriod > 0 && !daemon.SystemConfig().CPUCfsPeriod {
warnings = append(warnings, "Your kernel does not support CPU cfs period. Period discarded.")
logrus.Warnf("Your kernel does not support CPU cfs period. Period discarded.")
hostConfig.CPUPeriod = 0
}
if hostConfig.CPUQuota > 0 && !daemon.SystemConfig().CpuCfsQuota {
if hostConfig.CPUQuota > 0 && !daemon.SystemConfig().CPUCfsQuota {
warnings = append(warnings, "Your kernel does not support CPU cfs quota. Quota discarded.")
logrus.Warnf("Your kernel does not support CPU cfs quota. Quota discarded.")
hostConfig.CPUQuota = 0
daemon/info.go
+3 -3
View File
@@ -64,7 +64,7 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
DriverStatus: daemon.GraphDriver().Status(),
IPv4Forwarding: !daemon.SystemConfig().IPv4ForwardingDisabled,
BridgeNfIptables: !daemon.SystemConfig().BridgeNfCallIptablesDisabled,
BridgeNfIp6tables: !daemon.SystemConfig().BridgeNfCallIp6tablesDisabled,
BridgeNfIp6tables: !daemon.SystemConfig().BridgeNfCallIP6tablesDisabled,
Debug: os.Getenv("DEBUG") != "",
NFd: fileutils.GetTotalUsedFds(),
NGoroutines: runtime.NumGoroutine(),
@@ -93,8 +93,8 @@ func (daemon *Daemon) SystemInfo() (*types.Info, error) {
v.MemoryLimit = daemon.SystemConfig().MemoryLimit
v.SwapLimit = daemon.SystemConfig().SwapLimit
v.OomKillDisable = daemon.SystemConfig().OomKillDisable
v.CpuCfsPeriod = daemon.SystemConfig().CpuCfsPeriod
v.CpuCfsQuota = daemon.SystemConfig().CpuCfsQuota
v.CpuCfsPeriod = daemon.SystemConfig().CPUCfsPeriod
v.CpuCfsQuota = daemon.SystemConfig().CPUCfsQuota
}
if httpProxy := os.Getenv("http_proxy"); httpProxy != "" {