[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH for-6.1? 5/6] mirror: Check job_is_cancelled() earlier
From: |
Max Reitz |
Subject: |
[PATCH for-6.1? 5/6] mirror: Check job_is_cancelled() earlier |
Date: |
Thu, 22 Jul 2021 14:26:26 +0200 |
We must check whether the job is force-cancelled early in our main loop,
most importantly before any `continue` statement. For example, we used
to have `continue`s before our current checking location that are
triggered by `mirror_flush()` failing. So, if `mirror_flush()` kept
failing, force-cancelling the job would not terminate it.
A job being force-cancelled should be treated the same as the job having
failed, so put the check in the same place where we check `s->ret < 0`.
Buglink: https://gitlab.com/qemu-project/qemu/-/issues/462
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
block/mirror.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index 291d2ed040..a993ed37d0 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -995,7 +995,7 @@ static int coroutine_fn mirror_run(Job *job, Error **errp)
mirror_wait_for_any_operation(s, true);
}
- if (s->ret < 0) {
+ if (s->ret < 0 || job_is_cancelled(&s->common.job)) {
ret = s->ret;
goto immediate_exit;
}
@@ -1081,17 +1081,12 @@ static int coroutine_fn mirror_run(Job *job, Error
**errp)
break;
}
- ret = 0;
-
if (s->synced && !should_complete) {
delay_ns = (s->in_flight == 0 &&
cnt == 0 ? BLOCK_JOB_SLICE_TIME : 0);
}
trace_mirror_before_sleep(s, cnt, s->synced, delay_ns);
job_sleep_ns(&s->common.job, delay_ns);
- if (job_is_cancelled(&s->common.job)) {
- break;
- }
s->last_pause_ns = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
}
--
2.31.1
- [PATCH for-6.1? 0/6] mirror: Handle errors after READY cancel, Max Reitz, 2021/07/22
- [PATCH for-6.1? 1/6] mirror: Keep s->synced on error, Max Reitz, 2021/07/22
- [PATCH for-6.1? 2/6] job: @force parameter for job_cancel_sync{, _all}(), Max Reitz, 2021/07/22
- [PATCH for-6.1? 4/6] job: Add job_cancel_requested(), Max Reitz, 2021/07/22
- [PATCH for-6.1? 3/6] jobs: Give Job.force_cancel more meaning, Max Reitz, 2021/07/22
- [PATCH for-6.1? 5/6] mirror: Check job_is_cancelled() earlier,
Max Reitz <=
- [PATCH for-6.1? 6/6] iotests: Add mirror-ready-cancel-error test, Max Reitz, 2021/07/22