Re: [Qemu-devel] [PATCH] replication: interrupt failover if the main device is closed

[Wen Congyang <wencongyang@gmail.com>]

At 2016/10/7 20:21, Paolo Bonzini wrote:
> Without this change, there is a race condition in tests/test-replication.
> Depending on how fast the failover job (active commit) runs, there is a
> chance of two bad things happening:
>
> 1) replication_done can be called after the secondary has been closed
> and hence when the BDRVReplicationState is not valid anymore.
>
> 2) two copies of the active disk are present during the
> /replication/secondary/stop test (that test runs immediately after
> /replication/secondary/start, which tests failover).  This causes the
> corruption detector to fire.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

This patch looks fine to me.
Reviewed-by: Wen Congyang <wency@cn.fujitsu.com>

> ---
>   block/replication.c | 3 +++
>   1 file changed, 3 insertions(+)
>
> diff --git a/block/replication.c b/block/replication.c
> index 3bd1cf1..5231a00 100644
> --- a/block/replication.c
> +++ b/block/replication.c
> @@ -133,6 +133,9 @@ static void replication_close(BlockDriverState *bs)
>       if (s->replication_state == BLOCK_REPLICATION_RUNNING) {
>           replication_stop(s->rs, false, NULL);
>       }
> +    if (s->replication_state == BLOCK_REPLICATION_FAILOVER) {
> +        block_job_cancel_sync(s->active_disk->bs->job);
> +    }
>
>       if (s->mode == REPLICATION_MODE_SECONDARY) {
>           g_free(s->top_id);
>