Skip to content

Commit 62728c9

Browse files
mlwellesmlwelles
committed
revert: remove Docker memory limits and cache flags from compose files
Remove deploy memory limits and --cache "size-mb=1024" flags from dgraph/docker-compose.yml and systest/online-restore/docker-compose.yml. These just shift OOM kills from the OS to Docker without actually solving the underlying resource problem, and they add noise to the compose files.
1 parent c81aad9 commit 62728c9

2 files changed

Lines changed: 36 additions & 105 deletions

File tree

‎dgraph/docker-compose.yml‎

Lines changed: 24 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@ services:
99
labels:
1010
cluster: test
1111
service: zero
12-
deploy:
13-
resources:
14-
limits:
15-
memory: 512M
1612
volumes:
1713
- type: bind
1814
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -34,10 +30,6 @@ services:
3430
labels:
3531
cluster: test
3632
service: zero
37-
deploy:
38-
resources:
39-
limits:
40-
memory: 512M
4133
volumes:
4234
- type: bind
4335
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -58,10 +50,6 @@ services:
5850
labels:
5951
cluster: test
6052
service: zero
61-
deploy:
62-
resources:
63-
limits:
64-
memory: 512M
6553
volumes:
6654
- type: bind
6755
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -74,10 +62,6 @@ services:
7462
alpha1:
7563
image: dgraph/dgraph:local
7664
working_dir: /data/alpha1
77-
deploy:
78-
resources:
79-
limits:
80-
memory: 2048M
8165
volumes:
8266
- type: bind
8367
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -98,21 +82,16 @@ services:
9882
cluster: test
9983
service: alpha
10084
command:
101-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --cache "size-mb=1024;" --telemetry "reports=false;"
102-
--encryption "key-file=/dgraph-enc/enc-key;" --my=alpha1:7080
103-
--zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block --block_rate 10
104-
--logtostderr -v=2 --security "whitelist=0.0.0.0/0;" --acl
105-
"secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
85+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --telemetry "reports=false;" --encryption
86+
"key-file=/dgraph-enc/enc-key;" --my=alpha1:7080 --zero=zero1:5080,zero2:5080,zero3:5080
87+
--expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security
88+
"whitelist=0.0.0.0/0;" --acl "secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
10689

10790
alpha2:
10891
image: dgraph/dgraph:local
10992
working_dir: /data/alpha2
11093
depends_on:
11194
- alpha1
112-
deploy:
113-
resources:
114-
limits:
115-
memory: 2048M
11695
volumes:
11796
- type: bind
11897
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -133,20 +112,16 @@ services:
133112
cluster: test
134113
service: alpha
135114
command:
136-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --cache "size-mb=1024;" --encryption
137-
"key-file=/dgraph-enc/enc-key;" --my=alpha2:7080 --zero=zero1:5080,zero2:5080,zero3:5080
138-
--expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security
139-
"whitelist=0.0.0.0/0;" --acl "secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
115+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --encryption "key-file=/dgraph-enc/enc-key;"
116+
--my=alpha2:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block
117+
--block_rate 10 --logtostderr -v=2 --security "whitelist=0.0.0.0/0;" --acl
118+
"secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
140119

141120
alpha3:
142121
image: dgraph/dgraph:local
143122
working_dir: /data/alpha3
144123
depends_on:
145124
- alpha2
146-
deploy:
147-
resources:
148-
limits:
149-
memory: 2048M
150125
volumes:
151126
- type: bind
152127
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -167,20 +142,16 @@ services:
167142
cluster: test
168143
service: alpha
169144
command:
170-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --cache "size-mb=1024;" --encryption
171-
"key-file=/dgraph-enc/enc-key;" --my=alpha3:7080 --zero=zero1:5080,zero2:5080,zero3:5080
172-
--expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security
173-
"whitelist=0.0.0.0/0;" --acl "secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
145+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --encryption "key-file=/dgraph-enc/enc-key;"
146+
--my=alpha3:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block
147+
--block_rate 10 --logtostderr -v=2 --security "whitelist=0.0.0.0/0;" --acl
148+
"secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
174149

175150
alpha4:
176151
image: dgraph/dgraph:local
177152
working_dir: /data/alpha4
178153
depends_on:
179154
- alpha3
180-
deploy:
181-
resources:
182-
limits:
183-
memory: 2048M
184155
volumes:
185156
- type: bind
186157
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -201,20 +172,16 @@ services:
201172
cluster: test
202173
service: alpha
203174
command:
204-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --cache "size-mb=1024;" --encryption
205-
"key-file=/dgraph-enc/enc-key;" --my=alpha4:7080 --zero=zero1:5080,zero2:5080,zero3:5080
206-
--expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security
207-
"whitelist=0.0.0.0/0;" --acl "secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
175+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --encryption "key-file=/dgraph-enc/enc-key;"
176+
--my=alpha4:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block
177+
--block_rate 10 --logtostderr -v=2 --security "whitelist=0.0.0.0/0;" --acl
178+
"secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
208179

209180
alpha5:
210181
image: dgraph/dgraph:local
211182
working_dir: /data/alpha5
212183
depends_on:
213184
- alpha4
214-
deploy:
215-
resources:
216-
limits:
217-
memory: 2048M
218185
volumes:
219186
- type: bind
220187
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -235,20 +202,16 @@ services:
235202
cluster: test
236203
service: alpha
237204
command:
238-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --cache "size-mb=1024;" --encryption
239-
"key-file=/dgraph-enc/enc-key;" --my=alpha5:7080 --zero=zero1:5080,zero2:5080,zero3:5080
240-
--expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security
241-
"whitelist=0.0.0.0/0;" --acl "secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
205+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --encryption "key-file=/dgraph-enc/enc-key;"
206+
--my=alpha5:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block
207+
--block_rate 10 --logtostderr -v=2 --security "whitelist=0.0.0.0/0;" --acl
208+
"secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
242209

243210
alpha6:
244211
image: dgraph/dgraph:local
245212
working_dir: /data/alpha6
246213
depends_on:
247214
- alpha5
248-
deploy:
249-
resources:
250-
limits:
251-
memory: 2048M
252215
volumes:
253216
- type: bind
254217
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -269,10 +232,10 @@ services:
269232
cluster: test
270233
service: alpha
271234
command:
272-
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --cache "size-mb=1024;" --encryption
273-
"key-file=/dgraph-enc/enc-key;" --my=alpha6:7080 --zero=zero1:5080,zero2:5080,zero3:5080
274-
--expose_trace --profile_mode block --block_rate 10 --logtostderr -v=2 --security
275-
"whitelist=0.0.0.0/0;" --acl "secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
235+
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --encryption "key-file=/dgraph-enc/enc-key;"
236+
--my=alpha6:7080 --zero=zero1:5080,zero2:5080,zero3:5080 --expose_trace --profile_mode block
237+
--block_rate 10 --logtostderr -v=2 --security "whitelist=0.0.0.0/0;" --acl
238+
"secret-file=/dgraph-acl/hmac-secret; access-ttl=20s;"
276239

277240
minio:
278241
image: minio/minio:latest
@@ -283,8 +246,4 @@ services:
283246
- 9001
284247
labels:
285248
cluster: test
286-
deploy:
287-
resources:
288-
limits:
289-
memory: 512M
290249
command: minio server /data/minio --address :9001

‎systest/online-restore/docker-compose.yml‎

Lines changed: 12 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ services:
88
ports:
99
- 8080
1010
- 9080
11-
deploy:
12-
resources:
13-
limits:
14-
memory: 4096M
1511
volumes:
1612
- type: bind
1713
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -35,8 +31,8 @@ services:
3531
read_only: true
3632
command:
3733
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha1:7080 --zero=zero1:5080 --logtostderr -v=2
38-
--cache "size-mb=1024;" --raft "idx=1;" --encryption "key-file=/data/keys/enc_key;" --security
39-
"whitelist=0.0.0.0/0;" --tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt;
34+
--raft "idx=1;" --encryption "key-file=/data/keys/enc_key;" --security "whitelist=0.0.0.0/0;"
35+
--tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt;
4036
server-key=/dgraph-tls/node.key; internal-port=true;
4137
client-cert=/dgraph-tls/client.alpha1.crt; client-key=/dgraph-tls/client.alpha1.key;"
4238
alpha2:
@@ -49,10 +45,6 @@ services:
4945
ports:
5046
- 8080
5147
- 9080
52-
deploy:
53-
resources:
54-
limits:
55-
memory: 4096M
5648
volumes:
5749
- type: bind
5850
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -76,8 +68,8 @@ services:
7668
read_only: true
7769
command:
7870
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha2:7080 --zero=zero1:5080 --logtostderr -v=2
79-
--cache "size-mb=1024;" --raft "idx=2;" --encryption "key-file=/data/keys/enc_key;" --security
80-
"whitelist=0.0.0.0/0;" --tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt;
71+
--raft "idx=2;" --encryption "key-file=/data/keys/enc_key;" --security "whitelist=0.0.0.0/0;"
72+
--tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt;
8173
server-key=/dgraph-tls/node.key; internal-port=true;
8274
client-cert=/dgraph-tls/client.alpha2.crt; client-key=/dgraph-tls/client.alpha2.key;"
8375
alpha3:
@@ -90,10 +82,6 @@ services:
9082
ports:
9183
- 8080
9284
- 9080
93-
deploy:
94-
resources:
95-
limits:
96-
memory: 4096M
9785
volumes:
9886
- type: bind
9987
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -117,8 +105,8 @@ services:
117105
read_only: true
118106
command:
119107
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha3:7080 --zero=zero1:5080 --logtostderr -v=2
120-
--cache "size-mb=1024;" --raft "idx=3;" --encryption "key-file=/data/keys/enc_key;" --security
121-
"whitelist=0.0.0.0/0;" --tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt;
108+
--raft "idx=3;" --encryption "key-file=/data/keys/enc_key;" --security "whitelist=0.0.0.0/0;"
109+
--tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt;
122110
server-key=/dgraph-tls/node.key; internal-port=true;
123111
client-cert=/dgraph-tls/client.alpha3.crt; client-key=/dgraph-tls/client.alpha3.key;"
124112
alpha4:
@@ -131,10 +119,6 @@ services:
131119
ports:
132120
- 8080
133121
- 9080
134-
deploy:
135-
resources:
136-
limits:
137-
memory: 4096M
138122
volumes:
139123
- type: bind
140124
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -158,8 +142,8 @@ services:
158142
read_only: true
159143
command:
160144
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha4:7080 --zero=zero1:5080 --logtostderr -v=2
161-
--cache "size-mb=1024;" --raft "idx=4;" --encryption "key-file=/data/keys/enc_key;" --security
162-
"whitelist=0.0.0.0/0;" --tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt;
145+
--raft "idx=4;" --encryption "key-file=/data/keys/enc_key;" --security "whitelist=0.0.0.0/0;"
146+
--tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt;
163147
server-key=/dgraph-tls/node.key; internal-port=true;
164148
client-cert=/dgraph-tls/client.alpha4.crt; client-key=/dgraph-tls/client.alpha4.key;"
165149
alpha5:
@@ -172,10 +156,6 @@ services:
172156
ports:
173157
- 8080
174158
- 9080
175-
deploy:
176-
resources:
177-
limits:
178-
memory: 4096M
179159
volumes:
180160
- type: bind
181161
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -199,8 +179,8 @@ services:
199179
read_only: true
200180
command:
201181
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha5:7080 --zero=zero1:5080 --logtostderr -v=2
202-
--cache "size-mb=1024;" --raft "idx=5;" --encryption "key-file=/data/keys/enc_key;" --security
203-
"whitelist=0.0.0.0/0;" --tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt;
182+
--raft "idx=5;" --encryption "key-file=/data/keys/enc_key;" --security "whitelist=0.0.0.0/0;"
183+
--tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt;
204184
server-key=/dgraph-tls/node.key; internal-port=true;
205185
client-cert=/dgraph-tls/client.alpha5.crt; client-key=/dgraph-tls/client.alpha5.key;"
206186
alpha6:
@@ -213,10 +193,6 @@ services:
213193
ports:
214194
- 8080
215195
- 9080
216-
deploy:
217-
resources:
218-
limits:
219-
memory: 4096M
220196
volumes:
221197
- type: bind
222198
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -240,8 +216,8 @@ services:
240216
read_only: true
241217
command:
242218
/gobin/dgraph ${COVERAGE_OUTPUT} alpha --my=alpha6:7080 --zero=zero1:5080 --logtostderr -v=2
243-
--cache "size-mb=1024;" --raft "idx=6;" --encryption "key-file=/data/keys/enc_key;" --security
244-
"whitelist=0.0.0.0/0;" --tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt;
219+
--raft "idx=6;" --encryption "key-file=/data/keys/enc_key;" --security "whitelist=0.0.0.0/0;"
220+
--tls "ca-cert=/dgraph-tls/ca.crt; server-cert=/dgraph-tls/node.crt;
245221
server-key=/dgraph-tls/node.key; internal-port=true;
246222
client-cert=/dgraph-tls/client.alpha6.crt; client-key=/dgraph-tls/client.alpha6.key;"
247223
zero1:
@@ -252,10 +228,6 @@ services:
252228
ports:
253229
- 5080
254230
- 6080
255-
deploy:
256-
resources:
257-
limits:
258-
memory: 1024M
259231
volumes:
260232
- type: bind
261233
source: ${LINUX_GOBIN:-$GOPATH/bin}

0 commit comments

Comments
 (0)