[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v15 17/21] tests: Disable image lock in test-replica
From: |
Fam Zheng |
Subject: |
[Qemu-block] [PATCH v15 17/21] tests: Disable image lock in test-replication |
Date: |
Wed, 26 Apr 2017 11:34:09 +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..e1c4235 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);
--
2.9.3
- Re: [Qemu-block] [PATCH v15 11/21] iotests: 085: Avoid image locking conflict, (continued)
- [Qemu-block] [PATCH v15 12/21] iotests: 087: Don't attach test image twice, Fam Zheng, 2017/04/25
- [Qemu-block] [PATCH v15 13/21] iotests: 091: Quit QEMU before checking image, Fam Zheng, 2017/04/25
- [Qemu-block] [PATCH v15 14/21] iotests: 172: Use separate images for multiple devices, Fam Zheng, 2017/04/25
- [Qemu-block] [PATCH v15 15/21] tests: Use null-co:// instead of /dev/null as the dummy image, Fam Zheng, 2017/04/25
- [Qemu-block] [PATCH v15 16/21] file-posix: Add 'locking' option, Fam Zheng, 2017/04/25
- [Qemu-block] [PATCH v15 17/21] tests: Disable image lock in test-replication,
Fam Zheng <=
- [Qemu-block] [PATCH v15 18/21] block: Reuse bs as backing hd for drive-backup sync=none, Fam Zheng, 2017/04/25
[Qemu-block] [PATCH v15 19/21] osdep: Add qemu_lock_fd and qemu_unlock_fd, Fam Zheng, 2017/04/25