[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 10/12] mirror: Stop active mirroring after force-cancel
From: |
Hanna Reitz |
Subject: |
[PATCH v4 10/12] mirror: Stop active mirroring after force-cancel |
Date: |
Tue, 7 Sep 2021 14:42:43 +0200 |
Once the mirror job is force-cancelled (job_is_cancelled() is true), we
should not generate new I/O requests. This applies to active mirroring,
too, so stop it once the job is cancelled.
(We must still forward all I/O requests to the source, though, of
course, but those are not really I/O requests generated by the job, so
this is fine.)
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/mirror.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/block/mirror.c b/block/mirror.c
index bf1d50ff1c..af89c1716a 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -1418,6 +1418,7 @@ static int coroutine_fn
bdrv_mirror_top_do_write(BlockDriverState *bs,
bool copy_to_target;
copy_to_target = s->job->ret >= 0 &&
+ !job_is_cancelled(&s->job->common.job) &&
s->job->copy_mode == MIRROR_COPY_MODE_WRITE_BLOCKING;
if (copy_to_target) {
@@ -1466,6 +1467,7 @@ static int coroutine_fn
bdrv_mirror_top_pwritev(BlockDriverState *bs,
bool copy_to_target;
copy_to_target = s->job->ret >= 0 &&
+ !job_is_cancelled(&s->job->common.job) &&
s->job->copy_mode == MIRROR_COPY_MODE_WRITE_BLOCKING;
if (copy_to_target) {
--
2.31.1
- [PATCH v4 03/12] mirror: Drop s->synced, (continued)
- [PATCH v4 06/12] jobs: Give Job.force_cancel more meaning, Hanna Reitz, 2021/09/07
- [PATCH v4 08/12] mirror: Use job_is_cancelled(), Hanna Reitz, 2021/09/07
- [PATCH v4 10/12] mirror: Stop active mirroring after force-cancel,
Hanna Reitz <=
- [PATCH v4 11/12] mirror: Do not clear .cancelled, Hanna Reitz, 2021/09/07
- [PATCH v4 09/12] mirror: Check job_is_cancelled() earlier, Hanna Reitz, 2021/09/07
- [PATCH v4 07/12] job: Add job_cancel_requested(), Hanna Reitz, 2021/09/07
- [PATCH v4 12/12] iotests: Add mirror-ready-cancel-error test, Hanna Reitz, 2021/09/07
- Re: [PATCH v4 00/12] mirror: Handle errors after READY cancel, Vladimir Sementsov-Ogievskiy, 2021/09/15