Skip to content

Commit 98af3e7

Browse files
committed
Adding support for --memory-swap and --memory-swappiness flags
Only requires changing the API at swarmkit's level. Rest of the changes will be in a moby/moby PR.
1 parent 9cfef98 commit 98af3e7

3 files changed

Lines changed: 289 additions & 177 deletions

File tree

api/api.pb.txt

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2491,8 +2491,8 @@ file {
24912491
label: LABEL_OPTIONAL
24922492
type: TYPE_UINT32
24932493
options {
2494-
65003: "os.FileMode"
24952494
65001: 0
2495+
65003: "os.FileMode"
24962496
}
24972497
json_name: "mode"
24982498
}
@@ -2639,8 +2639,8 @@ file {
26392639
type: TYPE_MESSAGE
26402640
type_name: ".google.protobuf.Duration"
26412641
options {
2642-
65011: 1
26432642
65001: 0
2643+
65011: 1
26442644
}
26452645
json_name: "delay"
26462646
}
@@ -3083,8 +3083,8 @@ file {
30833083
}
30843084
}
30853085
options {
3086-
62023: "PublishMode"
30873086
62001: 0
3087+
62023: "PublishMode"
30883088
}
30893089
}
30903090
}
@@ -3783,8 +3783,8 @@ file {
37833783
label: LABEL_OPTIONAL
37843784
type: TYPE_UINT32
37853785
options {
3786-
65003: "os.FileMode"
37873786
65001: 0
3787+
65003: "os.FileMode"
37883788
}
37893789
json_name: "mode"
37903790
}
@@ -4200,8 +4200,8 @@ file {
42004200
}
42014201
}
42024202
options {
4203-
62023: "NodeRole"
42044203
62001: 0
4204+
62023: "NodeRole"
42054205
}
42064206
}
42074207
syntax: "proto3"
@@ -4869,6 +4869,21 @@ file {
48694869
type_name: ".docker.swarmkit.v1.ContainerSpec.SysctlsEntry"
48704870
json_name: "sysctls"
48714871
}
4872+
field {
4873+
name: "memory_swap"
4874+
number: 27
4875+
label: LABEL_OPTIONAL
4876+
type: TYPE_INT64
4877+
json_name: "memorySwap"
4878+
}
4879+
field {
4880+
name: "memory_swappiness"
4881+
number: 28
4882+
label: LABEL_OPTIONAL
4883+
type: TYPE_MESSAGE
4884+
type_name: ".google.protobuf.Int64Value"
4885+
json_name: "memorySwappiness"
4886+
}
48724887
nested_type {
48734888
name: "LabelsEntry"
48744889
field {
@@ -8051,8 +8066,8 @@ file {
80518066
type: TYPE_MESSAGE
80528067
type_name: ".google.protobuf.Duration"
80538068
options {
8054-
65011: 1
80558069
65001: 0
8070+
65011: 1
80568071
}
80578072
json_name: "period"
80588073
}
@@ -9099,11 +9114,11 @@ file {
90999114
}
91009115
}
91019116
options {
9102-
63017: 1
9103-
63020: 1
9104-
63018: 1
91059117
63001: 0
91069118
63002: 0
9119+
63017: 1
9120+
63018: 1
9121+
63020: 1
91079122
}
91089123
}
91099124
file {

0 commit comments

Comments
 (0)