From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44928) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bsU9k-00025C-Id for qemu-devel@nongnu.org; Fri, 07 Oct 2016 08:21:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bsU9i-0004Xx-Bu for qemu-devel@nongnu.org; Fri, 07 Oct 2016 08:21:40 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49970) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bsU9i-0004Wm-5Y for qemu-devel@nongnu.org; Fri, 07 Oct 2016 08:21:38 -0400 From: Paolo Bonzini Date: Fri, 7 Oct 2016 14:21:33 +0200 Message-Id: <1475842893-11763-1-git-send-email-pbonzini@redhat.com> Subject: [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: qemu-devel@nongnu.org Cc: wency@cn.fujitsu.com, zhang.zhanghailiang@huawei.com, arei.gonglei@huawei.com, stefanha@redhat.com 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 --- 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); -- 2.7.4