Commit 13a809a9 authored by Andrey Vagin's avatar Andrey Vagin Committed by Pavel Emelyanov

zdtm.sh: fix indentations

Signed-off-by: 's avatarAndrey Vagin <avagin@openvz.org>
Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
parent 5bf83eaf
......@@ -350,63 +350,63 @@ EOF
for i in `seq $ITERATIONS`; do
ddump=dump/$tname/$PID/$i
DUMP_PATH=`pwd`/$ddump
echo Dump $PID
mkdir -p $ddump
if [ $PAGE_SERVER -eq 1 ]; then
$CRIU page-server -D $ddump -o page_server.log -v4 --port $PS_PORT --daemon
PS_PID=$!
opts="--page-server --address 127.0.0.1 --port $PS_PORT"
fi
ddump=dump/$tname/$PID/$i
DUMP_PATH=`pwd`/$ddump
echo Dump $PID
mkdir -p $ddump
if [ $PAGE_SERVER -eq 1 ]; then
$CRIU page-server -D $ddump -o page_server.log -v4 --port $PS_PORT --daemon
PS_PID=$!
opts="--page-server --address 127.0.0.1 --port $PS_PORT"
fi
save_fds $PID $ddump/dump.fd
setsid $CRIU_CPT dump $opts --file-locks --tcp-established $linkremap \
-x --evasive-devices -D $ddump -o dump.log -v4 -t $PID $args $ARGS || {
echo WARNING: process $tname is left running for your debugging needs
return 1
}
if [ $PAGE_SERVER -eq 1 ]; then
wait $PS_PID
fi
save_fds $PID $ddump/dump.fd
setsid $CRIU_CPT dump $opts --file-locks --tcp-established $linkremap \
-x --evasive-devices -D $ddump -o dump.log -v4 -t $PID $args $ARGS || {
echo WARNING: process $tname is left running for your debugging needs
return 1
}
if expr " $ARGS" : ' -s' > /dev/null; then
save_fds $PID $ddump/dump.fd.after
diff_fds $ddump/dump.fd $ddump/dump.fd.after || return 1
killall -CONT $tname
if [[ $linkremap ]]; then
echo "remove ./$tdir/link_remap.*"
rm -f ./$tdir/link_remap.*
if [ $PAGE_SERVER -eq 1 ]; then
wait $PS_PID
fi
else
# Wait while tasks are dying, otherwise PIDs would be busy.
for i in $ddump/core-*.img; do
local pid
[ -n "$PIDNS" ] && break;
if expr " $ARGS" : ' -s' > /dev/null; then
save_fds $PID $ddump/dump.fd.after
diff_fds $ddump/dump.fd $ddump/dump.fd.after || return 1
killall -CONT $tname
if [[ $linkremap ]]; then
echo "remove ./$tdir/link_remap.*"
rm -f ./$tdir/link_remap.*
fi
else
# Wait while tasks are dying, otherwise PIDs would be busy.
for i in $ddump/core-*.img; do
local pid
[ -n "$PIDNS" ] && break;
pid=`expr "$i" : '.*/core-\([0-9]*\).img'`
while :; do
kill -0 $pid > /dev/null 2>&1 || break;
echo Waiting the process $pid
sleep 0.1
done
done
echo Restore
setsid $CRIU restore --file-locks --tcp-established -x -D $ddump -o restore.log -v4 -d $args || return 2
pid=`expr "$i" : '.*/core-\([0-9]*\).img'`
while :; do
kill -0 $pid > /dev/null 2>&1 || break;
echo Waiting the process $pid
sleep 0.1
for i in `seq 5`; do
save_fds $PID $ddump/restore.fd
diff_fds $ddump/dump.fd $ddump/restore.fd && break
sleep 0.2
done
done
echo Restore
setsid $CRIU restore --file-locks --tcp-established -x -D $ddump -o restore.log -v4 -d $args || return 2
for i in `seq 5`; do
save_fds $PID $ddump/restore.fd
diff_fds $ddump/dump.fd $ddump/restore.fd && break
sleep 0.2
done
[ $i -eq 5 ] && return 2;
[ -n "$PIDNS" ] && PID=`cat $TPID`
fi
[ $i -eq 5 ] && return 2;
[ -n "$PIDNS" ] && PID=`cat $TPID`
fi
done
......
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