[CRIU] [PATCH 09/12]v2 test/dedup: dedup on "parent" before restoring

Pavel Emelyanov xemul at parallels.com
Mon Dec 16 06:01:39 PST 2013


On 12/16/2013 02:55 PM, Tikhomirov Pavel wrote:
> if size become smaller and restored ok, then test passed

"and restored OK" is not fully correct. You must also add a patch, that
modifies the read_pagemap_page() -- it should check that it reads data,
not hole, from the file. Read man for lseek + SEEK_DATA + SEEK_HOLE for
details.

> use mem-snap.sh
> 
> Signed-off-by: Tikhomirov Pavel <snorcht at gmail.com>
> ---
>  test/mem-snap/run-snap-dedup.sh |   91 +++++++++++++++++++++++++++++++++++++++
>  1 file changed, 91 insertions(+)
>  create mode 100755 test/mem-snap/run-snap-dedup.sh
> 
> diff --git a/test/mem-snap/run-snap-dedup.sh b/test/mem-snap/run-snap-dedup.sh
> new file mode 100755
> index 0000000..6b08e53
> --- /dev/null
> +++ b/test/mem-snap/run-snap-dedup.sh
> @@ -0,0 +1,91 @@
> +#!/bin/bash
> +
> +source ../env.sh || exit 1
> +
> +USEPS=0
> +
> +if [ "$1" = "-s" ]; then
> +	echo "Will test via page-server"
> +	USEPS=1
> +	shift
> +fi
> +
> +NRSNAP=${1:-3}
> +SPAUSE=${2:-4}
> +PORT=12345
> +
> +function fail {
> +	echo "$@"
> +	exit 1
> +}
> +set -x
> +
> +IMGDIR="dump/"
> +
> +rm -rf "$IMGDIR"
> +mkdir "$IMGDIR"
> +
> +echo "Launching test"
> +cd ../zdtm/live/static/
> +make cleanout
> +make mem-touch
> +make mem-touch.pid || fail "Can't start test"
> +PID=$(cat mem-touch.pid)
> +kill -0 $PID || fail "Test didn't start"
> +cd -
> +
> +echo "Making $NRSNAP snapshots"
> +
> +for SNAP in $(seq 1 $NRSNAP); do
> +	sleep $SPAUSE
> +	mkdir "$IMGDIR/$SNAP/"
> +	if [ $SNAP -eq 1 ] ; then
> +		# First snapshot -- no parent, keep running
> +		args="--track-mem -R"
> +	elif [ $SNAP -eq $NRSNAP ]; then
> +		# Last snapshot -- has parent, kill afterwards
> +		args="--prev-images-dir=../$((SNAP - 1))/"
> +	else
> +		# Other snapshots -- have parent, keep running
> +		args="--prev-images-dir=../$((SNAP - 1))/ --track-mem -R"
> +	fi
> +
> +	if [ $USEPS -eq 1 ]; then
> +		${CRIU} page-server -D "${IMGDIR}/$SNAP/" -o ps.log --port ${PORT} -v4 &
> +		PS_PID=$!
> +		ps_args="--page-server --address 127.0.0.1 --port=${PORT}"
> +	else
> +		ps_args=""
> +	fi
> +
> +	${CRIU} dump -D "${IMGDIR}/$SNAP/" -o dump.log -t ${PID} -v4 $args $ps_args || fail "Fail to dump"
> +	if [ $USEPS -eq 1 ]; then
> +		wait $PS_PID
> +	fi
> +done
> +
> +echo "Dedup test"
> +
> +size_first=$(du -sh -BK  dump/2/pages-*.img | grep -Eo '[0-9]+' | head -1)
> +
> +${CRIU} dedup -D "${IMGDIR}/$NRSNAP/"
> +
> +size_last=$(du -sh -BK dump/2/pages-*.img | grep -Eo '[0-9]+' | head -1)
> +
> +dedup_ok=1
> +if [ $size_first -gt $size_last ]; then
> +	dedup_ok=0	
> +fi
> +
> +echo "Restoring"
> +${CRIU} restore -D "${IMGDIR}/$NRSNAP/" -o restore.log -d -v4 || fail "Fail to restore server"
> +
> +cd ../zdtm/live/static/
> +make mem-touch.out
> +cat mem-touch.out | fgrep PASS || fail "Test failed"
> +
> +if [ $dedup_ok -ne 0 ]; then
> +	fail "Dedup test failed"
> +fi
> +
> +echo "Test PASSED"
> 




More information about the CRIU mailing list