2015-12-28 06:19:26 -05:00
|
|
|
package daemon
|
|
|
|
|
|
|
|
import (
|
|
|
|
"fmt"
|
|
|
|
|
Remove redundant error message
Currently some commands including `kill`, `pause`, `restart`, `rm`,
`rmi`, `stop`, `unpause`, `udpate`, `wait` will print a lot of error
message on client side, with a lot of redundant messages, this commit is
trying to remove the unuseful and redundant information for user.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-02-03 01:29:15 -05:00
|
|
|
derr "github.com/docker/docker/errors"
|
2016-01-04 19:05:26 -05:00
|
|
|
"github.com/docker/engine-api/types/container"
|
2015-12-28 06:19:26 -05:00
|
|
|
)
|
|
|
|
|
|
|
|
// ContainerUpdate updates resources of the container
|
|
|
|
func (daemon *Daemon) ContainerUpdate(name string, hostConfig *container.HostConfig) ([]string, error) {
|
|
|
|
var warnings []string
|
|
|
|
|
|
|
|
warnings, err := daemon.verifyContainerSettings(hostConfig, nil)
|
|
|
|
if err != nil {
|
|
|
|
return warnings, err
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := daemon.update(name, hostConfig); err != nil {
|
|
|
|
return warnings, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return warnings, nil
|
|
|
|
}
|
|
|
|
|
2016-01-20 18:32:02 -05:00
|
|
|
// ContainerUpdateCmdOnBuild updates Path and Args for the container with ID cID.
|
|
|
|
func (daemon *Daemon) ContainerUpdateCmdOnBuild(cID string, cmd []string) error {
|
|
|
|
c, err := daemon.GetContainer(cID)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
c.Path = cmd[0]
|
|
|
|
c.Args = cmd[1:]
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
2015-12-28 06:19:26 -05:00
|
|
|
func (daemon *Daemon) update(name string, hostConfig *container.HostConfig) error {
|
|
|
|
if hostConfig == nil {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
container, err := daemon.GetContainer(name)
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
|
|
|
|
if container.RemovalInProgress || container.Dead {
|
Remove redundant error message
Currently some commands including `kill`, `pause`, `restart`, `rm`,
`rmi`, `stop`, `unpause`, `udpate`, `wait` will print a lot of error
message on client side, with a lot of redundant messages, this commit is
trying to remove the unuseful and redundant information for user.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-02-03 01:29:15 -05:00
|
|
|
errMsg := fmt.Errorf("Container is marked for removal and cannot be \"update\".")
|
|
|
|
return derr.ErrorCodeCantUpdate.WithArgs(container.ID, errMsg)
|
2015-12-28 06:19:26 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
if container.IsRunning() && hostConfig.KernelMemory != 0 {
|
Remove redundant error message
Currently some commands including `kill`, `pause`, `restart`, `rm`,
`rmi`, `stop`, `unpause`, `udpate`, `wait` will print a lot of error
message on client side, with a lot of redundant messages, this commit is
trying to remove the unuseful and redundant information for user.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-02-03 01:29:15 -05:00
|
|
|
errMsg := fmt.Errorf("Can not update kernel memory to a running container, please stop it first.")
|
|
|
|
return derr.ErrorCodeCantUpdate.WithArgs(container.ID, errMsg)
|
2015-12-28 06:19:26 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
if err := container.UpdateContainer(hostConfig); err != nil {
|
Remove redundant error message
Currently some commands including `kill`, `pause`, `restart`, `rm`,
`rmi`, `stop`, `unpause`, `udpate`, `wait` will print a lot of error
message on client side, with a lot of redundant messages, this commit is
trying to remove the unuseful and redundant information for user.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-02-03 01:29:15 -05:00
|
|
|
return derr.ErrorCodeCantUpdate.WithArgs(container.ID, err.Error())
|
2015-12-28 06:19:26 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// If container is not running, update hostConfig struct is enough,
|
|
|
|
// resources will be updated when the container is started again.
|
|
|
|
// If container is running (including paused), we need to update configs
|
|
|
|
// to the real world.
|
|
|
|
if container.IsRunning() {
|
|
|
|
if err := daemon.execDriver.Update(container.Command); err != nil {
|
Remove redundant error message
Currently some commands including `kill`, `pause`, `restart`, `rm`,
`rmi`, `stop`, `unpause`, `udpate`, `wait` will print a lot of error
message on client side, with a lot of redundant messages, this commit is
trying to remove the unuseful and redundant information for user.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-02-03 01:29:15 -05:00
|
|
|
return derr.ErrorCodeCantUpdate.WithArgs(container.ID, err.Error())
|
2015-12-28 06:19:26 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-12-21 17:55:23 -05:00
|
|
|
daemon.LogContainerEvent(container, "update")
|
|
|
|
|
2015-12-28 06:19:26 -05:00
|
|
|
return nil
|
|
|
|
}
|