Use wrk as the load generator in Mediawiki benchmark

Summary: Add support for wrk as the load generator in Mediawiki benchmark, and use wrk by default. This is intended to workaround Siege's hanging issues especially when CPU core count is large. Reviewed By: YifanYuan3 Differential Revision: D65505788 fbshipit-source-id: e6cb75711c5a0e3f9ac40bd189be6b6064367696
facebookresearch · Nov 6, 2024 · 2ad3809 · 2ad3809
1 parent f893dac
commit 2ad3809
Show file tree

Hide file tree

Showing 10 changed files with 1,124 additions and 212 deletions.
diff --git a/benchpress/config/jobs.yml b/benchpress/config/jobs.yml
@@ -8,66 +8,100 @@
   args:
     - '-r/usr/local/hphpi/legacy/bin/hhvm'
     - '-nnginx'
-    - '-ssiege'
+    - '-L {load_generator}'
+    - '-s {lg_path}'
     - '--'
     - '--mediawiki'
-    - '--siege-duration=10M'
-    - '--siege-timeout=11m'
+    - '--client-duration={duration}'
+    - '--client-timeout={timeout}'
     - '--run-as-root'
     - '--i-am-not-benchmarking'
+    - '{extra_args}'
+  vars:
+    - 'load_generator=wrk'
+    - 'lg_path=benchmarks/oss_performance_mediawiki/wrk/wrk'
+    - 'duration=600'
+    - 'timeout=11m'
+    - 'extra_args='
 
 - benchmark: oss_performance_mediawiki
   name: oss_performance_mediawiki_mlp
   description: Tuned +MLP run for oss_performance_mediawiki
   args:
     - '-r/usr/local/hphpi/legacy/bin/hhvm'
     - '-nnginx'
-    - '-ssiege'
+    - '-L {load_generator}'
+    - '-s {lg_path}'
     - '-R{scale_out}'
-    - '-c{siege_concurrent}'
+    - '-c{client_threads}'
     - '--'
     - '--mediawiki-mlp'
-    - '--siege-duration=10M'
-    - '--siege-timeout=11m'
+    - '--client-duration={duration}'
+    - '--client-timeout={timeout}'
     - '--run-as-root'
     - '--i-am-not-benchmarking'
+    - '{extra_args}'
   vars:
+    - 'load_generator=wrk'
+    - 'lg_path=benchmarks/oss_performance_mediawiki/wrk/wrk'
     - 'scale_out=0'
-    - 'siege_concurrent=0'
+    - 'client_threads=0'
+    - 'duration=600'
+    - 'timeout=11m'
+    - 'extra_args='
 
 - benchmark: oss_performance_mediawiki
   name: oss_performance_mediawiki_mlp_no_jit
   description: Tuned +MLP run for oss_performance_mediawiki
   args:
     - '-r/usr/local/hphpi/legacy/bin/hhvm'
     - '-nnginx'
-    - '-ssiege'
+    - '-L {load_generator}'
+    - '-s {lg_path}'
     - '-R{scale_out}'
-    - '-c{siege_concurrent}'
+    - '-c{client_threads}'
     - '--'
     - '--mediawiki-mlp'
-    - '--siege-duration=10M'
-    - '--siege-timeout=11m'
+    - '--client-duration={duration}'
+    - '--client-timeout={timeout}'
     - '--run-as-root'
     - '--no-jit'
     - '--i-am-not-benchmarking'
+    - '{extra_args}'
   vars:
+    - 'load_generator=wrk'
+    - 'lg_path=benchmarks/oss_performance_mediawiki/wrk/wrk'
     - 'scale_out=0'
-    - 'siege_concurrent=0'
+    - 'client_threads=0'
+    - 'duration=600'
+    - 'timeout=11m'
+    - 'extra_args='
 
 - benchmark: oss_performance_mediawiki
   name: oss_performance_mediawiki_mem
   description: Tuned +(MLP+LambdaChase) run for oss_performance_mediawiki
   args:
     - '-r/usr/local/hphpi/legacy/bin/hhvm'
     - '-nnginx'
-    - '-ssiege'
+    - '-L {load_generator}'
+    - '-s {lg_path}'
+    - '-R{scale_out}'
+    - '-c{client_threads}'
     - '--'
     - '--mediawiki-mem'
-    - '--siege-duration=10M'
-    - '--siege-timeout=11m'
+    - '--client-duration={duration}'
+    - '--client-timeout={timeout}'
     - '--run-as-root'
     - '--i-am-not-benchmarking'
+    - '{extra_args}'
+  vars:
+    - 'load_generator=wrk'
+    - 'lg_path=benchmarks/oss_performance_mediawiki/wrk/wrk'
+    - 'scale_out=0'
+    - 'client_threads=0'
+    - 'duration=600'
+    - 'timeout=11m'
+    - 'extra_args='
 
 - benchmark: django_workload
   name: django_workload_default