Commit 81f73dd3 authored by Leif Walsh's avatar Leif Walsh Committed by Yoni Fogel

[t:4382] fix tmpfile logging, directory creation, output nonsense

git-svn-id: file:///svn/toku/tokudb@38704 c7de825b-a66e-492c-adef-691d508d4ae1
parent 6bf03f61
...@@ -84,7 +84,7 @@ save_failure() { ...@@ -84,7 +84,7 @@ save_failure() {
num_update=$1; shift num_update=$1; shift
phase=$1; shift phase=$1; shift
dest="${dir}/${exec}-${table_size}-${cachetable_size}-${num_ptquery}-${num_update}-${phase}-$$" dest="${dir}/${exec}-${table_size}-${cachetable_size}-${num_ptquery}-${num_update}-${phase}-$$"
mkdir "$dest" mkdir -p "$dest"
mv $out "${dest}/output.txt" mv $out "${dest}/output.txt"
mv core* "${dest}/" mv core* "${dest}/"
mv $envdir "${dest}/" mv $envdir "${dest}/"
...@@ -99,6 +99,7 @@ run_test() { ...@@ -99,6 +99,7 @@ run_test() {
mylog="$1"; shift mylog="$1"; shift
mysavedir="$1"; shift mysavedir="$1"; shift
tmplog=$(mktemp)
ulimit -c unlimited ulimit -c unlimited
t0="$(date)" t0="$(date)"
t1="" t1=""
...@@ -108,23 +109,23 @@ run_test() { ...@@ -108,23 +109,23 @@ run_test() {
--num_elements $table_size \ --num_elements $table_size \
--cachetable_size $cachetable_size \ --cachetable_size $cachetable_size \
--num_ptquery_threads $num_ptquery \ --num_ptquery_threads $num_ptquery \
--num_update_threads $num_update > "/tmp/run.stress-tests.tmp.$$" --num_update_threads $num_update > $tmplog
then then
rm "/tmp/run.stress-tests.tmp.$$" rm -f $tmplog
t1="$(date)" t1="$(date)"
if ./$exec -v --recover --envdir "$envdir" \ if ./$exec -v --recover --envdir "$envdir" \
--num_elements $table_size \ --num_elements $table_size \
--cachetable_size $cachetable_size > "/tmp/run.stress-tests.tmp.$$" --cachetable_size $cachetable_size > $tmplog
then then
rm "/tmp/run.stress-tests.tmp.$$" rm -f $tmplog
t2="$(date)" t2="$(date)"
echo "\"$exec\",$table_size,$cachetable_size,$num_ptquery,$num_update,$t0,$t1,$t2,PASS" > "$mylog" echo "\"$exec\",$table_size,$cachetable_size,$num_ptquery,$num_update,$t0,$t1,$t2,PASS" > "$mylog"
else else
save_failure "$mysavedir" "/tmp/run.stress-tests.tmp.$$" $envdir $exec $table_size $cachetable_size $num_ptquery $num_update recover save_failure "$mysavedir" $tmplog $envdir $exec $table_size $cachetable_size $num_ptquery $num_update recover
echo "\"$exec\",$table_size,$cachetable_size,$num_ptquery,$num_update,$t0,$t1,$t2,FAIL" > "$mylog" echo "\"$exec\",$table_size,$cachetable_size,$num_ptquery,$num_update,$t0,$t1,$t2,FAIL" > "$mylog"
fi fi
else else
save_failure "$mysavedir" "/tmp/run.stress-tests.tmp.$$" $envdir $exec $table_size $cachetable_size $num_ptquery $num_update test save_failure "$mysavedir" $tmplog $envdir $exec $table_size $cachetable_size $num_ptquery $num_update test
echo "\"$exec\",$table_size,$cachetable_size,$num_ptquery,$num_update,$t0,$t1,$t2,FAIL" > "$mylog" echo "\"$exec\",$table_size,$cachetable_size,$num_ptquery,$num_update,$t0,$t1,$t2,FAIL" > "$mylog"
fi fi
} }
...@@ -135,10 +136,6 @@ loop_test() { ...@@ -135,10 +136,6 @@ loop_test() {
cachetable_size="$1"; shift cachetable_size="$1"; shift
mylog="$1"; shift mylog="$1"; shift
mysavedir="$1"; shift mysavedir="$1"; shift
echo "Logging to $mylog" 1>&2
touch $mylog
echo "Failures saved to $mysavedir" 1>&2
mkdir $mysavedir
ptquery_rand=0 ptquery_rand=0
update_rand=0 update_rand=0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment