[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v12 13/16] tests: Disable image lock in test-replica
From: |
Fam Zheng |
Subject: |
[Qemu-block] [PATCH v12 13/16] tests: Disable image lock in test-replication |
Date: |
Mon, 23 Jan 2017 20:30:53 +0800 |
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>
---
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 fac2da3..5bede49 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.disable-lock=on"
, 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.file.disable-lock=on",
+ 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.disable-lock=on",
"file.backing.driver=qcow2,"
"file.backing.file.filename=%s,"
+ "file.backing.file.disable-lock=on",
"file.backing.backing=%s"
, S_ID, s_active_disk, s_hidden_disk
, S_LOCAL_DISK_ID);
--
2.9.3
- [Qemu-block] [PATCH v12 03/16] qemu-io: Set "share-rw" flag together with read-only, (continued)
- [Qemu-block] [PATCH v12 03/16] qemu-io: Set "share-rw" flag together with read-only, Fam Zheng, 2017/01/23
- [Qemu-block] [PATCH v12 04/16] qemu-img: Set "share-rw" flag in read-only commands, Fam Zheng, 2017/01/23
- [Qemu-block] [PATCH v12 05/16] block: Set "share-rw" flag in drive-backup when sync=none, Fam Zheng, 2017/01/23
- [Qemu-block] [PATCH v12 06/16] iotests: 055: Don't attach the drive to vm for drive-backup, Fam Zheng, 2017/01/23
- [Qemu-block] [PATCH v12 07/16] iotests: 030: Read-only open image for getting map, Fam Zheng, 2017/01/23
- [Qemu-block] [PATCH v12 08/16] iotests: 087: Don't attach test image twice, Fam Zheng, 2017/01/23
- [Qemu-block] [PATCH v12 09/16] iotests: 085: Avoid image locking conflict, Fam Zheng, 2017/01/23
- [Qemu-block] [PATCH v12 10/16] iotests: 091: Quit QEMU before checking image, Fam Zheng, 2017/01/23
- [Qemu-block] [PATCH v12 11/16] iotests: 172: Use separate images for multiple devices, Fam Zheng, 2017/01/23
- [Qemu-block] [PATCH v12 12/16] tests: Use null-co:// instead of /dev/null as the dummy image, Fam Zheng, 2017/01/23
- [Qemu-block] [PATCH v12 13/16] tests: Disable image lock in test-replication,
Fam Zheng <=
- [Qemu-block] [PATCH v12 14/16] file-posix: Implement image locking, Fam Zheng, 2017/01/23
- [Qemu-block] [PATCH v12 15/16] qcow2: Force "no other writer" lock on bs->file, Fam Zheng, 2017/01/23
- [Qemu-block] [PATCH v12 16/16] tests: Add test-image-lock, Fam Zheng, 2017/01/23