Skip to content

Commit a665879

Browse files
excelle08meta-codesync[bot]
authored andcommitted
DjangoBench V2: Update runner script, job spec and README (facebookresearch#354)
Summary: Pull Request resolved: facebookresearch#354 Reviewed By: marziehlenjaniMeta Differential Revision: D89298581
1 parent 14076b8 commit a665879

File tree

3 files changed

+350
-86
lines changed

3 files changed

+350
-86
lines changed

benchpress/config/jobs.yml

Lines changed: 69 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -187,39 +187,49 @@
187187
- '-l ./siege.log'
188188
- '-s urls.txt'
189189
- '-c {db_addr}'
190-
- '-I {interpreter}'
191-
- '-A {use_async}'
192-
- '-P {base_port}'
190+
- '--interpreter {interpreter}'
191+
- '--use-async {use_async}'
192+
- '--base-port {base_port}'
193193
- '-T {stats_port}'
194+
- '--use-jit {use_jit}'
195+
- '--skip-datagen {skip_datagen}'
194196
vars:
195197
- 'db_addr'
196198
- 'duration=5M'
197199
- 'iterations=7'
198200
- 'reps=0'
199-
- 'interpreter=cpython'
201+
- 'interpreter=cinder'
200202
- 'use_async=1'
201203
- 'base_port=16667'
202204
- 'stats_port=8001'
205+
- 'use_jit=1'
206+
- 'skip_datagen=0'
203207
db:
204208
args:
205209
- '-r db'
206210
- '-b {bind_ip}'
211+
- '--thrift-server-workers {thrift_server_workers}'
207212
vars:
208213
- 'bind_ip=default'
214+
- 'thrift_server_workers=32'
209215
server:
210216
args:
211217
- '-r server'
212218
- '-c {db_addr}'
213-
- '-I {interpreter}'
214-
- '-A {use_async}'
215-
- '-P {base_port}'
219+
- '--interpreter {interpreter}'
220+
- '--use-async {use_async}'
221+
- '--base-port {base_port}'
216222
- '-T {stats_port}'
223+
- '--use-jit {use_jit}'
224+
- '--skip-datagen {skip_datagen}'
217225
vars:
218226
- 'db_addr'
219-
- 'interpreter=cpython'
227+
- 'interpreter=cinder'
220228
- 'use_async=1'
221229
- 'base_port=16667'
222230
- 'stats_port=8001'
231+
- 'use_jit=1'
232+
- 'skip_datagen=0'
223233
standalone:
224234
args:
225235
- '-r standalone'
@@ -229,18 +239,24 @@
229239
- '-l ./siege.log'
230240
- '-s urls.txt'
231241
- '-c 127.0.0.1'
232-
- '-I {interpreter}'
233-
- '-A {use_async}'
234-
- '-P {base_port}'
242+
- '--interpreter {interpreter}'
243+
- '--use-async {use_async}'
244+
- '--base-port {base_port}'
235245
- '-T {stats_port}'
246+
- '--use-jit {use_jit}'
247+
- '--thrift-server-workers {thrift_server_workers}'
248+
- '--skip-datagen {skip_datagen}'
236249
vars:
237250
- 'duration=5M'
238251
- 'iterations=7'
239252
- 'reps=0'
240-
- 'interpreter=cpython'
253+
- 'interpreter=cinder'
241254
- 'use_async=1'
242255
- 'base_port=16667'
243256
- 'stats_port=8001'
257+
- 'use_jit=1'
258+
- 'thrift_server_workers=32'
259+
- 'skip_datagen=0'
244260
hooks:
245261
- hook: copymove
246262
options:
@@ -268,10 +284,12 @@
268284
- '-l ./siege.log'
269285
- '-s urls.txt'
270286
- '-c {db_addr}'
271-
- '-I {interpreter}'
272-
- '-A {use_async}'
273-
- '-P {base_port}'
287+
- '--interpreter {interpreter}'
288+
- '--use-async {use_async}'
289+
- '--base-port {base_port}'
274290
- '-T {stats_port}'
291+
- '--use-jit {use_jit}'
292+
- '--skip-datagen {skip_datagen}'
275293
vars:
276294
- 'db_addr'
277295
- 'duration=5M'
@@ -281,26 +299,34 @@
281299
- 'use_async=1'
282300
- 'base_port=16667'
283301
- 'stats_port=8001'
302+
- 'use_jit=0'
303+
- 'skip_datagen=0'
284304
db:
285305
args:
286306
- '-r db'
287307
- '-b {bind_ip}'
308+
- '--thrift-server-workers {thrift_server_workers}'
288309
vars:
289310
- 'bind_ip=default'
311+
- 'thrift_server_workers=32'
290312
server:
291313
args:
292314
- '-r server'
293315
- '-c {db_addr}'
294-
- '-I {interpreter}'
295-
- '-A {use_async}'
296-
- '-P {base_port}'
316+
- '--interpreter {interpreter}'
317+
- '--use-async {use_async}'
318+
- '--base-port {base_port}'
297319
- '-T {stats_port}'
320+
- '--use-jit {use_jit}'
321+
- '--skip-datagen {skip_datagen}'
298322
vars:
299323
- 'db_addr'
300324
- 'interpreter=cpython'
301325
- 'use_async=1'
302326
- 'base_port=16667'
303327
- 'stats_port=8001'
328+
- 'use_jit=0'
329+
- 'skip_datagen=0'
304330
standalone:
305331
args:
306332
- '-r standalone'
@@ -310,10 +336,13 @@
310336
- '-l ./siege.log'
311337
- '-s urls.txt'
312338
- '-c 127.0.0.1'
313-
- '-I {interpreter}'
314-
- '-A {use_async}'
315-
- '-P {base_port}'
339+
- '--interpreter {interpreter}'
340+
- '--use-async {use_async}'
341+
- '--base-port {base_port}'
316342
- '-T {stats_port}'
343+
- '--use-jit {use_jit}'
344+
- '--thrift-server-workers {thrift_server_workers}'
345+
- '--skip-datagen {skip_datagen}'
317346
vars:
318347
- 'duration=5M'
319348
- 'iterations=7'
@@ -322,6 +351,9 @@
322351
- 'use_async=1'
323352
- 'base_port=16667'
324353
- 'stats_port=8001'
354+
- 'use_jit=0'
355+
- 'thrift_server_workers=32'
356+
- 'skip_datagen=0'
325357
hooks:
326358
- hook: copymove
327359
options:
@@ -432,10 +464,12 @@
432464
- '-c {db_addr}'
433465
- '-w {server_workers}'
434466
- '-x {client_workers}'
435-
- '-I {interpreter}'
436-
- '-A {use_async}'
437-
- '-P {base_port}'
467+
- '--interpreter {interpreter}'
468+
- '--use-async {use_async}'
469+
- '--base-port {base_port}'
438470
- '-T {stats_port}'
471+
- '--use-jit {use_jit}'
472+
- '--skip-datagen {skip_datagen}'
439473
vars:
440474
- 'duration=5M'
441475
- 'iterations=7'
@@ -447,6 +481,8 @@
447481
- 'use_async=1'
448482
- 'base_port=16667'
449483
- 'stats_port=8001'
484+
- 'use_jit=0'
485+
- 'skip_datagen=0'
450486
client:
451487
args:
452488
- '-r client'
@@ -468,25 +504,31 @@
468504
- '-r server'
469505
- '-c {db_addr}'
470506
- '-w {server_workers}'
471-
- '-I {interpreter}'
472-
- '-A {use_async}'
473-
- '-P {base_port}'
507+
- '--interpreter {interpreter}'
508+
- '--use-async {use_async}'
509+
- '--base-port {base_port}'
474510
- '-T {stats_port}'
511+
- '--use-jit {use_jit}'
512+
- '--skip-datagen {skip_datagen}'
475513
vars:
476514
- 'db_addr'
477515
- 'server_workers'
478516
- 'interpreter=cpython'
479517
- 'use_async=1'
480518
- 'base_port=16667'
481519
- 'stats_port=8001'
520+
- 'use_jit=0'
521+
- 'skip_datagen=0'
482522
db:
483523
args:
484524
- '-r db'
485525
- '-y {concur_writes}'
486526
- '-b {bind_ip}'
527+
- '--thrift-server-workers {thrift_server_workers}'
487528
vars:
488529
- 'concur_writes'
489530
- 'bind_ip=default'
531+
- 'thrift_server_workers=32'
490532
hooks:
491533
- hook: copymove
492534
options:

0 commit comments

Comments
 (0)