Skip to content
Merged
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
3 changes: 1 addition & 2 deletions agent/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ util-scripts = \
pbench-register-tool \
pbench-register-tool-set \
pbench-register-tool-trigger \
pbench-remote-sysinfo-dump \
pbench-send-tools \
pbench-start-tools \
pbench-stop-tools \
Expand Down Expand Up @@ -136,7 +135,7 @@ tool-scripts = \
prometheus-metrics \
qemu-migrate \
rabbit \
README \
README.md \
sar \
strace \
sysfs \
Expand Down
7 changes: 4 additions & 3 deletions agent/bench-scripts/pbench-cyclictest
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,15 @@ printf "\n" >>$benchmark_summary_txt_file
printf "<pre>\n# these results generated with:\n# uperf %s\n\n" "$scrtip_name $orig_cmd" >$benchmark_summary_html_file
printf "\n" >>$benchmark_summary_html_file

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo beg

# Start the tool meisters on each registered local/remote host
pbench-tool-meister-start "${tool_group}"
if [[ ${?} != 0 ]]; then
error_log "[${script_name}]: failed to start the tool meisters."
exit 1
fi

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo beg

pbench-metadata-log --group=$tool_group --dir=$benchmark_run_dir beg

trap "interrupt" INT QUIT TERM
Expand Down Expand Up @@ -198,13 +198,14 @@ if [ $stress ]; then
fi
pbench-metadata-log --group=$tool_group --dir=$benchmark_run_dir end

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo end

# Stop the tool meisters on each registered local/remote host
pbench-tool-meister-stop
if [[ ${?} != 0 ]]; then
error_log "[${script_name}]: failed to stop the tool meisters."
fi

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo end
cat $benchmark_summary_txt_file

# signal to move/copy-results that this run is done.
Expand Down
8 changes: 4 additions & 4 deletions agent/bench-scripts/pbench-dbench
Original file line number Diff line number Diff line change
Expand Up @@ -327,15 +327,15 @@ let total_iterations=count
count=1
max_key_length=0

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo beg

# Start the tool meisters on each registered local/remote host
pbench-tool-meister-start "${tool_group}"
if [[ ${?} != 0 ]]; then
error_log "[${script_name}]: failed to start the tool meisters."
exit 1
fi

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo beg

pbench-metadata-log --group=$tool_group --dir=$benchmark_run_dir beg

trap "interrupt" INT QUIT TERM
Expand Down Expand Up @@ -555,12 +555,12 @@ printf -- "</pre>\n" >>$benchmark_summary_html_file

pbench-metadata-log --group=$tool_group --dir=$benchmark_run_dir end

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo end

# Stop the tool meisters on each registered local/remote host
pbench-tool-meister-stop
if [[ ${?} != 0 ]]; then
error_log "[${script_name}]: failed to stop the tool meisters."
fi

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo end

rmdir $benchmark_run_dir/.running
8 changes: 4 additions & 4 deletions agent/bench-scripts/pbench-fio
Original file line number Diff line number Diff line change
Expand Up @@ -877,15 +877,15 @@ fi
benchmark_iterations="${benchmark_run_dir}/.iterations"
> ${benchmark_iterations}

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo beg

# Start the tool meisters on each registered local/remote host
pbench-tool-meister-start "${tool_group}"
if [[ ${?} != 0 ]]; then
error_log "[${script_name}]: failed to start the tool meisters."
exit 1
fi

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo beg

pbench-metadata-log --group=$tool_group --dir=$benchmark_run_dir beg

trap "interrupt" INT QUIT TERM
Expand All @@ -899,12 +899,12 @@ $benchmark_run_dir/generate-benchmark-summary.cmd
pbench-end-tools --group=$tool_group --dir=$benchmark_run_dir
pbench-metadata-log --group=$tool_group --dir=$benchmark_run_dir end

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo end

# Stop the tool meisters on each registered local/remote host
pbench-tool-meister-stop
if [[ ${?} != 0 ]]; then
error_log "[${script_name}]: failed to stop the tool meisters."
fi

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo end

rmdir $benchmark_run_dir/.running
8 changes: 4 additions & 4 deletions agent/bench-scripts/pbench-iozone
Original file line number Diff line number Diff line change
Expand Up @@ -193,15 +193,15 @@ mkdir -p $benchmark_run_dir/.running
# now that the benchmark_run_dir directory exists, we can initialize the iterations file
> ${benchmark_iterations}

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo beg

# Start the tool meisters on each registered local/remote host
pbench-tool-meister-start "${tool_group}"
if [[ ${?} != 0 ]]; then
error_log "[${script_name}]: failed to start the tool meisters."
exit 1
fi

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo beg

pbench-metadata-log --group=$tool_group --dir=$benchmark_run_dir beg

trap "interrupt" INT QUIT TERM
Expand Down Expand Up @@ -232,12 +232,12 @@ ln -s ${sample} $benchmark_run_dir/$iteration/reference-result
pbench-end-tools --group=$tool_group --dir=$benchmark_run_dir
pbench-metadata-log --group=$tool_group --dir=$benchmark_run_dir end

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo end

# Stop the tool meisters on each registered local/remote host
pbench-tool-meister-stop
if [[ ${?} != 0 ]]; then
error_log "[${script_name}]: failed to stop the tool meisters."
fi

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo end

rmdir $benchmark_run_dir/.running
8 changes: 4 additions & 4 deletions agent/bench-scripts/pbench-linpack
Original file line number Diff line number Diff line change
Expand Up @@ -135,15 +135,15 @@ benchmark_results_dir="$benchmark_run_dir/$iteration/${sample}"
result_file=$benchmark_results_dir/result.txt
mkdir -p $benchmark_results_dir

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo beg

# Start the tool meisters on each registered local/remote host
pbench-tool-meister-start "${tool_group}"
if [[ ${?} != 0 ]]; then
error_log "[${script_name}]: failed to start the tool meisters."
exit 1
fi

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo beg

pbench-metadata-log --group=$tool_group --dir=$benchmark_run_dir beg

trap "interrupt" INT QUIT TERM
Expand All @@ -161,12 +161,12 @@ ln -s ${sample} $benchmark_run_dir/$iteration/reference-result
pbench-end-tools --group=$tool_group --dir=$benchmark_run_dir
pbench-metadata-log --group=$tool_group --dir=$benchmark_run_dir end

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo end

# Stop the tool meisters on each registered local/remote host
pbench-tool-meister-stop
if [[ ${?} != 0 ]]; then
error_log "[${script_name}]: failed to stop the tool meisters."
fi

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo end

rmdir $benchmark_run_dir/.running
8 changes: 4 additions & 4 deletions agent/bench-scripts/pbench-migrate
Original file line number Diff line number Diff line change
Expand Up @@ -348,15 +348,15 @@ if [ $loops -eq 0 ]; then
loops=1
fi

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo beg

# Start the tool meisters on each registered local/remote host
pbench-tool-meister-start "${tool_group}"
if [[ ${?} != 0 ]]; then
error_log "[${script_name}]: failed to start the tool meisters."
exit 1
fi

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo beg

pbench-metadata-log --group=$tool_group --dir=$benchmark_run_dir beg

trap "interrupt" INT QUIT TERM
Expand Down Expand Up @@ -418,12 +418,12 @@ wait
pbench-end-tools --group=$tool_group --dir=$benchmark_run_dir
pbench-metadata-log --group=$tool_group --dir=$benchmark_run_dir end

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo end

# Stop the tool meisters on each registered local/remote host
pbench-tool-meister-stop
if [[ ${?} != 0 ]]; then
error_log "[${script_name}]: failed to stop the tool meisters."
fi

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo end

rmdir $benchmark_run_dir/.running
8 changes: 4 additions & 4 deletions agent/bench-scripts/pbench-netperf
Original file line number Diff line number Diff line change
Expand Up @@ -439,15 +439,15 @@ printf "\n" >>$benchmark_summary_html_file
# disable firewall on local system
systemctl stop firewalld

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo beg

# Start the tool meisters on each registered local/remote host
pbench-tool-meister-start "${tool_group}"
if [[ ${?} != 0 ]]; then
error_log "[${script_name}]: failed to start the tool meisters."
exit 1
fi

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo beg

pbench-metadata-log --group=$tool_group --dir=$benchmark_run_dir beg

trap "interrupt" INT QUIT TERM
Expand Down Expand Up @@ -641,12 +641,12 @@ printf -- "</pre>\n" >>$benchmark_summary_html_file
pbench-end-tools --group=$tool_group --dir=$benchmark_run_dir
pbench-metadata-log --group=$tool_group --dir=$benchmark_run_dir end

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo end

# Stop the tool meisters on each registered local/remote host
pbench-tool-meister-stop
if [[ ${?} != 0 ]]; then
error_log "[${script_name}]: failed to stop the tool meisters."
fi

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo end

rmdir $benchmark_run_dir/.running
10 changes: 5 additions & 5 deletions agent/bench-scripts/pbench-specjbb2005
Original file line number Diff line number Diff line change
Expand Up @@ -267,16 +267,16 @@ benchmark_iterations="${benchmark_run_dir}/.iterations"

pbench-register-tool-trigger --group=$tool_group --start-trigger="Timing Measurement began" --stop-trigger="Timing Measurement ended"

# Collect system information before we begin, and record the beginning.
pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo beg

# Start the tool meisters on each registered local/remote host
pbench-tool-meister-start "${tool_group}"
if [[ ${?} != 0 ]]; then
error_log "[${script_name}]: failed to start the tool meisters."
exit 1
fi

# Collect system information before we begin, and record the beginning.
pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo beg

pbench-metadata-log --group=$tool_group --dir=$benchmark_run_dir beg

trap "interrupt" INT QUIT TERM
Expand Down Expand Up @@ -392,12 +392,12 @@ popd > /dev/null 2>&1
pbench-end-tools --group=$tool_group --dir=$benchmark_run_dir
pbench-metadata-log --group=$tool_group --dir=$benchmark_run_dir end

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo end

# Stop the tool meisters on each registered local/remote host
pbench-tool-meister-stop
if [[ ${?} != 0 ]]; then
error_log "[${script_name}]: failed to stop the tool meisters."
fi

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo end

rmdir $benchmark_run_dir/.running
8 changes: 4 additions & 4 deletions agent/bench-scripts/pbench-trafficgen
Original file line number Diff line number Diff line change
Expand Up @@ -997,15 +997,15 @@ echo "Total number of benchmark iterations: $total_iterations"

export benchmark=${benchmark_name}

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo beg

# Start the tool meisters on each registered local/remote host
pbench-tool-meister-start "${tool_group}"
if [[ ${?} != 0 ]]; then
error_log "[${script_name}]: failed to start the tool meisters."
exit 1
fi

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo beg

pbench-metadata-log --group=$tool_group --dir=$benchmark_run_dir beg

trap "interrupt" INT QUIT TERM
Expand Down Expand Up @@ -1308,12 +1308,12 @@ fi

pbench-metadata-log --group=$tool_group --dir=$benchmark_run_dir end

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo end

# Stop the tool meisters on each registered local/remote host
pbench-tool-meister-stop
if [[ ${?} != 0 ]]; then
error_log "[${script_name}]: failed to stop the tool meisters."
fi

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo beg

rmdir $benchmark_run_dir/.running
8 changes: 4 additions & 4 deletions agent/bench-scripts/pbench-uperf
Original file line number Diff line number Diff line change
Expand Up @@ -499,15 +499,15 @@ for protocol in `echo $protocols | sed -e s/,/" "/g`; do
done
done

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo beg

# Start the tool meisters on each registered local/remote host
pbench-tool-meister-start "${tool_group}"
if [[ ${?} != 0 ]]; then
error_log "[${script_name}]: failed to start the tool meisters."
exit 1
fi

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo beg

pbench-metadata-log --group=$tool_group --dir=$benchmark_run_dir beg

trap "interrupt" INT QUIT TERM
Expand Down Expand Up @@ -746,12 +746,12 @@ $benchmark_run_dir/generate-benchmark-summary.cmd
pbench-end-tools --group=$tool_group --dir=$benchmark_run_dir
pbench-metadata-log --group=$tool_group --dir=$benchmark_run_dir end

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo end

# Stop the tool meisters on each registered local/remote host
pbench-tool-meister-stop
if [[ ${?} != 0 ]]; then
error_log "[${script_name}]: failed to stop the tool meisters."
fi

pbench-collect-sysinfo --group=$tool_group --dir=$benchmark_run_dir --sysinfo=$sysinfo end

rmdir $benchmark_run_dir/.running
8 changes: 4 additions & 4 deletions agent/bench-scripts/pbench-user-benchmark
Original file line number Diff line number Diff line change
Expand Up @@ -355,17 +355,17 @@ for rdir in ${result_dirs}; do
ln -s "$(basename "${rdir}")" "$(dirname "${rdir}")/reference-result"
done

${script_path}/postprocess/user-benchmark-wrapper "${benchmark_run_dir}" "${total_duration}"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In all the other bench-scripts we invoke pbench-metadata-log, then pbench-collect-sysinfo, and then pbench-tool-meister-stop. This change corrects pbench-user-benchmark to do the same.

However, we used to run the user-benchmark-wrapper after pbench-metadata-log and then pbench-tool-meister-stop, immediately before pbench-collect-sysinfo. Preserving that sequence was not possible, so we now run the user-benchmark-wrapper before we run the finalization sequence.

I don't think that will be a problem, but it seemed running it after everything would make the user wait longer for their optional script to run than it did before. This way it runs as soon as possible.


pbench-metadata-log --group="${tool_group}" --dir="${benchmark_run_dir}" end

pbench-collect-sysinfo --group="${tool_group}" --dir="${benchmark_run_dir}" --sysinfo="${sysinfo}" end

# Stop the tool meisters on each registered local/remote host
pbench-tool-meister-stop
if [[ ${?} != 0 ]]; then
error_log "[${script_name}]: failed to stop the tool meisters."
fi

${script_path}/postprocess/user-benchmark-wrapper "${benchmark_run_dir}" "${total_duration}"

pbench-collect-sysinfo --group="${tool_group}" --dir="${benchmark_run_dir}" --sysinfo="${sysinfo}" end

rmdir ${benchmark_run_dir}/.running
exit 0
2 changes: 1 addition & 1 deletion agent/bench-scripts/tests/pbench-trafficgen/test-22.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32172,7 +32172,7 @@ Iteration 3-revunidirectional-74B-1000flows-0.0pct_drop complete (3 of 3), with
--- pbench.log file contents
+++ test-execution.log file contents
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/trafficgen_test-22_1970.01.01T00.00.00 --sysinfo=none beg
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/trafficgen_test-22_1970.01.01T00.00.00 --sysinfo=none beg
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/trafficgen_test-22_1970.01.01T00.00.00 --sysinfo=none end
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --sysinfo=none --check
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-metadata-log --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/trafficgen_test-22_1970.01.01T00.00.00 beg
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-metadata-log --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent/trafficgen_test-22_1970.01.01T00.00.00 end
Expand Down
2 changes: 1 addition & 1 deletion agent/bench-scripts/tests/pbench-trafficgen/test-39.txt
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Iteration 3-revunidirectional-74B-1000flows-0.0pct_drop complete (3 of 3), with
/var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/trafficgen-postprocess /var/tmp/pbench-test-bench/pbench-agent/3-revunidirectional-74B-1000flows-0.0pct_drop/sample1 3-revunidirectional-74B-1000flows-0.0pct_drop 0.0 unknown default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/cat /proc/cmdline
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent --sysinfo=none beg
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent --sysinfo=none beg
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent --sysinfo=none end
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --sysinfo=none --check
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-end-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-init-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent
Expand Down
2 changes: 1 addition & 1 deletion agent/bench-scripts/tests/pbench-trafficgen/test-40.txt
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Iteration 3-revunidirectional-74B-1000flows-0.0pct_drop complete (3 of 3), with
/var/tmp/pbench-test-bench/opt/pbench-agent/bench-scripts/postprocess/trafficgen-postprocess /var/tmp/pbench-test-bench/pbench-agent/3-revunidirectional-74B-1000flows-0.0pct_drop/sample1 3-revunidirectional-74B-1000flows-0.0pct_drop 0.0 unknown default
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/cat /proc/cmdline
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent --sysinfo=none beg
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent --sysinfo=none beg
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent --sysinfo=none end
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-collect-sysinfo --sysinfo=none --check
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-end-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent
/var/tmp/pbench-test-bench/opt/pbench-agent/unittest-scripts/pbench-init-tools --group=default --dir=/var/tmp/pbench-test-bench/pbench-agent
Expand Down
Loading