From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bujtq-0004ap-Fz for qemu-devel@nongnu.org; Thu, 13 Oct 2016 13:34:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bujtp-0003xO-JL for qemu-devel@nongnu.org; Thu, 13 Oct 2016 13:34:34 -0400 From: Paolo Bonzini Date: Thu, 13 Oct 2016 19:34:05 +0200 Message-Id: <1476380062-18001-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1476380062-18001-1-git-send-email-pbonzini@redhat.com> References: <1476380062-18001-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 01/18] 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: qemu-block@nongnu.org, famz@redhat.com, kwolf@redhat.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. Reviewed-by: Wen Congyang Reviewed-by: Changlong Xie 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