Skip to content

Commit dac1258

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. Signed-off-by: Jean Rouge <jer329@cornell.edu>
1 parent a5a4101 commit dac1258

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
}
@@ -2646,8 +2646,8 @@ file {
26462646
type: TYPE_MESSAGE
26472647
type_name: ".google.protobuf.Duration"
26482648
options {
2649-
65011: 1
26502649
65001: 0
2650+
65011: 1
26512651
}
26522652
json_name: "delay"
26532653
}
@@ -3090,8 +3090,8 @@ file {
30903090
}
30913091
}
30923092
options {
3093-
62023: "PublishMode"
30943093
62001: 0
3094+
62023: "PublishMode"
30953095
}
30963096
}
30973097
}
@@ -3790,8 +3790,8 @@ file {
37903790
label: LABEL_OPTIONAL
37913791
type: TYPE_UINT32
37923792
options {
3793-
65003: "os.FileMode"
37943793
65001: 0
3794+
65003: "os.FileMode"
37953795
}
37963796
json_name: "mode"
37973797
}
@@ -4207,8 +4207,8 @@ file {
42074207
}
42084208
}
42094209
options {
4210-
62023: "NodeRole"
42114210
62001: 0
4211+
62023: "NodeRole"
42124212
}
42134213
}
42144214
syntax: "proto3"
@@ -4876,6 +4876,21 @@ file {
48764876
type_name: ".docker.swarmkit.v1.ContainerSpec.SysctlsEntry"
48774877
json_name: "sysctls"
48784878
}
4879+
field {
4880+
name: "memory_swap"
4881+
number: 27
4882+
label: LABEL_OPTIONAL
4883+
type: TYPE_INT64
4884+
json_name: "memorySwap"
4885+
}
4886+
field {
4887+
name: "memory_swappiness"
4888+
number: 28
4889+
label: LABEL_OPTIONAL
4890+
type: TYPE_MESSAGE
4891+
type_name: ".google.protobuf.Int64Value"
4892+
json_name: "memorySwappiness"
4893+
}
48794894
nested_type {
48804895
name: "LabelsEntry"
48814896
field {
@@ -8058,8 +8073,8 @@ file {
80588073
type: TYPE_MESSAGE
80598074
type_name: ".google.protobuf.Duration"
80608075
options {
8061-
65011: 1
80628076
65001: 0
8077+
65011: 1
80638078
}
80648079
json_name: "period"
80658080
}
@@ -9106,11 +9121,11 @@ file {
91069121
}
91079122
}
91089123
options {
9109-
63017: 1
9110-
63020: 1
9111-
63018: 1
91129124
63001: 0
91139125
63002: 0
9126+
63017: 1
9127+
63018: 1
9128+
63020: 1
91149129
}
91159130
}
91169131
file {

0 commit comments

Comments
 (0)