mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mirror: stop cancelling in-flight requests on non-force cancel in READY

Browse Source 
If mirror is READY than cancel operation is not discarding the whole
result of the operation, but instead it's a documented way get a
point-in-time snapshot of source disk.

So, we should not cancel any requests if mirror is READ and
force=false. Let's fix that case.

Note, that bug that we have before this commit is not critical, as the
only .bdrv_cancel_in_flight implementation is nbd_cancel_in_flight()
and it cancels only requests waiting for reconnection, so it should be
rare case.

Fixes: 521ff8b779
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210421075858.40197-1-vsementsov@virtuozzo.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2021-04-21 10:58:58 +03:00 committed by Max Reitz
parent 78632a3d16
commit 9c785cd714
6 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/backup.c
View File

@ -331,7 +331,7 @@ static void coroutine_fn backup_set_speed(BlockJob *job, int64_t speed)
} }
} }
static void backup_cancel(Job *job) static void backup_cancel(Job *job, bool force)
{ {
BackupBlockJob *s = container_of(job, BackupBlockJob, common.job); BackupBlockJob *s = container_of(job, BackupBlockJob, common.job);

6
block/mirror.c
View File

@ -1178,12 +1178,14 @@ static bool mirror_drained_poll(BlockJob *job)
return !!s->in_flight; return !!s->in_flight;
} }
static void mirror_cancel(Job *job) static void mirror_cancel(Job *job, bool force)
{ {
MirrorBlockJob *s = container_of(job, MirrorBlockJob, common.job); MirrorBlockJob *s = container_of(job, MirrorBlockJob, common.job);
BlockDriverState *target = blk_bs(s->target); BlockDriverState *target = blk_bs(s->target);
bdrv_cancel_in_flight(target); if (force || !job_is_ready(job)) {
bdrv_cancel_in_flight(target);
}
} }
static const BlockJobDriver mirror_job_driver = { static const BlockJobDriver mirror_job_driver = {

2
include/block/block_int.h
View File

@ -357,7 +357,7 @@ struct BlockDriver {
* of in-flight requests, so don't waste the time if possible. * of in-flight requests, so don't waste the time if possible.
* *
* One example usage is to avoid waiting for an nbd target node reconnect * One example usage is to avoid waiting for an nbd target node reconnect
* timeout during job-cancel. * timeout during job-cancel with force=true.
*/ */
void (*bdrv_cancel_in_flight)(BlockDriverState *bs); void (*bdrv_cancel_in_flight)(BlockDriverState *bs);

2
include/qemu/job.h
View File

@ -254,7 +254,7 @@ struct JobDriver {
/** /**
* If the callback is not NULL, it will be invoked in job_cancel_async * If the callback is not NULL, it will be invoked in job_cancel_async
*/ */
void (*cancel)(Job *job); void (*cancel)(Job *job, bool force);
/** Called when the job is freed */ /** Called when the job is freed */

2
job.c
View File

@ -716,7 +716,7 @@ static int job_finalize_single(Job *job)
static void job_cancel_async(Job *job, bool force) static void job_cancel_async(Job *job, bool force)
{ {
if (job->driver->cancel) { if (job->driver->cancel) {
job->driver->cancel(job); job->driver->cancel(job, force);
} }
if (job->user_paused) { if (job->user_paused) {
/* Do not call job_enter here, the caller will handle it. */ /* Do not call job_enter here, the caller will handle it. */

2
tests/qemu-iotests/264
View File

@ -95,7 +95,7 @@ class TestNbdReconnect(iotests.QMPTestCase):
self.assert_qmp(result, 'return', {}) self.assert_qmp(result, 'return', {})
def cancel_job(self): def cancel_job(self):
result = self.vm.qmp('block-job-cancel', device='drive0') result = self.vm.qmp('block-job-cancel', device='drive0', force=True)
self.assert_qmp(result, 'return', {}) self.assert_qmp(result, 'return', {})
start_t = time.time() start_t = time.time()