Browse code
before adjusting should check whether need return or not
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Ma Shimiao authored on 2015/09/07 12:07:12Showing 1 changed files
| ... | ... |
@@ -21,11 +21,12 @@ func (daemon *Daemon) ContainerCreate(name string, config *runconfig.Config, hos |
| 21 | 21 |
} |
| 22 | 22 |
|
| 23 | 23 |
warnings, err := daemon.verifyContainerSettings(hostConfig, config) |
| 24 |
- daemon.adaptContainerSettings(hostConfig, adjustCPUShares) |
|
| 25 | 24 |
if err != nil {
|
| 26 | 25 |
return nil, warnings, err |
| 27 | 26 |
} |
| 28 | 27 |
|
| 28 |
+ daemon.adaptContainerSettings(hostConfig, adjustCPUShares) |
|
| 29 |
+ |
|
| 29 | 30 |
container, buildWarnings, err := daemon.Create(config, hostConfig, name) |
| 30 | 31 |
if err != nil {
|
| 31 | 32 |
if daemon.Graph().IsNotExist(err, config.Image) {
|