diff --git a/benchpress/config/jobs.yml b/benchpress/config/jobs.yml index c0ee5c56a..bfe910487 100644 --- a/benchpress/config/jobs.yml +++ b/benchpress/config/jobs.yml @@ -90,6 +90,8 @@ - '-s {lg_path}' - '-R{scale_out}' - '-c{client_threads}' + - '-t{server_threads}' + - '-m{memcache_threads}' - '-U {auto_fix_ulimit}' - '--' - '--mediawiki-mlp' @@ -103,6 +105,8 @@ - 'lg_path=benchmarks/oss_performance_mediawiki/wrk/wrk' - 'scale_out=0' - 'client_threads=0' + - 'server_threads=0' + - 'memcache_threads=0' - 'duration=10m' - 'timeout=11m' - 'auto_fix_ulimit=1' @@ -124,6 +128,8 @@ - '-s {lg_path}' - '-R{scale_out}' - '-c{client_threads}' + - '-t{server_threads}' + - '-m{memcache_threads}' - '-U {auto_fix_ulimit}' - '--' - '--mediawiki-mlp' @@ -138,6 +144,8 @@ - 'lg_path=benchmarks/oss_performance_mediawiki/wrk/wrk' - 'scale_out=0' - 'client_threads=0' + - 'server_threads=0' + - 'memcache_threads=0' - 'duration=10m' - 'timeout=11m' - 'auto_fix_ulimit=1' @@ -159,6 +167,8 @@ - '-s {lg_path}' - '-R{scale_out}' - '-c{client_threads}' + - '-t{server_threads}' + - '-m{memcache_threads}' - '-U {auto_fix_ulimit}' - '--' - '--mediawiki-mem' @@ -172,6 +182,8 @@ - 'lg_path=benchmarks/oss_performance_mediawiki/wrk/wrk' - 'scale_out=0' - 'client_threads=0' + - 'server_threads=0' + - 'memcache_threads=0' - 'duration=10m' - 'timeout=11m' - 'auto_fix_ulimit=1' diff --git a/packages/mediawiki/run.sh b/packages/mediawiki/run.sh index acc3d2f3b..45deba105 100755 --- a/packages/mediawiki/run.sh +++ b/packages/mediawiki/run.sh @@ -320,7 +320,9 @@ function main() { fi ;; m) - MEMCACHE_THREADS="${OPTARG}" + if [[ "${OPTARG}" -gt 0 ]]; then + MEMCACHE_THREADS="${OPTARG}" + fi ;; p) disable_perf_record=true