From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43331) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buBZf-0004Rd-Dc for qemu-devel@nongnu.org; Wed, 12 Oct 2016 00:55:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1buBZa-0004pq-FT for qemu-devel@nongnu.org; Wed, 12 Oct 2016 00:55:26 -0400 Received: from [59.151.112.132] (port=20780 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1buBZa-0004ot-2b for qemu-devel@nongnu.org; Wed, 12 Oct 2016 00:55:22 -0400 Message-ID: <57FDC3FB.30500@cn.fujitsu.com> Date: Wed, 12 Oct 2016 13:02:51 +0800 From: Changlong Xie MIME-Version: 1.0 References: <1475842893-11763-1-git-send-email-pbonzini@redhat.com> In-Reply-To: <1475842893-11763-1-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH] replication: interrupt failover if the main device is closed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Paolo Bonzini , qemu-devel@nongnu.org Cc: arei.gonglei@huawei.com, stefanha@redhat.com, zhang.zhanghailiang@huawei.com On 10/07/2016 08:21 PM, 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 Reviewed-by: Changlong Xie > --- > 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); >