[v2] iotests: add 248: test resume mirror after auto pause on ENOSPC

[Qemu-devel] [PATCH v2] iotests: add 248: test resume mirror after auto pause on ENOSPC

Posted by Vladimir Sementsov-Ogievskiy 5 years, 1 month ago

Test that mirror job actually resume on resume command after being
automatically paused on ENOSPC error.

It's a follow-up test for 8d9648cbf3e
    "blockjob: fix user pause in block_job_error_action"

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---

v2: by Kevin's comments:
    - use limit var
    - don't duplicate blockdev options code
    - drop query-block-jobs usage with it's possibly unreliable
      offset field.

 tests/qemu-iotests/248     | 71 ++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/248.out |  8 +++++
 tests/qemu-iotests/group   |  1 +
 3 files changed, 80 insertions(+)
 create mode 100755 tests/qemu-iotests/248
 create mode 100644 tests/qemu-iotests/248.out

diff --git a/tests/qemu-iotests/248 b/tests/qemu-iotests/248
new file mode 100755
index 0000000000..f26b4bb2aa
--- /dev/null
+++ b/tests/qemu-iotests/248
@@ -0,0 +1,71 @@
+#!/usr/bin/env python
+#
+# Test resume mirror after auto pause on ENOSPC
+#
+# Copyright (c) 2019 Virtuozzo International GmbH. All rights reserved.
+#
+# 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
+from iotests import qemu_img_create, qemu_io, file_path, filter_qmp_testfiles
+
+iotests.verify_image_format(supported_fmts=['qcow2'])
+
+source, target = file_path('source', 'target')
+size = 5 * 1024 * 1024
+limit = 2 * 1024 * 1024
+
+qemu_img_create('-f', iotests.imgfmt, source, str(size))
+qemu_img_create('-f', iotests.imgfmt, target, str(size))
+qemu_io('-c', 'write 0 {}'.format(size), source)
+
+# raw format don't like empty files
+qemu_io('-c', 'write 0 {}'.format(size), target)
+
+vm = iotests.VM().add_drive(source)
+vm.launch()
+
+blockdev_opts = {
+    'driver': iotests.imgfmt,
+    'node-name': 'target',
+    'file': {
+        'driver': 'raw',
+        'size': limit,
+        'file': {
+            'driver': 'file',
+            'filename': target
+        }
+    }
+}
+vm.qmp_log('blockdev-add', filters=[filter_qmp_testfiles], **blockdev_opts)
+
+vm.qmp_log('blockdev-mirror', device='drive0', sync='full', target='target',
+           on_target_error='enospc')
+
+vm.event_wait('JOB_STATUS_CHANGE', timeout=3.0,
+              match={'data': {'status': 'paused'}})
+
+# drop other cached events, to not interfere with further wait for 'running'
+vm.get_qmp_events()
+
+del blockdev_opts['file']['size']
+vm.qmp_log('x-blockdev-reopen', filters=[filter_qmp_testfiles],
+           **blockdev_opts)
+
+vm.qmp_log('block-job-resume', device='drive0')
+vm.event_wait('JOB_STATUS_CHANGE', timeout=1.0,
+              match={'data': {'status': 'running'}})
+
+vm.shutdown()
diff --git a/tests/qemu-iotests/248.out b/tests/qemu-iotests/248.out
new file mode 100644
index 0000000000..369b25bf26
--- /dev/null
+++ b/tests/qemu-iotests/248.out
@@ -0,0 +1,8 @@
+{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "raw", "file": {"driver": "file", "filename": "TEST_DIR/PID-target"}, "size": 2097152}, "node-name": "target"}}
+{"return": {}}
+{"execute": "blockdev-mirror", "arguments": {"device": "drive0", "on-target-error": "enospc", "sync": "full", "target": "target"}}
+{"return": {}}
+{"execute": "x-blockdev-reopen", "arguments": {"driver": "qcow2", "file": {"driver": "raw", "file": {"driver": "file", "filename": "TEST_DIR/PID-target"}}, "node-name": "target"}}
+{"return": {}}
+{"execute": "block-job-resume", "arguments": {"device": "drive0"}}
+{"return": {}}
diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
index d192abaecf..41da10c6cf 100644
--- a/tests/qemu-iotests/group
+++ b/tests/qemu-iotests/group
@@ -246,3 +246,4 @@
 245 rw auto
 246 rw auto quick
 247 rw auto quick
+248 rw auto quick
-- 
2.18.0

Re: [Qemu-devel] [PATCH v2] iotests: add 248: test resume mirror after auto pause on ENOSPC

Posted by Vladimir Sementsov-Ogievskiy 5 years, 1 month ago

Hi, should I ping? Kevin, I thought you want to queue it for 4.0?


20.03.2019 14:59, Vladimir Sementsov-Ogievskiy wrote:
> Test that mirror job actually resume on resume command after being
> automatically paused on ENOSPC error.
> 
> It's a follow-up test for 8d9648cbf3e
>      "blockjob: fix user pause in block_job_error_action"
> 
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
> 
> v2: by Kevin's comments:
>      - use limit var
>      - don't duplicate blockdev options code
>      - drop query-block-jobs usage with it's possibly unreliable
>        offset field.
> 
>   tests/qemu-iotests/248     | 71 ++++++++++++++++++++++++++++++++++++++
>   tests/qemu-iotests/248.out |  8 +++++
>   tests/qemu-iotests/group   |  1 +
>   3 files changed, 80 insertions(+)
>   create mode 100755 tests/qemu-iotests/248
>   create mode 100644 tests/qemu-iotests/248.out
> 
> diff --git a/tests/qemu-iotests/248 b/tests/qemu-iotests/248
> new file mode 100755
> index 0000000000..f26b4bb2aa
> --- /dev/null
> +++ b/tests/qemu-iotests/248
> @@ -0,0 +1,71 @@
> +#!/usr/bin/env python
> +#
> +# Test resume mirror after auto pause on ENOSPC
> +#
> +# Copyright (c) 2019 Virtuozzo International GmbH. All rights reserved.
> +#
> +# 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
> +from iotests import qemu_img_create, qemu_io, file_path, filter_qmp_testfiles
> +
> +iotests.verify_image_format(supported_fmts=['qcow2'])
> +
> +source, target = file_path('source', 'target')
> +size = 5 * 1024 * 1024
> +limit = 2 * 1024 * 1024
> +
> +qemu_img_create('-f', iotests.imgfmt, source, str(size))
> +qemu_img_create('-f', iotests.imgfmt, target, str(size))
> +qemu_io('-c', 'write 0 {}'.format(size), source)
> +
> +# raw format don't like empty files
> +qemu_io('-c', 'write 0 {}'.format(size), target)
> +
> +vm = iotests.VM().add_drive(source)
> +vm.launch()
> +
> +blockdev_opts = {
> +    'driver': iotests.imgfmt,
> +    'node-name': 'target',
> +    'file': {
> +        'driver': 'raw',
> +        'size': limit,
> +        'file': {
> +            'driver': 'file',
> +            'filename': target
> +        }
> +    }
> +}
> +vm.qmp_log('blockdev-add', filters=[filter_qmp_testfiles], **blockdev_opts)
> +
> +vm.qmp_log('blockdev-mirror', device='drive0', sync='full', target='target',
> +           on_target_error='enospc')
> +
> +vm.event_wait('JOB_STATUS_CHANGE', timeout=3.0,
> +              match={'data': {'status': 'paused'}})
> +
> +# drop other cached events, to not interfere with further wait for 'running'
> +vm.get_qmp_events()
> +
> +del blockdev_opts['file']['size']
> +vm.qmp_log('x-blockdev-reopen', filters=[filter_qmp_testfiles],
> +           **blockdev_opts)
> +
> +vm.qmp_log('block-job-resume', device='drive0')
> +vm.event_wait('JOB_STATUS_CHANGE', timeout=1.0,
> +              match={'data': {'status': 'running'}})
> +
> +vm.shutdown()
> diff --git a/tests/qemu-iotests/248.out b/tests/qemu-iotests/248.out
> new file mode 100644
> index 0000000000..369b25bf26
> --- /dev/null
> +++ b/tests/qemu-iotests/248.out
> @@ -0,0 +1,8 @@
> +{"execute": "blockdev-add", "arguments": {"driver": "qcow2", "file": {"driver": "raw", "file": {"driver": "file", "filename": "TEST_DIR/PID-target"}, "size": 2097152}, "node-name": "target"}}
> +{"return": {}}
> +{"execute": "blockdev-mirror", "arguments": {"device": "drive0", "on-target-error": "enospc", "sync": "full", "target": "target"}}
> +{"return": {}}
> +{"execute": "x-blockdev-reopen", "arguments": {"driver": "qcow2", "file": {"driver": "raw", "file": {"driver": "file", "filename": "TEST_DIR/PID-target"}}, "node-name": "target"}}
> +{"return": {}}
> +{"execute": "block-job-resume", "arguments": {"device": "drive0"}}
> +{"return": {}}
> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
> index d192abaecf..41da10c6cf 100644
> --- a/tests/qemu-iotests/group
> +++ b/tests/qemu-iotests/group
> @@ -246,3 +246,4 @@
>   245 rw auto
>   246 rw auto quick
>   247 rw auto quick
> +248 rw auto quick
> 


-- 
Best regards,
Vladimir

Re: [Qemu-devel] [PATCH v2] iotests: add 248: test resume mirror after auto pause on ENOSPC

Posted by Kevin Wolf 5 years, 1 month ago

Am 20.03.2019 um 12:59 hat Vladimir Sementsov-Ogievskiy geschrieben:
> Test that mirror job actually resume on resume command after being
> automatically paused on ENOSPC error.
> 
> It's a follow-up test for 8d9648cbf3e
>     "blockjob: fix user pause in block_job_error_action"
> 
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

Thanks, applied to the block branch.

Kevin

Re: [Qemu-devel] [PATCH v2] iotests: add 248: test resume mirror after auto pause on ENOSPC

Posted by John Snow 5 years, 1 month ago


On 3/20/19 7:59 AM, Vladimir Sementsov-Ogievskiy wrote:
> Test that mirror job actually resume on resume command after being
> automatically paused on ENOSPC error.
> 
> It's a follow-up test for 8d9648cbf3e
>     "blockjob: fix user pause in block_job_error_action"
> 
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
> 
> v2: by Kevin's comments:
>     - use limit var
>     - don't duplicate blockdev options code
>     - drop query-block-jobs usage with it's possibly unreliable
>       offset field.
> 
>  tests/qemu-iotests/248     | 71 ++++++++++++++++++++++++++++++++++++++
>  tests/qemu-iotests/248.out |  8 +++++
>  tests/qemu-iotests/group   |  1 +
>  3 files changed, 80 insertions(+)
>  create mode 100755 tests/qemu-iotests/248
>  create mode 100644 tests/qemu-iotests/248.out
> 
> diff --git a/tests/qemu-iotests/248 b/tests/qemu-iotests/248
> new file mode 100755
> index 0000000000..f26b4bb2aa
> --- /dev/null
> +++ b/tests/qemu-iotests/248
> @@ -0,0 +1,71 @@
> +#!/usr/bin/env python
> +#
> +# Test resume mirror after auto pause on ENOSPC
> +#
> +# Copyright (c) 2019 Virtuozzo International GmbH. All rights reserved.
> +#
> +# 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
> +from iotests import qemu_img_create, qemu_io, file_path, filter_qmp_testfiles
> +
> +iotests.verify_image_format(supported_fmts=['qcow2'])
> +
> +source, target = file_path('source', 'target')
> +size = 5 * 1024 * 1024
> +limit = 2 * 1024 * 1024
> +
> +qemu_img_create('-f', iotests.imgfmt, source, str(size))
> +qemu_img_create('-f', iotests.imgfmt, target, str(size))
> +qemu_io('-c', 'write 0 {}'.format(size), source)
> +
> +# raw format don't like empty files
> +qemu_io('-c', 'write 0 {}'.format(size), target)
> +
> +vm = iotests.VM().add_drive(source)
> +vm.launch()
> +
> +blockdev_opts = {
> +    'driver': iotests.imgfmt,
> +    'node-name': 'target',
> +    'file': {
> +        'driver': 'raw',
> +        'size': limit,
> +        'file': {
> +            'driver': 'file',
> +            'filename': target
> +        }
> +    }
> +}
> +vm.qmp_log('blockdev-add', filters=[filter_qmp_testfiles], **blockdev_opts)
> +
> +vm.qmp_log('blockdev-mirror', device='drive0', sync='full', target='target',
> +           on_target_error='enospc')
> +
> +vm.event_wait('JOB_STATUS_CHANGE', timeout=3.0,
> +              match={'data': {'status': 'paused'}})
> +
> +# drop other cached events, to not interfere with further wait for 'running'
> +vm.get_qmp_events()
> +
> +del blockdev_opts['file']['size']
> +vm.qmp_log('x-blockdev-reopen', filters=[filter_qmp_testfiles],
> +           **blockdev_opts)
> +
> +vm.qmp_log('block-job-resume', device='drive0')
> +vm.event_wait('JOB_STATUS_CHANGE', timeout=1.0,
> +              match={'data': {'status': 'running'}})
> +
> +vm.shutdown()

Seems short, sweet and to the point.

Tested-by: John Snow <jsnow@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>