[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 17/58] tests: Disable image lock in test-replication
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 17/58] tests: Disable image lock in test-replication |
Date: |
Thu, 11 May 2017 16:32:20 +0200 |
From: Fam Zheng <address@hidden>
The COLO block replication architecture requires one disk to be shared
between primary and secondary, in the test both processes use posix file
protocol (instead of over NBD) so it is affected by image locking.
Disable the lock.
Signed-off-by: Fam Zheng <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
tests/test-replication.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/tests/test-replication.c b/tests/test-replication.c
index 3016c6f..cebeb79 100644
--- a/tests/test-replication.c
+++ b/tests/test-replication.c
@@ -179,7 +179,8 @@ static BlockBackend *start_primary(void)
char *cmdline;
cmdline = g_strdup_printf("driver=replication,mode=primary,node-name=xxx,"
- "file.driver=qcow2,file.file.filename=%s"
+ "file.driver=qcow2,file.file.filename=%s,"
+ "file.file.locking=off"
, p_local_disk);
opts = qemu_opts_parse_noisily(&qemu_drive_opts, cmdline, false);
g_free(cmdline);
@@ -310,7 +311,9 @@ static BlockBackend *start_secondary(void)
Error *local_err = NULL;
/* add s_local_disk and forge S_LOCAL_DISK_ID */
- cmdline = g_strdup_printf("file.filename=%s,driver=qcow2", s_local_disk);
+ cmdline = g_strdup_printf("file.filename=%s,driver=qcow2,"
+ "file.locking=off",
+ s_local_disk);
opts = qemu_opts_parse_noisily(&qemu_drive_opts, cmdline, false);
g_free(cmdline);
@@ -331,8 +334,10 @@ static BlockBackend *start_secondary(void)
/* add S_(ACTIVE/HIDDEN)_DISK and forge S_ID */
cmdline = g_strdup_printf("driver=replication,mode=secondary,top-id=%s,"
"file.driver=qcow2,file.file.filename=%s,"
+ "file.file.locking=off,"
"file.backing.driver=qcow2,"
"file.backing.file.filename=%s,"
+ "file.backing.file.locking=off,"
"file.backing.backing=%s"
, S_ID, s_active_disk, s_hidden_disk
, S_LOCAL_DISK_ID);
--
1.8.3.1
- [Qemu-block] [PULL 09/58] iotests: 055: Don't attach the target image already for drive-backup, (continued)
- [Qemu-block] [PULL 09/58] iotests: 055: Don't attach the target image already for drive-backup, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 05/58] qemu-img: Update documentation for -U, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 08/58] iotests: 046: Prepare for image locking, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 07/58] iotests: 030: Prepare for image locking, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 10/58] iotests: 085: Avoid image locking conflict, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 11/58] iotests: 087: Don't attach test image twice, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 12/58] iotests: 091: Quit QEMU before checking image, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 13/58] iotests: 172: Use separate images for multiple devices, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 17/58] tests: Disable image lock in test-replication,
Kevin Wolf <=
- [Qemu-block] [PULL 16/58] file-win32: Error out if locking=on, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 14/58] tests: Use null-co:// instead of /dev/null as the dummy image, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 15/58] file-posix: Add 'locking' option, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 18/58] block: Reuse bs as backing hd for drive-backup sync=none, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 19/58] osdep: Add qemu_lock_fd and qemu_unlock_fd, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 20/58] osdep: Fall back to posix lock when OFD lock is unavailable, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 22/58] qemu-iotests: Add test case 153 for image locking, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 23/58] tests: Add POSIX image locking test case 182, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 24/58] qcow2: Fix preallocation size formula, Kevin Wolf, 2017/05/11
- [Qemu-block] [PULL 21/58] file-posix: Add image locking to perm operations, Kevin Wolf, 2017/05/11