Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions benchpress/config/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@
- '--thrift-server-workers {thrift_server_workers}'
vars:
- 'bind_ip=default'
- 'thrift_server_workers=32'
- 'thrift_server_workers=0'
server:
args:
- '-r server'
Expand Down Expand Up @@ -277,7 +277,7 @@
- 'base_port=16668'
- 'stats_port=8001'
- 'use_jit=1'
- 'thrift_server_workers=32'
- 'thrift_server_workers=0'
- 'skip_datagen=0'
hooks:
- hook: copymove
Expand Down Expand Up @@ -330,7 +330,7 @@
- '--thrift-server-workers {thrift_server_workers}'
vars:
- 'bind_ip=default'
- 'thrift_server_workers=32'
- 'thrift_server_workers=0'
server:
args:
- '-r server'
Expand Down Expand Up @@ -374,7 +374,7 @@
- 'base_port=16668'
- 'stats_port=8001'
- 'use_jit=0'
- 'thrift_server_workers=32'
- 'thrift_server_workers=0'
- 'skip_datagen=0'
hooks:
- hook: copymove
Expand Down Expand Up @@ -550,7 +550,7 @@
vars:
- 'concur_writes'
- 'bind_ip=default'
- 'thrift_server_workers=32'
- 'thrift_server_workers=0'
standalone:
args:
- '-r standalone'
Expand Down Expand Up @@ -580,7 +580,7 @@
- 'base_port=16667'
- 'stats_port=8001'
- 'use_jit=1'
- 'thrift_server_workers=32'
- 'thrift_server_workers=0'
- 'skip_datagen=0'
hooks:
- hook: copymove
Expand Down
13 changes: 7 additions & 6 deletions packages/django_workload/srcs/bin/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ For role "db":
-y number of cassandra concurrent writes (default 128)
-b ip address that cassandra will bind to (default to the first IP from "hostname -i": $(hostname -i))
--thrift-server-workers
number of thrift server workers (default: min(nproc, 32))
number of thrift server workers (default: nproc; pass 0 for auto)


EOF
Expand Down Expand Up @@ -481,7 +481,9 @@ start_thrift_servers() {
if [ "$num_thrift_servers" -gt 0 ]; then
export NUM_SERVERS="$num_thrift_servers"
else
export NUM_SERVERS=16
# 0 (or unset) means auto: one thrift server worker per logical CPU.
NUM_SERVERS="$(nproc)"
export NUM_SERVERS
fi
cd "${SCRIPT_ROOT}/../django-workload/django-workload/django_workload/thrift" || exit 1
bash manage_servers.sh start --with-haproxy
Expand Down Expand Up @@ -862,10 +864,9 @@ main() {
stats_port=8001

local thrift_server_workers
thrift_server_workers=32
if [ "$(nproc)" -lt "${thrift_server_workers}" ]; then
thrift_server_workers="$(nproc)"
fi
# 0 = auto: start one thrift server worker per logical CPU (nproc), resolved
# in start_thrift_servers(). Override with --thrift-server-workers N.
thrift_server_workers=0

local use_jit
use_jit=0
Expand Down
Loading