1. docker
  2. Commit 67552fb22d254ba5e515aa899b1da3173f474a14
Browse code

Cleanup: remove some useless code and change verifyHostConfig to verifyContainerSetting

Signed-off-by: Lei Jitang <leijitang@huawei.com>

Lei Jitang authored on 2015/06/06 15:00:33
Showing 6 changed files
daemon/container.go
History View file @ 67552fb
... ... 
@@ -252,7 +252,6 @@ func (container *Container) Start() (err error) {
252 252 
 	if err := container.initializeNetworking(); err != nil {
253 253 
 		return err
254 254 
 	}
255 
-	container.verifyDaemonSettings()
256 255 
 	linkedEnv, err := container.setupLinkedContainers()
257 256 
 	if err != nil {
258 257 
 		return err
daemon/container_linux.go
History View file @ 67552fb
... ... 
@@ -832,21 +832,6 @@ func (container *Container) initializeNetworking() error {
832 832 
 	return container.buildHostnameFile()
833 833 
 }
834 834
835 
-// Make sure the config is compatible with the current kernel
836 
-func (container *Container) verifyDaemonSettings() {
837 
-	if container.hostConfig.Memory > 0 && !container.daemon.sysInfo.MemoryLimit {
838 
-		logrus.Warnf("Your kernel does not support memory limit capabilities. Limitation discarded.")
839 
-		container.hostConfig.Memory = 0
840 
-	}
841 
-	if container.hostConfig.Memory > 0 && container.hostConfig.MemorySwap != -1 && !container.daemon.sysInfo.SwapLimit {
842 
-		logrus.Warnf("Your kernel does not support swap limit capabilities. Limitation discarded.")
843 
-		container.hostConfig.MemorySwap = -1
844 
-	}
845 
-	if container.daemon.sysInfo.IPv4ForwardingDisabled {
846 
-		logrus.Warnf("IPv4 forwarding is disabled. Networking will not work")
847 
-	}
848 
-}
849 
-
850 835 
 func (container *Container) ExportRw() (archive.Archive, error) {
851 836 
 	if container.daemon == nil {
852 837 
 		return nil, fmt.Errorf("Can't load storage driver for unregistered container %s", container.ID)
daemon/container_windows.go
History View file @ 67552fb
... ... 
@@ -59,9 +59,6 @@ func (container *Container) setupWorkingDirectory() error {
59 59 
 	return nil
60 60 
 }
61 61
62 
-func (container *Container) verifyDaemonSettings() {
63 
-}
64 
-
65 62 
 func populateCommand(c *Container, env []string) error {
66 63 
 	en := &execdriver.Network{
67 64 
 		Mtu:       c.daemon.config.Mtu,
daemon/create.go
History View file @ 67552fb
... ... 
@@ -19,7 +19,7 @@ func (daemon *Daemon) ContainerCreate(name string, config *runconfig.Config, hos
19 19 
 		return "", nil, fmt.Errorf("Config cannot be empty in order to create a container")
20 20 
 	}
21 21
22 
-	warnings, err := daemon.verifyHostConfig(hostConfig)
22 
+	warnings, err := daemon.verifyContainerSettings(hostConfig)
23 23 
 	if err != nil {
24 24 
 		return "", warnings, err
25 25 
 	}
daemon/daemon.go
History View file @ 67552fb
... ... 
@@ -1166,7 +1166,7 @@ func checkKernel() error {
1166 1166 
 	return nil
1167 1167 
 }
1168 1168
1169 
-func (daemon *Daemon) verifyHostConfig(hostConfig *runconfig.HostConfig) ([]string, error) {
1169 
+func (daemon *Daemon) verifyContainerSettings(hostConfig *runconfig.HostConfig) ([]string, error) {
1170 1170 
 	var warnings []string
1171 1171
1172 1172 
 	if hostConfig == nil {
... ... 
@@ -1181,10 +1181,12 @@ func (daemon *Daemon) verifyHostConfig(hostConfig *runconfig.HostConfig) ([]stri
1181 1181 
 	}
1182 1182 
 	if hostConfig.Memory > 0 && !daemon.SystemConfig().MemoryLimit {
1183 1183 
 		warnings = append(warnings, "Your kernel does not support memory limit capabilities. Limitation discarded.")
1184 
+		logrus.Warnf("Your kernel does not support memory limit capabilities. Limitation discarded.")
1184 1185 
 		hostConfig.Memory = 0
1185 1186 
 	}
1186 1187 
 	if hostConfig.Memory > 0 && hostConfig.MemorySwap != -1 && !daemon.SystemConfig().SwapLimit {
1187 1188 
 		warnings = append(warnings, "Your kernel does not support swap limit capabilities, memory limited without swap.")
1189 
+		logrus.Warnf("Your kernel does not support swap limit capabilities, memory limited without swap.")
1188 1190 
 		hostConfig.MemorySwap = -1
1189 1191 
 	}
1190 1192 
 	if hostConfig.Memory > 0 && hostConfig.MemorySwap > 0 && hostConfig.MemorySwap < hostConfig.Memory {
... ... 
@@ -1195,10 +1197,12 @@ func (daemon *Daemon) verifyHostConfig(hostConfig *runconfig.HostConfig) ([]stri
1195 1195 
 	}
1196 1196 
 	if hostConfig.CpuPeriod > 0 && !daemon.SystemConfig().CpuCfsPeriod {
1197 1197 
 		warnings = append(warnings, "Your kernel does not support CPU cfs period. Period discarded.")
1198 
+		logrus.Warnf("Your kernel does not support CPU cfs period. Period discarded.")
1198 1199 
 		hostConfig.CpuPeriod = 0
1199 1200 
 	}
1200 1201 
 	if hostConfig.CpuQuota > 0 && !daemon.SystemConfig().CpuCfsQuota {
1201 1202 
 		warnings = append(warnings, "Your kernel does not support CPU cfs quota. Quota discarded.")
1203 
+		logrus.Warnf("Your kernel does not support CPU cfs quota. Quota discarded.")
1202 1204 
 		hostConfig.CpuQuota = 0
1203 1205 
 	}
1204 1206 
 	if hostConfig.BlkioWeight > 0 && (hostConfig.BlkioWeight < 10 || hostConfig.BlkioWeight > 1000) {
... ... 
@@ -1208,7 +1212,10 @@ func (daemon *Daemon) verifyHostConfig(hostConfig *runconfig.HostConfig) ([]stri
1208 1208 
 		hostConfig.OomKillDisable = false
1209 1209 
 		return warnings, fmt.Errorf("Your kernel does not support oom kill disable.")
1210 1210 
 	}
1211 
-
1211 
+	if daemon.SystemConfig().IPv4ForwardingDisabled {
1212 
+		warnings = append(warnings, "IPv4 forwarding is disabled. Networking will not work.")
1213 
+		logrus.Warnf("IPv4 forwarding is disabled. Networking will not work")
1214 
+	}
1212 1215 
 	return warnings, nil
1213 1216 
 }
1214 1217
daemon/start.go
History View file @ 67552fb
... ... 
@@ -20,7 +20,7 @@ func (daemon *Daemon) ContainerStart(name string, hostConfig *runconfig.HostConf
20 20 
 		return fmt.Errorf("Container already started")
21 21 
 	}
22 22
23 
-	if _, err = daemon.verifyHostConfig(hostConfig); err != nil {
23 
+	if _, err = daemon.verifyContainerSettings(hostConfig); err != nil {
24 24 
 		return err
25 25 
 	}
26 26