From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 02/29] throttle: test that snapshots move the throttling configuration
Date: Fri, 16 Oct 2015 17:05:47 +0200 [thread overview]
Message-ID: <1445007974-11433-3-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1445007974-11433-1-git-send-email-kwolf@redhat.com>
From: Alberto Garcia <berto@igalia.com>
If a snapshot is performed on a device that has I/O limits they should
be moved to the target image (the new active layer).
Signed-off-by: Alberto Garcia <berto@igalia.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/qemu-iotests/096 | 69 ++++++++++++++++++++++++++++++++++++++++++++++
tests/qemu-iotests/096.out | 5 ++++
tests/qemu-iotests/group | 1 +
3 files changed, 75 insertions(+)
create mode 100644 tests/qemu-iotests/096
create mode 100644 tests/qemu-iotests/096.out
diff --git a/tests/qemu-iotests/096 b/tests/qemu-iotests/096
new file mode 100644
index 0000000..e34204b
--- /dev/null
+++ b/tests/qemu-iotests/096
@@ -0,0 +1,69 @@
+#!/usr/bin/env python
+#
+# Test that snapshots move the throttling configuration to the active
+# layer
+#
+# Copyright (C) 2015 Igalia, S.L.
+#
+# 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 <http://www.gnu.org/licenses/>.
+#
+
+import iotests
+import os
+
+class TestLiveSnapshot(iotests.QMPTestCase):
+ base_img = os.path.join(iotests.test_dir, 'base.img')
+ target_img = os.path.join(iotests.test_dir, 'target.img')
+ group = 'mygroup'
+ iops = 6000
+ iops_size = 1024
+
+ def setUp(self):
+ opts = []
+ opts.append('node-name=base')
+ opts.append('throttling.group=%s' % self.group)
+ opts.append('throttling.iops-total=%d' % self.iops)
+ opts.append('throttling.iops-size=%d' % self.iops_size)
+ iotests.qemu_img('create', '-f', iotests.imgfmt, self.base_img, '100M')
+ self.vm = iotests.VM().add_drive(self.base_img, ','.join(opts))
+ self.vm.launch()
+
+ def tearDown(self):
+ self.vm.shutdown()
+ os.remove(self.base_img)
+ os.remove(self.target_img)
+
+ def checkConfig(self, active_layer):
+ result = self.vm.qmp('query-named-block-nodes')
+ for r in result['return']:
+ if r['node-name'] == active_layer:
+ self.assertEqual(r['group'], self.group)
+ self.assertEqual(r['iops'], self.iops)
+ self.assertEqual(r['iops_size'], self.iops_size)
+ else:
+ self.assertFalse(r.has_key('group'))
+ self.assertEqual(r['iops'], 0)
+ self.assertFalse(r.has_key('iops_size'))
+
+ def testSnapshot(self):
+ self.checkConfig('base')
+ self.vm.qmp('blockdev-snapshot-sync',
+ node_name = 'base',
+ snapshot_node_name = 'target',
+ snapshot_file = self.target_img,
+ format = iotests.imgfmt)
+ self.checkConfig('target')
+
+if __name__ == '__main__':
+ iotests.main(supported_fmts=['qcow2'])
diff --git a/tests/qemu-iotests/096.out b/tests/qemu-iotests/096.out
new file mode 100644
index 0000000..ae1213e
--- /dev/null
+++ b/tests/qemu-iotests/096.out
@@ -0,0 +1,5 @@
+.
+----------------------------------------------------------------------
+Ran 1 tests
+
+OK
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index 439b1d2..30c784e 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -102,6 +102,7 @@
093 auto
094 rw auto quick
095 rw auto quick
+096 rw auto quick
097 rw auto backing
098 rw auto backing quick
099 rw auto quick
--
1.8.3.1
next prev parent reply other threads:[~2015-10-16 15:06 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-16 15:05 [Qemu-devel] [PULL 00/29] Block layer patches Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 01/29] iotests: disable core dumps in test 061 Kevin Wolf
2015-10-16 15:05 ` Kevin Wolf [this message]
2015-10-16 15:05 ` [Qemu-devel] [PULL 03/29] qmp-commands.hx: Update the supported 'transaction' operations Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 04/29] block: qemu-iotests - fix vmdk test 059.out Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 05/29] block: Introduce BDS.file_child Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 06/29] vmdk: Use BdrvChild instead of BDS for references to extents Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 07/29] blkverify: Convert s->test_file to BdrvChild Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 08/29] quorum: Convert " Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 09/29] block: Convert bs->file " Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 10/29] block: Remove bdrv_open_image() Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 11/29] block: Convert bs->backing_hd to BdrvChild Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 12/29] block: Manage backing file references in bdrv_set_backing_hd() Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 13/29] block: Split bdrv_move_feature_fields() Kevin Wolf
2015-10-16 15:05 ` [Qemu-devel] [PULL 14/29] block/io: Make bdrv_requests_pending() public Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 15/29] block-backend: Add blk_set_bs() Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 16/29] block: Introduce parents list Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 17/29] block: Implement bdrv_append() without bdrv_swap() Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 18/29] blockjob: Store device name at job creation Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 19/29] block: Add and use bdrv_replace_in_backing_chain() Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 20/29] block: Remove bdrv_swap() Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 21/29] block: Allow bdrv_unref_child(bs, NULL) Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 22/29] blkverify: Fix BDS leak in .bdrv_open error path Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 23/29] util - add automated ID generation utility Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 24/29] block: auto-generated node-names Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 25/29] raw-posix: warn about BDRV_O_NATIVE_AIO if libaio is unavailable Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 26/29] blockdev: always compile in -drive aio= parsing Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 27/29] qemu-nbd: always compile in --aio=MODE option Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 28/29] qcow2: Remove forward declaration of QCowAIOCB Kevin Wolf
2015-10-16 15:06 ` [Qemu-devel] [PULL 29/29] blkdebug: Don't confuse image as backing file Kevin Wolf
2015-10-18 9:57 ` [Qemu-devel] [PULL 00/29] Block layer patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445007974-11433-3-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).