Skip to content

Commit 8799c4f

Browse files
hqhqhqhq
committed
Implemet docker update command
It's used for updating properties of one or more containers, we only support resource configs for now. It can be extended in the future. Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
1 parent b0be88c commit 8799c4f

File tree

22 files changed

+728
-2
lines changed

22 files changed

+728
-2
lines changed

‎api/client/client.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ type apiClient interface {
4343
ContainerStop(containerID string, timeout int) error
4444
ContainerTop(containerID string, arguments []string) (types.ContainerProcessList, error)
4545
ContainerUnpause(containerID string) error
46+
ContainerUpdate(containerID string, hostConfig container.HostConfig) error
4647
ContainerWait(containerID string) (int, error)
4748
CopyFromContainer(containerID, srcPath string) (io.ReadCloser, types.ContainerPathStat, error)
4849
CopyToContainer(options types.CopyToContainerOptions) error

‎api/client/lib/container_update.go‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package lib
2+
3+
import (
4+
"github.com/docker/docker/api/types/container"
5+
)
6+
7+
// ContainerUpdate updates resources of a container
8+
func (cli *Client) ContainerUpdate(containerID string, hostConfig container.HostConfig) error {
9+
resp, err := cli.post("/containers/"+containerID+"/update", nil, hostConfig, nil)
10+
ensureReaderClosed(resp)
11+
return err
12+
}

‎api/client/update.go‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
package client
2+
3+
import (
4+
"fmt"
5+
6+
"github.com/docker/docker/api/types/container"
7+
Cli "github.com/docker/docker/cli"
8+
flag "github.com/docker/docker/pkg/mflag"
9+
"github.com/docker/go-units"
10+
)
11+
12+
// CmdUpdate updates resources of one or more containers.
13+
//
14+
// Usage: docker update [OPTIONS] CONTAINER [CONTAINER...]
15+
func (cli *DockerCli) CmdUpdate(args ...string) error {
16+
cmd := Cli.Subcmd("update", []string{"CONTAINER [CONTAINER...]"}, Cli.DockerCommands["update"].Description, true)
17+
flBlkioWeight := cmd.Uint16([]string{"-blkio-weight"}, 0, "Block IO (relative weight), between 10 and 1000")
18+
flCPUPeriod := cmd.Int64([]string{"-cpu-period"}, 0, "Limit CPU CFS (Completely Fair Scheduler) period")
19+
flCPUQuota := cmd.Int64([]string{"-cpu-quota"}, 0, "Limit CPU CFS (Completely Fair Scheduler) quota")
20+
flCpusetCpus := cmd.String([]string{"-cpuset-cpus"}, "", "CPUs in which to allow execution (0-3, 0,1)")
21+
flCpusetMems := cmd.String([]string{"-cpuset-mems"}, "", "MEMs in which to allow execution (0-3, 0,1)")
22+
flCPUShares := cmd.Int64([]string{"#c", "-cpu-shares"}, 0, "CPU shares (relative weight)")
23+
flMemoryString := cmd.String([]string{"m", "-memory"}, "", "Memory limit")
24+
flMemoryReservation := cmd.String([]string{"-memory-reservation"}, "", "Memory soft limit")
25+
flMemorySwap := cmd.String([]string{"-memory-swap"}, "", "Total memory (memory + swap), '-1' to disable swap")
26+
flKernelMemory := cmd.String([]string{"-kernel-memory"}, "", "Kernel memory limit")
27+
28+
cmd.Require(flag.Min, 1)
29+
cmd.ParseFlags(args, true)
30+
if cmd.NFlag() == 0 {
31+
return fmt.Errorf("You must provide one or more flags when using this command.")
32+
}
33+
34+
var err error
35+
var flMemory int64
36+
if *flMemoryString != "" {
37+
flMemory, err = units.RAMInBytes(*flMemoryString)
38+
if err != nil {
39+
return err
40+
}
41+
}
42+
43+
var memoryReservation int64
44+
if *flMemoryReservation != "" {
45+
memoryReservation, err = units.RAMInBytes(*flMemoryReservation)
46+
if err != nil {
47+
return err
48+
}
49+
}
50+
51+
var memorySwap int64
52+
if *flMemorySwap != "" {
53+
if *flMemorySwap == "-1" {
54+
memorySwap = -1
55+
} else {
56+
memorySwap, err = units.RAMInBytes(*flMemorySwap)
57+
if err != nil {
58+
return err
59+
}
60+
}
61+
}
62+
63+
var kernelMemory int64
64+
if *flKernelMemory != "" {
65+
kernelMemory, err = units.RAMInBytes(*flKernelMemory)
66+
if err != nil {
67+
return err
68+
}
69+
}
70+
71+
resources := container.Resources{
72+
BlkioWeight: *flBlkioWeight,
73+
CpusetCpus: *flCpusetCpus,
74+
CpusetMems: *flCpusetMems,
75+
CPUShares: *flCPUShares,
76+
Memory: flMemory,
77+
MemoryReservation: memoryReservation,
78+
MemorySwap: memorySwap,
79+
KernelMemory: kernelMemory,
80+
CPUPeriod: *flCPUPeriod,
81+
CPUQuota: *flCPUQuota,
82+
}
83+
84+
hostConfig := container.HostConfig{
85+
Resources: resources,
86+
}
87+
88+
names := cmd.Args()
89+
var errNames []string
90+
for _, name := range names {
91+
if err := cli.client.ContainerUpdate(name, hostConfig); err != nil {
92+
fmt.Fprintf(cli.err, "%s\n", err)
93+
errNames = append(errNames, name)
94+
} else {
95+
fmt.Fprintf(cli.out, "%s\n", name)
96+
}
97+
}
98+
99+
if len(errNames) > 0 {
100+
return fmt.Errorf("Error: failed to update resources of containers: %v", errNames)
101+
}
102+
103+
return nil
104+
}

‎api/server/router/container/backend.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ type stateBackend interface {
4242
ContainerStart(name string, hostConfig *container.HostConfig) error
4343
ContainerStop(name string, seconds int) error
4444
ContainerUnpause(name string) error
45+
ContainerUpdate(name string, hostConfig *container.HostConfig) ([]string, error)
4546
ContainerWait(name string, timeout time.Duration) (int, error)
4647
Exists(id string) bool
4748
IsPaused(id string) bool

‎api/server/router/container/container.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ func (r *containerRouter) initRoutes() {
5757
local.NewPostRoute("/exec/{name:.*}/start", r.postContainerExecStart),
5858
local.NewPostRoute("/exec/{name:.*}/resize", r.postContainerExecResize),
5959
local.NewPostRoute("/containers/{name:.*}/rename", r.postContainerRename),
60+
local.NewPostRoute("/containers/{name:.*}/update", r.postContainerUpdate),
6061
// PUT
6162
local.NewPutRoute("/containers/{name:.*}/archive", r.putContainersArchive),
6263
// DELETE

‎api/server/router/container/container_routes.go‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,30 @@ func (s *containerRouter) postContainerRename(ctx context.Context, w http.Respon
323323
return nil
324324
}
325325

326+
func (s *containerRouter) postContainerUpdate(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
327+
if err := httputils.ParseForm(r); err != nil {
328+
return err
329+
}
330+
if err := httputils.CheckForJSON(r); err != nil {
331+
return err
332+
}
333+
334+
_, hostConfig, err := runconfig.DecodeContainerConfig(r.Body)
335+
if err != nil {
336+
return err
337+
}
338+
339+
name := vars["name"]
340+
warnings, err := s.backend.ContainerUpdate(name, hostConfig)
341+
if err != nil {
342+
return err
343+
}
344+
345+
return httputils.WriteJSON(w, http.StatusOK, &types.ContainerUpdateResponse{
346+
Warnings: warnings,
347+
})
348+
}
349+
326350
func (s *containerRouter) postContainersCreate(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
327351
if err := httputils.ParseForm(r); err != nil {
328352
return err

‎api/types/types.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,13 @@ type ContainerExecCreateResponse struct {
2828
ID string `json:"Id"`
2929
}
3030

31+
// ContainerUpdateResponse contains response of Remote API:
32+
// POST /containers/{name:.*}/update
33+
type ContainerUpdateResponse struct {
34+
// Warnings are any warnings encountered during the updating of the container.
35+
Warnings []string `json:"Warnings"`
36+
}
37+
3138
// AuthResponse contains response of Remote API:
3239
// POST "/auth"
3340
type AuthResponse struct {

‎cli/common.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ var dockerCommands = []Command{
6464
{"tag", "Tag an image into a repository"},
6565
{"top", "Display the running processes of a container"},
6666
{"unpause", "Unpause all processes within a container"},
67+
{"update", "Update resources of one or more containers"},
6768
{"version", "Show the Docker version information"},
6869
{"volume", "Manage Docker volumes"},
6970
{"wait", "Block until a container stops, then print its exit code"},

‎container/container_unix.go‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"syscall"
1414

1515
"github.com/Sirupsen/logrus"
16+
"github.com/docker/docker/api/types/container"
1617
"github.com/docker/docker/api/types/network"
1718
"github.com/docker/docker/daemon/execdriver"
1819
derr "github.com/docker/docker/errors"
@@ -543,6 +544,75 @@ func (container *Container) IpcMounts() []execdriver.Mount {
543544
return mounts
544545
}
545546

547+
func updateCommand(c *execdriver.Command, resources container.Resources) {
548+
c.Resources.BlkioWeight = resources.BlkioWeight
549+
c.Resources.CPUShares = resources.CPUShares
550+
c.Resources.CPUPeriod = resources.CPUPeriod
551+
c.Resources.CPUQuota = resources.CPUQuota
552+
c.Resources.CpusetCpus = resources.CpusetCpus
553+
c.Resources.CpusetMems = resources.CpusetMems
554+
c.Resources.Memory = resources.Memory
555+
c.Resources.MemorySwap = resources.MemorySwap
556+
c.Resources.MemoryReservation = resources.MemoryReservation
557+
c.Resources.KernelMemory = resources.KernelMemory
558+
}
559+
560+
// UpdateContainer updates resources of a container.
561+
func (container *Container) UpdateContainer(hostConfig *container.HostConfig) error {
562+
container.Lock()
563+
564+
resources := hostConfig.Resources
565+
cResources := &container.HostConfig.Resources
566+
if resources.BlkioWeight != 0 {
567+
cResources.BlkioWeight = resources.BlkioWeight
568+
}
569+
if resources.CPUShares != 0 {
570+
cResources.CPUShares = resources.CPUShares
571+
}
572+
if resources.CPUPeriod != 0 {
573+
cResources.CPUPeriod = resources.CPUPeriod
574+
}
575+
if resources.CPUQuota != 0 {
576+
cResources.CPUQuota = resources.CPUQuota
577+
}
578+
if resources.CpusetCpus != "" {
579+
cResources.CpusetCpus = resources.CpusetCpus
580+
}
581+
if resources.CpusetMems != "" {
582+
cResources.CpusetMems = resources.CpusetMems
583+
}
584+
if resources.Memory != 0 {
585+
cResources.Memory = resources.Memory
586+
}
587+
if resources.MemorySwap != 0 {
588+
cResources.MemorySwap = resources.MemorySwap
589+
}
590+
if resources.MemoryReservation != 0 {
591+
cResources.MemoryReservation = resources.MemoryReservation
592+
}
593+
if resources.KernelMemory != 0 {
594+
cResources.KernelMemory = resources.KernelMemory
595+
}
596+
container.Unlock()
597+
598+
// If container is not running, update hostConfig struct is enough,
599+
// resources will be updated when the container is started again.
600+
// If container is running (including paused), we need to update
601+
// the command so we can update configs to the real world.
602+
if container.IsRunning() {
603+
container.Lock()
604+
updateCommand(container.Command, resources)
605+
container.Unlock()
606+
}
607+
608+
if err := container.ToDiskLocking(); err != nil {
609+
logrus.Errorf("Error saving updated container: %v", err)
610+
return err
611+
}
612+
613+
return nil
614+
}
615+
546616
func detachMounted(path string) error {
547617
return syscall.Unmount(path, syscall.MNT_DETACH)
548618
}

‎container/container_windows.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
package container
44

55
import (
6+
"github.com/docker/docker/api/types/container"
67
"github.com/docker/docker/daemon/execdriver"
78
"github.com/docker/docker/volume"
89
)
@@ -47,6 +48,11 @@ func (container *Container) TmpfsMounts() []execdriver.Mount {
4748
return nil
4849
}
4950

51+
// UpdateContainer updates resources of a container
52+
func (container *Container) UpdateContainer(hostConfig *container.HostConfig) error {
53+
return nil
54+
}
55+
5056
// appendNetworkMounts appends any network mounts to the array of mount points passed in.
5157
// Windows does not support network mounts (not to be confused with SMB network mounts), so
5258
// this is a no-op.

0 commit comments

Comments
 (0)