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
5 changes: 5 additions & 0 deletions benchpress/config/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,7 @@
- 'benchmarks/django_workload/django-workload/client/*.log'
- 'benchmarks/django_workload/*.log'
- '/tmp/siege_out_*'
- 'benchmarks/django_workload/breakdown.csv'

- benchmark: django_workload
name: django_workload_arm
Expand Down Expand Up @@ -338,6 +339,7 @@
- 'benchmarks/django_workload/django-workload/client/*.log'
- 'benchmarks/django_workload/*.log'
- '/tmp/siege_out_*'
- 'benchmarks/django_workload/breakdown.csv'

- benchmark: django_workload
name: django_workload_arm_mini
Expand Down Expand Up @@ -379,6 +381,7 @@
- 'benchmarks/django_workload/django-workload/client/*.log'
- 'benchmarks/django_workload/*.log'
- '/tmp/siege_out_*'
- 'benchmarks/django_workload/breakdown.csv'

- benchmark: django_workload
name: django_workload_mini
Expand Down Expand Up @@ -418,6 +421,7 @@
- 'benchmarks/django_workload/django-workload/client/*.log'
- 'benchmarks/django_workload/*.log'
- '/tmp/siege_out_*'
- 'benchmarks/django_workload/breakdown.csv'


- benchmark: django_workload
Expand Down Expand Up @@ -510,6 +514,7 @@
- 'benchmarks/django_workload/django-workload/client/*.log'
- 'benchmarks/django_workload/*.log'
- '/tmp/siege_out_*'
- 'benchmarks/django_workload/breakdown.csv'

- name: feedsim_default
benchmark: feedsim
Expand Down
17 changes: 17 additions & 0 deletions packages/django_workload/srcs/bin/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ CLEANUP_REQS=0
TABLE_NAMES="bundle_entry_model bundle_seen_model feed_entry_model inbox_entries user_model"
CASSANDRA_DATA_PATH="/data/cassandra/data"
KEY_SPACE_NAME="db"
BREAKDOWN_FOLDER="${SCRIPT_ROOT}/.."

# Source runtime breakdown utilities
source "${BENCHPRESS_ROOT}/packages/common/runtime_breakdown_utils.sh"

if [ -z "$JAVA_HOME" ]; then
_JAVA_HOME="$("${BENCHPRESS_ROOT}"/packages/common/find_java_home.py)"
export JAVA_HOME="${_JAVA_HOME}"
Expand Down Expand Up @@ -469,6 +474,9 @@ start_clientserver() {
local interpreter="${9:-cpython}"
local use_async="${10:-0}"

create_breakdown_csv "$BREAKDOWN_FOLDER"
log_preprocessing_start "$BREAKDOWN_FOLDER" "$$"

start_django_server "${cassandra_addr}" "${num_server_workers}" "${interpreter}" "${use_async}" &
server_pid="$!"

Expand All @@ -489,10 +497,19 @@ start_clientserver() {
exit 1
fi
done

log_preprocessing_end "$BREAKDOWN_FOLDER" "$$"
log_main_benchmark_start "$BREAKDOWN_FOLDER" "$$"

start_client "${num_client_workers}" "${duration}" "${siege_logs_path}" "${urls_path}" "127.0.0.1" "${iterations}" "${reps}"

log_main_benchmark_end "$BREAKDOWN_FOLDER" "$$"
log_postprocessing_start "$BREAKDOWN_FOLDER" "$$"

# Report interpreter type
echo "Interpreter: ${interpreter}"

log_postprocessing_end "$BREAKDOWN_FOLDER" "$$"
}

main() {
Expand Down