From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37102) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLZhH-00056O-UR for qemu-devel@nongnu.org; Thu, 06 Mar 2014 09:55:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WLZhD-0001uc-EP for qemu-devel@nongnu.org; Thu, 06 Mar 2014 09:54:55 -0500 Received: from lnantes-156-75-100-125.w80-12.abo.wanadoo.fr ([80.12.84.125]:55847 helo=paradis.irqsave.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WLZhD-0001uP-0R for qemu-devel@nongnu.org; Thu, 06 Mar 2014 09:54:51 -0500 Date: Thu, 6 Mar 2014 15:54:49 +0100 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140306145449.GA22291@irqsave.net> References: <96f3586273a0cc962b3b0b96be33c0dcf44c5da8.1393639566.git.jcody@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <96f3586273a0cc962b3b0b96be33c0dcf44c5da8.1393639566.git.jcody@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] block: qemu-iotests 085 - live snapshots tests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jeff Cody Cc: kwolf@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com The Friday 28 Feb 2014 =E0 21:08:11 (-0500), Jeff Cody wrote : > This adds tests for live snapshots, both through the single > snapshot command, and the transaction group snapshot command. >=20 > The snapshots are done through the QMP interface, using the > following commands for snapshots: >=20 > Single snapshot: > { 'execute': 'blockdev-snapshot-sync', 'arguments': > { 'device': 'virtio0', 'snapshot-file':'...', > 'format': 'qcow2' } }" >=20 > Group snapshot: > { 'execute': 'transaction', 'arguments': > {'actions': [ > { 'type': 'blockdev-snapshot-sync', 'data' : > { 'device': 'virtio0', 'snapshot-file': '...' } }, > { 'type': 'blockdev-snapshot-sync', 'data' : > { 'device': 'virtio1', 'snapshot-file': '...' } } ] > } } >=20 > Signed-off-by: Jeff Cody > --- > tests/qemu-iotests/085 | 192 +++++++++++++++++++++++++++++++++++++= ++++++++ > tests/qemu-iotests/085.out | 55 +++++++++++++ > tests/qemu-iotests/group | 1 + > 3 files changed, 248 insertions(+) > create mode 100755 tests/qemu-iotests/085 > create mode 100644 tests/qemu-iotests/085.out >=20 > diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085 > new file mode 100755 > index 0000000..33c8dc4 > --- /dev/null > +++ b/tests/qemu-iotests/085 > @@ -0,0 +1,192 @@ > +#!/bin/bash > +# > +# Live snapshot tests > +# > +# This tests live snapshots of images on a running QEMU instance, usin= g > +# QMP commands. Both single disk snapshots, and transactional group > +# snapshots are performed. > +# > +# Copyright (C) 2014 Red Hat, Inc. > +# > +# This program is free software; you can redistribute it and/or modify > +# it under the terms of the GNU General Public License as published by > +# the Free Software Foundation; either version 2 of the License, or > +# (at your option) any later version. > +# > +# This program is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +# GNU General Public License for more details. > +# > +# You should have received a copy of the GNU General Public License > +# along with this program. If not, see = . > +# > + > +# creator > +owner=3Djcody@redhat.com > + > +seq=3D`basename $0` > +echo "QA output created by $seq" > + > +here=3D`pwd` > +status=3D1 # failure is the default! > +qemu_pid=3D > + > +QMP_IN=3D"${TEST_DIR}/qmp-in-$$" > +QMP_OUT=3D"${TEST_DIR}/qmp-out-$$" > + > +snapshot_virt0=3D"snapshot-v0.qcow2" > +snapshot_virt1=3D"snapshot-v1.qcow2" > + > +MAX_SNAPSHOTS=3D10 > + > +_cleanup() > +{ > + kill -KILL ${qemu_pid} > + wait ${qemu_pid} 2>/dev/null # silent kill > + > + rm -f "${QMP_IN}" "${QMP_OUT}" > + for i in $(seq 1 ${MAX_SNAPSHOTS}) > + do > + rm -f "${TEST_DIR}/${i}-${snapshot_virt0}" > + rm -f "${TEST_DIR}/${i}-${snapshot_virt1}" > + done > + _cleanup_test_img > + > +} > +trap "_cleanup; exit \$status" 0 1 2 3 15 > + > +# get standard environment, filters and checks > +. ./common.rc > +. ./common.filter > + > +_supported_fmt qcow2 > +_supported_proto file > +_supported_os Linux > + > +# Wait for expected QMP response from QEMU. Will time out > +# after 10 seconds, which counts as failure. > +# > +# $1 is the string to expect > +# > +# If $silent is set to anything but an empty string, then > +# response is not echoed out. > +function timed_wait_for() > +{ > + while read -t 10 resp <&5 > + do > + if [ "${silent}" =3D=3D "" ]; then > + echo "${resp}" | _filter_testdir | _filter_qemu > + fi > + grep -q "${1}" < <(echo ${resp}) > + if [ $? -eq 0 ]; then > + return > + fi > + done > + echo "Timeout waiting for ${1}" > + exit 1 # Timeout means the test failed > +} > + > +# Sends QMP command to QEMU, and waits for the expected response > +# > +# ${1}: String of the QMP command to send > +# ${2}: String that the QEMU response should contain > +function send_qmp_cmd() > +{ > + echo "${1}" >&6 > + timed_wait_for "${2}" > +} > + > +# ${1}: unique identifier for the snapshot filename > +function create_single_snapshot() > +{ > + cmd=3D"{ 'execute': 'blockdev-snapshot-sync', > + 'arguments': { 'device': 'virtio0', > + 'snapshot-file':'"${TEST_DIR}/${1= }-${snapshot_virt0}"', > + 'format': 'qcow2' } }" > + send_qmp_cmd "${cmd}" "return" > +} > + > +# ${1}: unique identifier for the snapshot filename > +function create_group_snapshot() > +{ > + cmd=3D"{ 'execute': 'transaction', 'arguments': > + {'actions': [ > + { 'type': 'blockdev-snapshot-sync', 'data' : > + { 'device': 'virtio0', > + 'snapshot-file': '"${TEST_DIR}/${1}-${snapshot_v= irt0}"' } }, > + { 'type': 'blockdev-snapshot-sync', 'data' : > + { 'device': 'virtio1', > + 'snapshot-file': '"${TEST_DIR}/${1}-${snapshot_= virt1}"' } } ] > + } }" > + > + send_qmp_cmd "${cmd}" "return" > +} > + > +size=3D128M > + > +mkfifo "${QMP_IN}" > +mkfifo "${QMP_OUT}" > + > +_make_test_img $size > +mv "${TEST_IMG}" "${TEST_IMG}.orig" > +_make_test_img $size > + > +echo > +echo =3D=3D=3D Running QEMU =3D=3D=3D > +echo > + > +"${QEMU}" -nographic -monitor none -serial none -qmp stdio\ > + -drive file=3D"${TEST_IMG}.orig",if=3Dvirtio\ > + -drive file=3D"${TEST_IMG}",if=3Dvirtio 2>&1 >"${QMP_OUT}" <= "${QMP_IN}"& > +qemu_pid=3D$! > + > +# redirect fifos to file descriptors, to keep from blocking > +exec 5<"${QMP_OUT}" > +exec 6>"${QMP_IN}" > + > +# Don't print response, since it has version information in it > +silent=3Dyes timed_wait_for "capabilities" > + > +echo > +echo =3D=3D=3D Sending capabilities =3D=3D=3D > +echo > + > +send_qmp_cmd "{ 'execute': 'qmp_capabilities' }" "return" > + > +echo > +echo =3D=3D=3D Create a single snapshot on virtio0 =3D=3D=3D > +echo > + > +create_single_snapshot 1 > + > + > +echo > +echo =3D=3D=3D Invalid command - missing device and nodename =3D=3D=3D > +echo > + > +send_qmp_cmd "{ 'execute': 'blockdev-snapshot-sync', > + 'arguments': { 'snapshot-file':'"${TEST_DIR}"/1-= ${snapshot_virt0}', > + 'format': 'qcow2' } }" "error" > + > +echo > +echo =3D=3D=3D Invalid command - missing snapshot-file =3D=3D=3D > +echo > + > +send_qmp_cmd "{ 'execute': 'blockdev-snapshot-sync', > + 'arguments': { 'device': 'virtio0', > + 'format': 'qcow2' } }" "error" > +echo > +echo > +echo =3D=3D=3D Create several transactional group snapshots =3D=3D=3D > +echo > + > +for i in $(seq 2 ${MAX_SNAPSHOTS}) > +do > + create_group_snapshot ${i} > +done > + > +# success, all done > +echo "*** done" > +rm -f $seq.full > +status=3D0 > diff --git a/tests/qemu-iotests/085.out b/tests/qemu-iotests/085.out > new file mode 100644 > index 0000000..0f2b17f > --- /dev/null > +++ b/tests/qemu-iotests/085.out > @@ -0,0 +1,55 @@ > +QA output created by 085 > +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 > +Formatting 'TEST_DIR/t.IMGFMT', fmt=3DIMGFMT size=3D134217728 > + > +=3D=3D=3D Running QEMU =3D=3D=3D > + > + > +=3D=3D=3D Sending capabilities =3D=3D=3D > + > +{"return": {}} > + > +=3D=3D=3D Create a single snapshot on virtio0 =3D=3D=3D > + > +Formatting 'TEST_DIR/1-snapshot-v0.qcow2', fmt=3Dqcow2 size=3D13421772= 8 backing_file=3D'TEST_DIR/t.qcow2.orig' backing_fmt=3D'qcow2' encryption= =3Doff cluster_size=3D65536 lazy_refcounts=3Doff > +{"return": {}} > + > +=3D=3D=3D Invalid command - missing device and nodename =3D=3D=3D > + > +{"error": {"class": "GenericError", "desc": "Cannot find device=3D nor= node_name=3D"}} > + > +=3D=3D=3D Invalid command - missing snapshot-file =3D=3D=3D > + > +{"error": {"class": "GenericError", "desc": "Parameter 'snapshot-file'= is missing"}} > + > + > +=3D=3D=3D Create several transactional group snapshots =3D=3D=3D > + > +Formatting 'TEST_DIR/2-snapshot-v0.qcow2', fmt=3Dqcow2 size=3D13421772= 8 backing_file=3D'TEST_DIR/1-snapshot-v0.qcow2' backing_fmt=3D'qcow2' enc= ryption=3Doff cluster_size=3D65536 lazy_refcounts=3Doff > +Formatting 'TEST_DIR/2-snapshot-v1.qcow2', fmt=3Dqcow2 size=3D13421772= 8 backing_file=3D'TEST_DIR/t.qcow2' backing_fmt=3D'qcow2' encryption=3Dof= f cluster_size=3D65536 lazy_refcounts=3Doff > +{"return": {}} > +Formatting 'TEST_DIR/3-snapshot-v0.qcow2', fmt=3Dqcow2 size=3D13421772= 8 backing_file=3D'TEST_DIR/2-snapshot-v0.qcow2' backing_fmt=3D'qcow2' enc= ryption=3Doff cluster_size=3D65536 lazy_refcounts=3Doff > +Formatting 'TEST_DIR/3-snapshot-v1.qcow2', fmt=3Dqcow2 size=3D13421772= 8 backing_file=3D'TEST_DIR/2-snapshot-v1.qcow2' backing_fmt=3D'qcow2' enc= ryption=3Doff cluster_size=3D65536 lazy_refcounts=3Doff > +{"return": {}} > +Formatting 'TEST_DIR/4-snapshot-v0.qcow2', fmt=3Dqcow2 size=3D13421772= 8 backing_file=3D'TEST_DIR/3-snapshot-v0.qcow2' backing_fmt=3D'qcow2' enc= ryption=3Doff cluster_size=3D65536 lazy_refcounts=3Doff > +Formatting 'TEST_DIR/4-snapshot-v1.qcow2', fmt=3Dqcow2 size=3D13421772= 8 backing_file=3D'TEST_DIR/3-snapshot-v1.qcow2' backing_fmt=3D'qcow2' enc= ryption=3Doff cluster_size=3D65536 lazy_refcounts=3Doff > +{"return": {}} > +Formatting 'TEST_DIR/5-snapshot-v0.qcow2', fmt=3Dqcow2 size=3D13421772= 8 backing_file=3D'TEST_DIR/4-snapshot-v0.qcow2' backing_fmt=3D'qcow2' enc= ryption=3Doff cluster_size=3D65536 lazy_refcounts=3Doff > +Formatting 'TEST_DIR/5-snapshot-v1.qcow2', fmt=3Dqcow2 size=3D13421772= 8 backing_file=3D'TEST_DIR/4-snapshot-v1.qcow2' backing_fmt=3D'qcow2' enc= ryption=3Doff cluster_size=3D65536 lazy_refcounts=3Doff > +{"return": {}} > +Formatting 'TEST_DIR/6-snapshot-v0.qcow2', fmt=3Dqcow2 size=3D13421772= 8 backing_file=3D'TEST_DIR/5-snapshot-v0.qcow2' backing_fmt=3D'qcow2' enc= ryption=3Doff cluster_size=3D65536 lazy_refcounts=3Doff > +Formatting 'TEST_DIR/6-snapshot-v1.qcow2', fmt=3Dqcow2 size=3D13421772= 8 backing_file=3D'TEST_DIR/5-snapshot-v1.qcow2' backing_fmt=3D'qcow2' enc= ryption=3Doff cluster_size=3D65536 lazy_refcounts=3Doff > +{"return": {}} > +Formatting 'TEST_DIR/7-snapshot-v0.qcow2', fmt=3Dqcow2 size=3D13421772= 8 backing_file=3D'TEST_DIR/6-snapshot-v0.qcow2' backing_fmt=3D'qcow2' enc= ryption=3Doff cluster_size=3D65536 lazy_refcounts=3Doff > +Formatting 'TEST_DIR/7-snapshot-v1.qcow2', fmt=3Dqcow2 size=3D13421772= 8 backing_file=3D'TEST_DIR/6-snapshot-v1.qcow2' backing_fmt=3D'qcow2' enc= ryption=3Doff cluster_size=3D65536 lazy_refcounts=3Doff > +{"return": {}} > +Formatting 'TEST_DIR/8-snapshot-v0.qcow2', fmt=3Dqcow2 size=3D13421772= 8 backing_file=3D'TEST_DIR/7-snapshot-v0.qcow2' backing_fmt=3D'qcow2' enc= ryption=3Doff cluster_size=3D65536 lazy_refcounts=3Doff > +Formatting 'TEST_DIR/8-snapshot-v1.qcow2', fmt=3Dqcow2 size=3D13421772= 8 backing_file=3D'TEST_DIR/7-snapshot-v1.qcow2' backing_fmt=3D'qcow2' enc= ryption=3Doff cluster_size=3D65536 lazy_refcounts=3Doff > +{"return": {}} > +Formatting 'TEST_DIR/9-snapshot-v0.qcow2', fmt=3Dqcow2 size=3D13421772= 8 backing_file=3D'TEST_DIR/8-snapshot-v0.qcow2' backing_fmt=3D'qcow2' enc= ryption=3Doff cluster_size=3D65536 lazy_refcounts=3Doff > +Formatting 'TEST_DIR/9-snapshot-v1.qcow2', fmt=3Dqcow2 size=3D13421772= 8 backing_file=3D'TEST_DIR/8-snapshot-v1.qcow2' backing_fmt=3D'qcow2' enc= ryption=3Doff cluster_size=3D65536 lazy_refcounts=3Doff > +{"return": {}} > +Formatting 'TEST_DIR/10-snapshot-v0.qcow2', fmt=3Dqcow2 size=3D1342177= 28 backing_file=3D'TEST_DIR/9-snapshot-v0.qcow2' backing_fmt=3D'qcow2' en= cryption=3Doff cluster_size=3D65536 lazy_refcounts=3Doff > +Formatting 'TEST_DIR/10-snapshot-v1.qcow2', fmt=3Dqcow2 size=3D1342177= 28 backing_file=3D'TEST_DIR/9-snapshot-v1.qcow2' backing_fmt=3D'qcow2' en= cryption=3Doff cluster_size=3D65536 lazy_refcounts=3Doff > +{"return": {}} > +*** done > diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group > index db127d9..77d0a95 100644 > --- a/tests/qemu-iotests/group > +++ b/tests/qemu-iotests/group > @@ -85,3 +85,4 @@ > 079 rw auto > 081 rw auto > 082 rw auto quick > +085 rw auto quick > --=20 > 1.8.3.1 >=20 >=20 That's some slick shell IO redirection tricks. I think I'll do a copycat test based on this one in order to test quorum snapshots. Reviewed-by: Benoit Canet