qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>,
	Alberto Garcia <berto@igalia.com>, Kevin Wolf <kwolf@redhat.com>,
	Eric Blake <eblake@redhat.com>
Subject: [Qemu-devel] [PATCH v4 17/25] iotests: Add quorum case to test 110
Date: Mon, 16 Jan 2017 21:49:13 +0100	[thread overview]
Message-ID: <20170116204921.31578-10-mreitz@redhat.com> (raw)
In-Reply-To: <20170111181432.18868-1-mreitz@redhat.com>

Test 110 tests relative backing filenames for complex BDS trees. Add
quorum as an example that can never work automatically (without
special-casing if all child nodes have the same base directory), and an
example on how to make it work manually (using the base-directory
option).

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/110     | 48 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/qemu-iotests/110.out | 12 ++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/tests/qemu-iotests/110 b/tests/qemu-iotests/110
index ba1b3c6c7d..d96b656b6b 100755
--- a/tests/qemu-iotests/110
+++ b/tests/qemu-iotests/110
@@ -30,6 +30,7 @@ status=1	# failure is the default!
 _cleanup()
 {
 	_cleanup_test_img
+        rm -f "$TEST_IMG.copy"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
@@ -87,6 +88,53 @@ echo
 # omit the image size; it should work anyway
 _make_test_img -b "$TEST_IMG_REL.base"
 
+echo
+echo '=== Nodes without a common directory ==='
+echo
+
+cp "$TEST_IMG" "$TEST_IMG.copy"
+
+# Should inform us that the actual path of the backing file cannot be determined
+TEST_IMG="json:{
+    'driver': '$IMGFMT',
+    'file': {
+        'driver': 'quorum',
+        'vote-threshold': 1,
+        'children': [
+            {
+                'driver': 'file',
+                'filename': '$TEST_IMG'
+            },
+            {
+                'driver': 'file',
+                'filename': '$TEST_IMG.copy'
+            }
+        ]
+    }
+}" _img_info | _filter_img_info
+
+echo
+
+# Should work fine
+TEST_IMG="json:{
+    'driver': '$IMGFMT',
+    'file': {
+        'driver': 'quorum',
+        'base-directory': '$TEST_DIR/',
+        'vote-threshold': 1,
+        'children': [
+            {
+                'driver': 'file',
+                'filename': '$TEST_IMG'
+            },
+            {
+                'driver': 'file',
+                'filename': '$TEST_IMG.copy'
+            }
+        ]
+    }
+}" _img_info | _filter_img_info
+
 
 # success, all done
 echo '*** done'
diff --git a/tests/qemu-iotests/110.out b/tests/qemu-iotests/110.out
index 5370bc1d26..e1845d8026 100644
--- a/tests/qemu-iotests/110.out
+++ b/tests/qemu-iotests/110.out
@@ -19,4 +19,16 @@ backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
 === Backing name is always relative to the backed image ===
 
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file=t.IMGFMT.base
+
+=== Nodes without a common directory ===
+
+image: json:{"driver": "IMGFMT", "file": {"children": [{"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.copy"}], "driver": "quorum", "blkverify": false, "rewrite-corrupted": false, "vote-threshold": 1}}
+file format: IMGFMT
+virtual size: 64M (67108864 bytes)
+backing file: t.IMGFMT.base (cannot determine actual path)
+
+image: json:{"driver": "IMGFMT", "file": {"children": [{"driver": "file", "filename": "TEST_DIR/t.IMGFMT"}, {"driver": "file", "filename": "TEST_DIR/t.IMGFMT.copy"}], "driver": "quorum", "blkverify": false, "rewrite-corrupted": false, "vote-threshold": 1}}
+file format: IMGFMT
+virtual size: 64M (67108864 bytes)
+backing file: t.IMGFMT.base (actual path: TEST_DIR/t.IMGFMT.base)
 *** done
-- 
2.11.0

  parent reply	other threads:[~2017-01-16 20:49 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-11 18:14 [Qemu-devel] [PATCH v4 00/25] block: Fix some filename generation issues Max Reitz
2017-01-11 18:14 ` [Qemu-devel] [PATCH v4 01/25] block/mirror: Small absolute-paths simplification Max Reitz
2017-01-11 18:14 ` [Qemu-devel] [PATCH v4 02/25] block: Use children list in bdrv_refresh_filename Max Reitz
2017-01-11 18:14 ` [Qemu-devel] [PATCH v4 03/25] block: Add BDS.backing_overridden Max Reitz
2017-01-11 19:50   ` Eric Blake
2017-01-11 18:14 ` [Qemu-devel] [PATCH v4 04/25] block: Respect backing bs in bdrv_refresh_filename Max Reitz
2017-01-16 20:43   ` Eric Blake
2017-01-16 20:50     ` Max Reitz
2017-01-16 20:47 ` [Qemu-devel] [PATCH v4 05/25] block: Make path_combine() return the path Max Reitz
2017-01-16 20:48 ` [Qemu-devel] [PATCH v4 06/25] block: bdrv_get_full_backing_filename_from_...'s ret. val Max Reitz
2017-01-16 20:48 ` [Qemu-devel] [PATCH v4 07/25] block: bdrv_get_full_backing_filename's " Max Reitz
2017-01-16 22:00   ` Eric Blake
2017-01-16 20:49 ` [Qemu-devel] [PATCH v4 08/25] block: Add bdrv_make_absolute_filename() Max Reitz
2017-01-16 20:49 ` [Qemu-devel] [PATCH v4 09/25] block: Fix bdrv_find_backing_image() Max Reitz
2017-01-16 22:08   ` Eric Blake
2017-01-16 20:49 ` [Qemu-devel] [PATCH v4 10/25] block: Add bdrv_dirname() Max Reitz
2017-01-16 23:02   ` Eric Blake
2017-01-18 13:33     ` Max Reitz
2017-01-16 20:49 ` [Qemu-devel] [PATCH v4 11/25] blkverify: Make bdrv_dirname() return NULL Max Reitz
2017-01-16 23:09   ` Eric Blake
2017-01-16 20:49 ` [Qemu-devel] [PATCH v4 12/25] quorum: " Max Reitz
2017-01-16 23:13   ` Eric Blake
2017-01-16 20:49 ` [Qemu-devel] [PATCH v4 13/25] block/nbd: Implement bdrv_dirname() Max Reitz
2017-01-16 23:21   ` Eric Blake
2017-01-18 13:37     ` Max Reitz
2017-01-16 20:49 ` [Qemu-devel] [PATCH v4 14/25] block/nfs: " Max Reitz
2017-01-16 20:49 ` [Qemu-devel] [PATCH v4 15/25] block: Use bdrv_dirname() for relative filenames Max Reitz
2017-01-16 20:49 ` [Qemu-devel] [PATCH v4 16/25] block: Add 'base-directory' BDS option Max Reitz
2017-01-16 20:49 ` Max Reitz [this message]
2017-01-16 20:51 ` [Qemu-devel] [PATCH v4 18/25] block: Add sgfnt_runtime_opts to BlockDriver Max Reitz
2017-01-16 20:51 ` [Qemu-devel] [PATCH v4 19/25] block: Add BlockDriver.bdrv_gather_child_options Max Reitz
2017-01-16 20:51 ` [Qemu-devel] [PATCH v4 20/25] block: Generically refresh runtime options Max Reitz
2017-01-16 20:51 ` [Qemu-devel] [PATCH v4 21/25] block: Purify .bdrv_refresh_filename() Max Reitz
2017-01-16 20:51 ` [Qemu-devel] [PATCH v4 22/25] block: Do not copy exact_filename from format file Max Reitz
2017-01-16 20:51 ` [Qemu-devel] [PATCH v4 23/25] block: Fix FIXME from "Add BDS.backing_overridden" Max Reitz
2017-01-16 20:51 ` [Qemu-devel] [PATCH v4 24/25] block/curl: Implement bdrv_refresh_filename() Max Reitz
2017-01-16 20:51 ` [Qemu-devel] [PATCH v4 25/25] block/null: Generate filename even with latency-ns Max Reitz

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=20170116204921.31578-10-mreitz@redhat.com \
    --to=mreitz@redhat.com \
    --cc=berto@igalia.com \
    --cc=eblake@redhat.com \
    --cc=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).