Re: [Qemu-block] [Qemu-devel] [PATCH v16 16/22] tests: Disable image lock in test-replication

[谢昌龙]

2017-05-02 16:18 GMT+08:00 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>
> ---
>  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);

Reviewed-by: Xie Changlong <address@hidden>
> --
> 2.9.3
>
>