Skip to content

Commit 2564d2b

Browse files
committed
Change the wildcard path to fiologparser_hist.py
fiologparser_hist.py was complaining that it could not find the clat_hist files it was looking for. That's because fio --client pulls back the *_clat_hist.*.log.* files under the sampleX/ directory, not under sampleX/clients/<mumble>. Also added a couple of fixes to eliminate noise: made a stdout redirection into a stderr redirection and added a -f to rm.
1 parent c529575 commit 2564d2b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

agent/bench-scripts/pbench-fio

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -594,12 +594,12 @@ function fio_run_job() {
594594
debug_log "getting log files from clients"
595595
for client in `echo $clients | sed -e s/,/" "/g`; do
596596
mkdir -p $benchmark_results_dir/clients/$client
597-
scp $ssh_opts $client:"$benchmark_results_dir/*.log" $benchmark_results_dir/clients/$client/ >/dev/null &
597+
scp $ssh_opts $client:"$benchmark_results_dir/*.log" $benchmark_results_dir/clients/$client/ 2>/dev/null &
598598
done
599599
wait
600600
for client in `echo $clients | sed -e s/,/" "/g`; do
601601
mkdir -p $benchmark_results_dir/clients/$client
602-
ssh $ssh_opts $client /bin/rm "$benchmark_results_dir/*.log" &
602+
ssh $ssh_opts $client /bin/rm -f "$benchmark_results_dir/*.log" &
603603
done
604604
wait
605605
else
@@ -723,7 +723,7 @@ function fio_run_benchmark() {
723723
# NOTE: If --log_unix_epoch gets enabled in fio.job, then fiologparser_hist.py will not merge
724724
# histograms into an "average" across the samples.
725725
fiologparser_hist.py \
726-
$iteration_dir/sample*/clients/*/*_clat_hist.* \
726+
$iteration_dir/sample*/fio_clat_hist.*.log.* \
727727
> $hist_results/hist.csv
728728
$script_path/postprocess/$benchmark-postprocess-viz.py \
729729
--job-file=$iteration_dir/sample1/fio.job \

agent/bench-scripts/postprocess/fio-postprocess

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ my $js_str;
1414
my $interval = `cat $dir/fio.job | grep "^log_hist_msec"`;
1515
if ( ! $interval =~ /^\s*$/ ) {
1616
system("mkdir -p $dir/hist");
17-
system("fiologparser_hist.py $dir/clients/*/*_clat_hist.* > $dir/hist/hist.csv");
17+
system("fiologparser_hist.py $dir/fio_clat_hist.*.log.* > $dir/hist/hist.csv");
1818
system(abs_path($0) . "-viz.py --job-file=$dir/fio.job $dir/hist");
1919
}
2020

0 commit comments

Comments
 (0)