| Message ID | 20210806093859.706464-11-mreitz@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | mirror: Handle errors after READY cancel | expand |
On Fri, Aug 06, 2021 at 11:38:57AM +0200, Max Reitz wrote: > 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: Max Reitz <mreitz@redhat.com> > --- > block/mirror.c | 2 ++ > 1 file changed, 2 insertions(+) Reviewed-by: Eric Blake <eblake@redhat.com>
06.08.2021 12:38, Max Reitz wrote: > 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: Max Reitz<mreitz@redhat.com> Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
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) {
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: Max Reitz <mreitz@redhat.com> --- block/mirror.c | 2 ++ 1 file changed, 2 insertions(+)