diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-10-27 12:48:49 +0200 |
|---|---|---|
| committer | Fam Zheng <famz@redhat.com> | 2016-10-28 21:50:18 +0800 |
| commit | 50ab0e0908d592b8bda56c2d7495e1190d734b0b (patch) | |
| tree | ff0a7cbe4910852f1a7a709e2cdfeda3a20ed49c /block | |
| parent | 9879b75873cacc88cdee490f6ab481e8ce766c69 (diff) | |
replication: interrupt failover if the main device is closed
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 <wency@cn.fujitsu.com>
Reviewed-by: Changlong Xie <xiecl.fnst@cn.fujitsu.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Message-Id: <1477565348-5458-2-git-send-email-pbonzini@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/replication.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/block/replication.c b/block/replication.c index 8bbfc8f870..a2747e796f 100644 --- a/block/replication.c +++ b/block/replication.c @@ -138,6 +138,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); |