Commit 65867047 authored by Howard Chu's avatar Howard Chu Committed by Quanah Gibson-Mount
Browse files

Fix log parsing, broken by 8d74f717

parent 70868ba9
...@@ -314,13 +314,13 @@ FIRST=$CNT ...@@ -314,13 +314,13 @@ FIRST=$CNT
# queries 2-6,8-10 are cacheable # queries 2-6,8-10 are cacheable
CACHEABILITY=0111110111 CACHEABILITY=0111110111
grep CACHEABLE $LOG2 | awk '{ grep CACHEABLE $LOG2 | awk '{
if ($2 == "NOT") if ($3 == "NOT")
printf "Query %d not cacheable\n",NR printf "Query %d not cacheable\n",NR
else else
printf "Query %d cacheable\n",NR printf "Query %d cacheable\n",NR
}' }'
CACHED=`grep CACHEABLE $LOG2 | awk '{ CACHED=`grep CACHEABLE $LOG2 | awk '{
if ($2 == "NOT") if ($3 == "NOT")
printf "0" printf "0"
else else
printf "1" printf "1"
...@@ -330,6 +330,8 @@ if test "$CACHEABILITY" = "$CACHED" ; then ...@@ -330,6 +330,8 @@ if test "$CACHEABILITY" = "$CACHED" ; then
echo "Successfully verified cacheability" echo "Successfully verified cacheability"
else else
echo "Error in verifying cacheability" echo "Error in verifying cacheability"
echo "$CACHED"
echo "$CACHEABILITY"
test $KILLSERVERS != no && kill -HUP $KILLPIDS test $KILLSERVERS != no && kill -HUP $KILLPIDS
exit 1 exit 1
fi fi
...@@ -466,7 +468,7 @@ fi ...@@ -466,7 +468,7 @@ fi
ANSWERABILITY=1110011 ANSWERABILITY=1110011
grep ANSWERABLE $LOG2 | awk "BEGIN {FIRST=$FIRST}"'{ grep ANSWERABLE $LOG2 | awk "BEGIN {FIRST=$FIRST}"'{
if (NR > FIRST) { if (NR > FIRST) {
if ($2 == "NOT") if ($3 == "NOT")
printf "Query %d not answerable\n",NR printf "Query %d not answerable\n",NR
else else
printf "Query %d answerable\n",NR printf "Query %d answerable\n",NR
...@@ -474,7 +476,7 @@ grep ANSWERABLE $LOG2 | awk "BEGIN {FIRST=$FIRST}"'{ ...@@ -474,7 +476,7 @@ grep ANSWERABLE $LOG2 | awk "BEGIN {FIRST=$FIRST}"'{
}' }'
ANSWERED=`grep ANSWERABLE $LOG2 | awk "BEGIN {FIRST=$FIRST}"'{ ANSWERED=`grep ANSWERABLE $LOG2 | awk "BEGIN {FIRST=$FIRST}"'{
if (NR > FIRST) { if (NR > FIRST) {
if ($2 == "NOT") if ($3 == "NOT")
printf "0" printf "0"
else else
printf "1" printf "1"
...@@ -535,7 +537,7 @@ if test $RC != 0 ; then ...@@ -535,7 +537,7 @@ if test $RC != 0 ; then
exit $RC exit $RC
fi fi
SLEEP=`expr $PCACHETTR + $PCACHE_CCPERIOD` SLEEP=`expr $PCACHETTR + $PCACHE_CCPERIOD + 1`
echo "Waiting $SLEEP seconds for cache to refresh" echo "Waiting $SLEEP seconds for cache to refresh"
sleep $SLEEP sleep $SLEEP
......
Supports Markdown
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