Skip to content

Commit b408180

Browse files
mlwellesmlwelles
committed
fix(test): add Docker memory limits and cache flags to dgraph docker-compose
Add deploy memory limits (zeros: 512M, alphas: 2048M, minio: 512M) and --cache "size-mb=1024" to all alpha commands in the main dgraph test cluster docker-compose file, matching the changes in the online-restore compose file. Prevents OOM kills on memory-constrained Docker Desktop VMs.
1 parent e929c1a commit b408180

1 file changed

Lines changed: 65 additions & 24 deletions

File tree

‎dgraph/docker-compose.yml‎

Lines changed: 65 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ services:
99
labels:
1010
cluster: test
1111
service: zero
12+
deploy:
13+
resources:
14+
limits:
15+
memory: 512M
1216
volumes:
1317
- type: bind
1418
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -30,6 +34,10 @@ services:
3034
labels:
3135
cluster: test
3236
service: zero
37+
deploy:
38+
resources:
39+
limits:
40+
memory: 512M
3341
volumes:
3442
- type: bind
3543
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -50,6 +58,10 @@ services:
5058
labels:
5159
cluster: test
5260
service: zero
61+
deploy:
62+
resources:
63+
limits:
64+
memory: 512M
5365
volumes:
5466
- type: bind
5567
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -62,6 +74,10 @@ services:
6274
alpha1:
6375
image: dgraph/dgraph:local
6476
working_dir: /data/alpha1
77+
deploy:
78+
resources:
79+
limits:
80+
memory: 2048M
6581
volumes:
6682
- type: bind
6783
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -82,16 +98,21 @@ services:
8298
cluster: test
8399
service: alpha
84100
command:
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;"
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;"
89106

90107
alpha2:
91108
image: dgraph/dgraph:local
92109
working_dir: /data/alpha2
93110
depends_on:
94111
- alpha1
112+
deploy:
113+
resources:
114+
limits:
115+
memory: 2048M
95116
volumes:
96117
- type: bind
97118
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -112,16 +133,20 @@ services:
112133
cluster: test
113134
service: alpha
114135
command:
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;"
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;"
119140

120141
alpha3:
121142
image: dgraph/dgraph:local
122143
working_dir: /data/alpha3
123144
depends_on:
124145
- alpha2
146+
deploy:
147+
resources:
148+
limits:
149+
memory: 2048M
125150
volumes:
126151
- type: bind
127152
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -142,16 +167,20 @@ services:
142167
cluster: test
143168
service: alpha
144169
command:
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;"
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;"
149174

150175
alpha4:
151176
image: dgraph/dgraph:local
152177
working_dir: /data/alpha4
153178
depends_on:
154179
- alpha3
180+
deploy:
181+
resources:
182+
limits:
183+
memory: 2048M
155184
volumes:
156185
- type: bind
157186
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -172,16 +201,20 @@ services:
172201
cluster: test
173202
service: alpha
174203
command:
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;"
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;"
179208

180209
alpha5:
181210
image: dgraph/dgraph:local
182211
working_dir: /data/alpha5
183212
depends_on:
184213
- alpha4
214+
deploy:
215+
resources:
216+
limits:
217+
memory: 2048M
185218
volumes:
186219
- type: bind
187220
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -202,16 +235,20 @@ services:
202235
cluster: test
203236
service: alpha
204237
command:
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;"
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;"
209242

210243
alpha6:
211244
image: dgraph/dgraph:local
212245
working_dir: /data/alpha6
213246
depends_on:
214247
- alpha5
248+
deploy:
249+
resources:
250+
limits:
251+
memory: 2048M
215252
volumes:
216253
- type: bind
217254
source: ${LINUX_GOBIN:-$GOPATH/bin}
@@ -232,10 +269,10 @@ services:
232269
cluster: test
233270
service: alpha
234271
command:
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;"
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;"
239276

240277
minio:
241278
image: minio/minio:latest
@@ -246,4 +283,8 @@ services:
246283
- 9001
247284
labels:
248285
cluster: test
286+
deploy:
287+
resources:
288+
limits:
289+
memory: 512M
249290
command: minio server /data/minio --address :9001

0 commit comments

Comments
 (0)