throttle: test that snapshots move the throttling configuration
PATCH 1/1 throttle: test that snapshots move the throttling configuration
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).
--- 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
tests/qemu-iotests/096 new file +69 -0
@@ -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'])
tests/qemu-iotests/096.out new file +5 -0
@@ -0,0 +1,5 @@ +. +---------------------------------------------------------------------- +Ran 1 tests + +OK
tests/qemu-iotests/group +1 -0
@@ -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
Signature · 1 line
2.5.1
Quoted 11 lines · Alberto Garcia
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 <[email protected]>--- 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
Looks good, I'd just like to throw in that 096 is in use by my looks-dead-but-actually-is-not and only-waiting-for-the-blockbackend-and-media-series-to-get-merged series "block: Rework bdrv_close_all()":
http://lists.nongnu.org/archive/html/qemu-block/2015-03/msg00048.html
But then again, once the prerequisites are met, I'll have to send a new version of that series anyway...
So, since 096 is not a magic number I'm extremely keen on keeping in my greedy claws:
Quoted 8 lines · Max Reitz
Quoted 2 lines
create mode 100644 tests/qemu-iotests/096 create mode 100644 tests/qemu-iotests/096.outLooks good, I'd just like to throw in that 096 is in use by my looks-dead-but-actually-is-not and only-waiting-for-the-blockbackend-and-media-series-to-get-merged series "block: Rework
bdrv_close_all()":
http://lists.nongnu.org/archive/html/qemu-block/2015-03/msg00048.html
Ah, I don't care about the number, if someone wants to change it when applying my patch I have no problem with that.
Berto
Kevin Wolf
AppliedAm 18.09.2015 um 17:54 hat Max Reitz geschrieben:
Quoted 13 lines · Alberto Garcia
Quoted 11 lines
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 <[email protected]>--- 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
Quoted 8 lines
Looks good, I'd just like to throw in that 096 is in use by my looks-dead-but-actually-is-not and only-waiting-for-the-blockbackend-and-media-series-to-get-merged series "block: Rework
bdrv_close_all()":
http://lists.nongnu.org/archive/html/qemu-block/2015-03/msg00048.htmlBut then again, once the prerequisites are met, I'll have to send a new version of that series anyway...
It's generally a good idea to check the mailing list for test numbers taken by posted, but not yet merged patches. If there are any gaps in groups, chances are high that some patch is using it, so don't fill gaps without checking that first.
Quoted 4 lines
So, since 096 is not a magic number I'm extremely keen on keeping in my greedy claws:
Reviewed-by Max Reitz <[email protected]>
Thanks, applied to the block branch.
Kevin
Ping
Quoted 112 lines · Alberto Garcia
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 <[email protected]>--- 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.outtests/qemu-iotests/096 new file +69
-0@@ -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'])tests/qemu-iotests/096.out new file +5
-0@@ -0,0 +1,5 @@ +. +---------------------------------------------------------------------- +Ran 1 tests + +OKtests/qemu-iotests/group +1
-0@@ -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 quickSignature · 1 line
2.5.1