kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #24502 from allencloud/change-comparison-log-in-container-config

Browse source 
update comparison log in container config
This commit is contained in:
Alexander Morozov 2016-07-28 16:51:11 -07:00 • committed by GitHub
commit ca43efb40e
4 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
daemon/daemon_unix.go
View file

@ -288,8 +288,8 @@ func verifyContainerResources(resources *containertypes.Resources, sysInfo *sysi
return warnings, fmt.Errorf("You should always set the Memory limit when using Memoryswap limit, see usage") return warnings, fmt.Errorf("You should always set the Memory limit when using Memoryswap limit, see usage")
} }
if resources.MemorySwappiness != nil && *resources.MemorySwappiness != -1 && !sysInfo.MemorySwappiness { if resources.MemorySwappiness != nil && *resources.MemorySwappiness != -1 && !sysInfo.MemorySwappiness {
warnings = append(warnings, "Your kernel does not support memory swappiness capabilities, memory swappiness discarded.") warnings = append(warnings, "Your kernel does not support memory swappiness capabilities. Memory swappiness discarded.")
logrus.Warn("Your kernel does not support memory swappiness capabilities, memory swappiness discarded.") logrus.Warn("Your kernel does not support memory swappiness capabilities. Memory swappiness discarded.")
resources.MemorySwappiness = nil resources.MemorySwappiness = nil
} }
if resources.MemorySwappiness != nil { if resources.MemorySwappiness != nil {
@ -307,7 +307,7 @@ func verifyContainerResources(resources *containertypes.Resources, sysInfo *sysi
return warnings, fmt.Errorf("Minimum memory reservation allowed is 4MB") return warnings, fmt.Errorf("Minimum memory reservation allowed is 4MB")
} }
if resources.Memory > 0 && resources.MemoryReservation > 0 && resources.Memory < resources.MemoryReservation { if resources.Memory > 0 && resources.MemoryReservation > 0 && resources.Memory < resources.MemoryReservation {
return warnings, fmt.Errorf("Minimum memory limit should be larger than memory reservation limit, see usage") return warnings, fmt.Errorf("Minimum memory limit can not be less than memory reservation limit, see usage")
} }
if resources.KernelMemory > 0 && !sysInfo.KernelMemory { if resources.KernelMemory > 0 && !sysInfo.KernelMemory {
warnings = append(warnings, "Your kernel does not support kernel memory limit capabilities. Limitation discarded.") warnings = append(warnings, "Your kernel does not support kernel memory limit capabilities. Limitation discarded.")
@ -325,15 +325,15 @@ func verifyContainerResources(resources *containertypes.Resources, sysInfo *sysi
// only produce warnings if the setting wasn't to *disable* the OOM Kill; no point // only produce warnings if the setting wasn't to *disable* the OOM Kill; no point
// warning the caller if they already wanted the feature to be off // warning the caller if they already wanted the feature to be off
if *resources.OomKillDisable { if *resources.OomKillDisable {
warnings = append(warnings, "Your kernel does not support OomKillDisable, OomKillDisable discarded.") warnings = append(warnings, "Your kernel does not support OomKillDisable. OomKillDisable discarded.")
logrus.Warn("Your kernel does not support OomKillDisable, OomKillDisable discarded.") logrus.Warn("Your kernel does not support OomKillDisable. OomKillDisable discarded.")
} }
resources.OomKillDisable = nil resources.OomKillDisable = nil
} }
if resources.PidsLimit != 0 && !sysInfo.PidsLimit { if resources.PidsLimit != 0 && !sysInfo.PidsLimit {
warnings = append(warnings, "Your kernel does not support pids limit capabilities, pids limit discarded.") warnings = append(warnings, "Your kernel does not support pids limit capabilities. Pids limit discarded.")
logrus.Warn("Your kernel does not support pids limit capabilities, pids limit discarded.") logrus.Warn("Your kernel does not support pids limit capabilities. Pids limit discarded.")
resources.PidsLimit = 0 resources.PidsLimit = 0
} }
@ -400,28 +400,28 @@ func verifyContainerResources(resources *containertypes.Resources, sysInfo *sysi
return warnings, fmt.Errorf("Invalid QoS settings: %s does not support Maximum IO Bandwidth or Maximum IO IOps", runtime.GOOS) return warnings, fmt.Errorf("Invalid QoS settings: %s does not support Maximum IO Bandwidth or Maximum IO IOps", runtime.GOOS)
} }
if len(resources.BlkioWeightDevice) > 0 && !sysInfo.BlkioWeightDevice { if len(resources.BlkioWeightDevice) > 0 && !sysInfo.BlkioWeightDevice {
warnings = append(warnings, "Your kernel does not support Block I/O weight_device.") warnings = append(warnings, "Your kernel does not support Block I/O weight-device. Weight-device discarded.")
logrus.Warn("Your kernel does not support Block I/O weight_device. Weight-device discarded.") logrus.Warn("Your kernel does not support Block I/O weight-device. Weight-device discarded.")
resources.BlkioWeightDevice = []*pblkiodev.WeightDevice{} resources.BlkioWeightDevice = []*pblkiodev.WeightDevice{}
} }
if len(resources.BlkioDeviceReadBps) > 0 && !sysInfo.BlkioReadBpsDevice { if len(resources.BlkioDeviceReadBps) > 0 && !sysInfo.BlkioReadBpsDevice {
warnings = append(warnings, "Your kernel does not support Block read limit in bytes per second.") warnings = append(warnings, "Your kernel does not support Block read limit in bytes per second. Device read bps discarded.")
logrus.Warn("Your kernel does not support Block I/O read limit in bytes per second. --device-read-bps discarded.") logrus.Warn("Your kernel does not support Block I/O read limit in bytes per second. Device read bps discarded.")
resources.BlkioDeviceReadBps = []*pblkiodev.ThrottleDevice{} resources.BlkioDeviceReadBps = []*pblkiodev.ThrottleDevice{}
} }
if len(resources.BlkioDeviceWriteBps) > 0 && !sysInfo.BlkioWriteBpsDevice { if len(resources.BlkioDeviceWriteBps) > 0 && !sysInfo.BlkioWriteBpsDevice {
warnings = append(warnings, "Your kernel does not support Block write limit in bytes per second.") warnings = append(warnings, "Your kernel does not support Block write limit in bytes per second. Device write bps discarded.")
logrus.Warn("Your kernel does not support Block I/O write limit in bytes per second. --device-write-bps discarded.") logrus.Warn("Your kernel does not support Block I/O write limit in bytes per second. Device write bps discarded.")
resources.BlkioDeviceWriteBps = []*pblkiodev.ThrottleDevice{} resources.BlkioDeviceWriteBps = []*pblkiodev.ThrottleDevice{}
} }
if len(resources.BlkioDeviceReadIOps) > 0 && !sysInfo.BlkioReadIOpsDevice { if len(resources.BlkioDeviceReadIOps) > 0 && !sysInfo.BlkioReadIOpsDevice {
warnings = append(warnings, "Your kernel does not support Block read limit in IO per second.") warnings = append(warnings, "Your kernel does not support Block read limit in IO per second. Device read iops discarded.")
logrus.Warn("Your kernel does not support Block I/O read limit in IO per second. -device-read-iops discarded.") logrus.Warn("Your kernel does not support Block I/O read limit in IO per second. Device read iops discarded.")
resources.BlkioDeviceReadIOps = []*pblkiodev.ThrottleDevice{} resources.BlkioDeviceReadIOps = []*pblkiodev.ThrottleDevice{}
} }
if len(resources.BlkioDeviceWriteIOps) > 0 && !sysInfo.BlkioWriteIOpsDevice { if len(resources.BlkioDeviceWriteIOps) > 0 && !sysInfo.BlkioWriteIOpsDevice {
warnings = append(warnings, "Your kernel does not support Block write limit in IO per second.") warnings = append(warnings, "Your kernel does not support Block write limit in IO per second. Device write iops discarded.")
logrus.Warn("Your kernel does not support Block I/O write limit in IO per second. --device-write-iops discarded.") logrus.Warn("Your kernel does not support Block I/O write limit in IO per second. Device write iops discarded.")
resources.BlkioDeviceWriteIOps = []*pblkiodev.ThrottleDevice{} resources.BlkioDeviceWriteIOps = []*pblkiodev.ThrottleDevice{}
} }
@ -481,7 +481,7 @@ func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes.
warnings = append(warnings, w...) warnings = append(warnings, w...)
if hostConfig.ShmSize < 0 { if hostConfig.ShmSize < 0 {
return warnings, fmt.Errorf("SHM size must be greater than 0") return warnings, fmt.Errorf("SHM size can not be less than 0")
} }
if hostConfig.OomScoreAdj < -1000 || hostConfig.OomScoreAdj > 1000 { if hostConfig.OomScoreAdj < -1000 || hostConfig.OomScoreAdj > 1000 {

24
daemon/daemon_windows.go
View file

@ -101,33 +101,33 @@ func verifyContainerResources(resources *containertypes.Resources, sysInfo *sysi
// TODO Windows: Add more validation of resource settings not supported on Windows // TODO Windows: Add more validation of resource settings not supported on Windows
if resources.BlkioWeight > 0 { if resources.BlkioWeight > 0 {
warnings = append(warnings, "Windows does not support Block I/O weight. Weight discarded.") warnings = append(warnings, "Windows does not support Block I/O weight. Block I/O weight discarded.")
logrus.Warn("Windows does not support Block I/O weight. --blkio-weight discarded.") logrus.Warn("Windows does not support Block I/O weight. Block I/O weight discarded.")
resources.BlkioWeight = 0 resources.BlkioWeight = 0
} }
if len(resources.BlkioWeightDevice) > 0 { if len(resources.BlkioWeightDevice) > 0 {
warnings = append(warnings, "Windows does not support Block I/O weight_device.") warnings = append(warnings, "Windows does not support Block I/O weight-device. Weight-device discarded.")
logrus.Warn("Windows does not support Block I/O weight_device. --blkio-weight-device discarded.") logrus.Warn("Windows does not support Block I/O weight-device. Weight-device discarded.")
resources.BlkioWeightDevice = []*pblkiodev.WeightDevice{} resources.BlkioWeightDevice = []*pblkiodev.WeightDevice{}
} }
if len(resources.BlkioDeviceReadBps) > 0 { if len(resources.BlkioDeviceReadBps) > 0 {
warnings = append(warnings, "Windows does not support Block read limit in bytes per second.") warnings = append(warnings, "Windows does not support Block read limit in bytes per second. Device read bps discarded.")
logrus.Warn("Windows does not support Block I/O read limit in bytes per second. --device-read-bps discarded.") logrus.Warn("Windows does not support Block I/O read limit in bytes per second. Device read bps discarded.")
resources.BlkioDeviceReadBps = []*pblkiodev.ThrottleDevice{} resources.BlkioDeviceReadBps = []*pblkiodev.ThrottleDevice{}
} }
if len(resources.BlkioDeviceWriteBps) > 0 { if len(resources.BlkioDeviceWriteBps) > 0 {
warnings = append(warnings, "Windows does not support Block write limit in bytes per second.") warnings = append(warnings, "Windows does not support Block write limit in bytes per second. Device write bps discarded.")
logrus.Warn("Windows does not support Block I/O write limit in bytes per second. --device-write-bps discarded.") logrus.Warn("Windows does not support Block I/O write limit in bytes per second. Device write bps discarded.")
resources.BlkioDeviceWriteBps = []*pblkiodev.ThrottleDevice{} resources.BlkioDeviceWriteBps = []*pblkiodev.ThrottleDevice{}
} }
if len(resources.BlkioDeviceReadIOps) > 0 { if len(resources.BlkioDeviceReadIOps) > 0 {
warnings = append(warnings, "Windows does not support Block read limit in IO per second.") warnings = append(warnings, "Windows does not support Block read limit in IO per second. Device read iops discarded.")
logrus.Warn("Windows does not support Block I/O read limit in IO per second. -device-read-iops discarded.") logrus.Warn("Windows does not support Block I/O read limit in IO per second. Device read iops discarded.")
resources.BlkioDeviceReadIOps = []*pblkiodev.ThrottleDevice{} resources.BlkioDeviceReadIOps = []*pblkiodev.ThrottleDevice{}
} }
if len(resources.BlkioDeviceWriteIOps) > 0 { if len(resources.BlkioDeviceWriteIOps) > 0 {
warnings = append(warnings, "Windows does not support Block write limit in IO per second.") warnings = append(warnings, "Windows does not support Block write limit in IO per second. Device write iops discarded.")
logrus.Warn("Windows does not support Block I/O write limit in IO per second. --device-write-iops discarded.") logrus.Warn("Windows does not support Block I/O write limit in IO per second. Device write iops discarded.")
resources.BlkioDeviceWriteIOps = []*pblkiodev.ThrottleDevice{} resources.BlkioDeviceWriteIOps = []*pblkiodev.ThrottleDevice{}
} }
return warnings, nil return warnings, nil

2
integration-cli/docker_api_containers_test.go
View file

@ -1267,7 +1267,7 @@ func (s *DockerSuite) TestPostContainersCreateShmSizeNegative(c *check.C) {
status, body, err := sockRequest("POST", "/containers/create", config) status, body, err := sockRequest("POST", "/containers/create", config)
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)
c.Assert(status, check.Equals, http.StatusInternalServerError) c.Assert(status, check.Equals, http.StatusInternalServerError)
c.Assert(getErrorMessage(c, body), checker.Contains, "SHM size must be greater than 0") c.Assert(getErrorMessage(c, body), checker.Contains, "SHM size can not be less than 0")
} }
func (s *DockerSuite) TestPostContainersCreateShmSizeHostConfigOmitted(c *check.C) { func (s *DockerSuite) TestPostContainersCreateShmSizeHostConfigOmitted(c *check.C) {

2
integration-cli/docker_cli_run_unix_test.go
View file

@ -687,7 +687,7 @@ func (s *DockerSuite) TestRunWithMemoryReservationInvalid(c *check.C) {
testRequires(c, memoryReservationSupport) testRequires(c, memoryReservationSupport)
out, _, err := dockerCmdWithError("run", "-m", "500M", "--memory-reservation", "800M", "busybox", "true") out, _, err := dockerCmdWithError("run", "-m", "500M", "--memory-reservation", "800M", "busybox", "true")
c.Assert(err, check.NotNil) c.Assert(err, check.NotNil)
expected := "Minimum memory limit should be larger than memory reservation limit" expected := "Minimum memory limit can not be less than memory reservation limit"
c.Assert(strings.TrimSpace(out), checker.Contains, expected, check.Commentf("run container should fail with invalid memory reservation")) c.Assert(strings.TrimSpace(out), checker.Contains, expected, check.Commentf("run container should fail with invalid memory reservation"))
out, _, err = dockerCmdWithError("run", "--memory-reservation", "1k", "busybox", "true") out, _, err = dockerCmdWithError("run", "--memory-reservation", "1k", "busybox", "true")