x/browbeat
Code Issues Proposed changes

Update to Results directory

Browse Source
This commit is contained in:
Joe Talerico 2015-10-28 13:10:44 -04:00
parent 3972e2f673
commit 7ce312e386
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
browbeat.sh
View File

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

4
connmon/config
View File

@ -1,5 +1,5 @@
[connmon_service_default] [connmon_service_default]
name: default name: default
csv_dump: ./current-run.csv csv_dump: ./csv_results.csv
nodes: nodes:
node1 hostname=localhost:5800 bind=0.0.0.0 node1 hostname=localhost:5800 bind=0.0.0.0