x
/
browbeat
Code Issues Proposed changes

New result structure. Connmon output being sent to /tmp

This commit is contained in:
Joe Talerico 2015-10-28 14:59:59 -04:00
parent 7ce312e386
commit 4fd4c355f4
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
browbeat.sh
View File

@ -202,11 +202,12 @@ run_rally()
sed -i "s/\"times\": 1,/\"times\": ${times},/g" ${task_dir}/${task_file}
truncate_token_bloat
mkdir -p results/${test_prefix}/${task_file}/run-$i/
results_dir=results/${test_prefix}/$osp_service/${task_file}/run-$i
mkdir -p $results_dir
if $CONNMON ; then
log Starting connmon
sed -i 's/csv_dump:.*/csv_dump: results\/${test_prefix}\/${task_file}\/run-${i}\/current-run.csv/g' connmon/config
sed -i "s/csv_dump:.*/csv_dump: results\/$test_prefix\/$osp_service\/$task_file\/run-$i\/current-run.csv/g" connmon/config
connmond --config connmon/config > /tmp/connmond-${test_name} 2>&1 &
CONNMON_PID=$!
fi
@ -222,7 +223,7 @@ run_rally()
if $CONNMON ; then
log Stopping connmon
kill -9 $CONNMON_PID
mv results/${task_prefix}/${test_name}/run-$i/current-run.csv results/${task_prefix}/${test_name}/run-$i/${test_name}.csv
mv ${results_dir}/current-run.csv ${results_dir}/${test_name}.csv
fi
# grep the log file for the results to be run
@ -236,8 +237,8 @@ run_rally()
move-results --prefix=${test_prefix}/${task_file}-${concur}
clear-tools
fi
mv ${test_name}.log results/${task_prefix}/${test_name}/run-$i/
mv ${test_name}.html results/${task_prefix}/${test_name}/run-$i/
mv ${test_name}.log $results_dir
mv ${test_name}.html $results_dir
sed -i "s/\"concurrency\": ${concur},/\"concurrency\": 1,/g" ${task_dir}/${task_file}
sed -i "s/\"times\": ${times},/\"times\": 1,/g" ${task_dir}/${task_file}