update
This commit is contained in:
parent
be6f615996
commit
c53e90bcdc
1 changed files with 9 additions and 6 deletions
|
@ -20,6 +20,7 @@ then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
TIMEOUT=timeout
|
TIMEOUT=timeout
|
||||||
|
TIMEOUT2=""
|
||||||
if timeout 2s sleep 1 > /dev/null 2>&1
|
if timeout 2s sleep 1 > /dev/null 2>&1
|
||||||
then
|
then
|
||||||
:
|
:
|
||||||
|
@ -35,7 +36,9 @@ else
|
||||||
fi
|
fi
|
||||||
if [ "$TIMEOUT" != "" ]
|
if [ "$TIMEOUT" != "" ]
|
||||||
then
|
then
|
||||||
TIMEOUT+=" -k 2s 50s "
|
TIMEOUT2=$TIMEOUT
|
||||||
|
TIMEOUT2+=" -k 2s 120s "
|
||||||
|
TIMEOUT+=" -k 2s 45s "
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# run the test in a fresh sub-directory.
|
# run the test in a fresh sub-directory.
|
||||||
|
@ -276,30 +279,30 @@ sort mr-out-0 > mr-correct-crash.txt
|
||||||
rm -f mr-out*
|
rm -f mr-out*
|
||||||
|
|
||||||
rm -f mr-done
|
rm -f mr-done
|
||||||
($TIMEOUT ../mrcoordinator ../pg*txt ; touch mr-done ) &
|
($TIMEOUT2 ../mrcoordinator ../pg*txt ; touch mr-done ) &
|
||||||
sleep 1
|
sleep 1
|
||||||
|
|
||||||
# start multiple workers
|
# start multiple workers
|
||||||
$TIMEOUT ../mrworker ../../mrapps/crash.so &
|
$TIMEOUT2 ../mrworker ../../mrapps/crash.so &
|
||||||
|
|
||||||
# mimic rpc.go's coordinatorSock()
|
# mimic rpc.go's coordinatorSock()
|
||||||
SOCKNAME=/var/tmp/5840-mr-`id -u`
|
SOCKNAME=/var/tmp/5840-mr-`id -u`
|
||||||
|
|
||||||
( while [ -e $SOCKNAME -a ! -f mr-done ]
|
( while [ -e $SOCKNAME -a ! -f mr-done ]
|
||||||
do
|
do
|
||||||
$TIMEOUT ../mrworker ../../mrapps/crash.so
|
$TIMEOUT2 ../mrworker ../../mrapps/crash.so
|
||||||
sleep 1
|
sleep 1
|
||||||
done ) &
|
done ) &
|
||||||
|
|
||||||
( while [ -e $SOCKNAME -a ! -f mr-done ]
|
( while [ -e $SOCKNAME -a ! -f mr-done ]
|
||||||
do
|
do
|
||||||
$TIMEOUT ../mrworker ../../mrapps/crash.so
|
$TIMEOUT2 ../mrworker ../../mrapps/crash.so
|
||||||
sleep 1
|
sleep 1
|
||||||
done ) &
|
done ) &
|
||||||
|
|
||||||
while [ -e $SOCKNAME -a ! -f mr-done ]
|
while [ -e $SOCKNAME -a ! -f mr-done ]
|
||||||
do
|
do
|
||||||
$TIMEOUT ../mrworker ../../mrapps/crash.so
|
$TIMEOUT2 ../mrworker ../../mrapps/crash.so
|
||||||
sleep 1
|
sleep 1
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue