[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 11/12] mirror: Do not clear .cancelled
From: |
Hanna Reitz |
Subject: |
[PATCH v4 11/12] mirror: Do not clear .cancelled |
Date: |
Tue, 7 Sep 2021 14:42:44 +0200 |
Clearing .cancelled before leaving the main loop when the job has been
soft-cancelled is no longer necessary since job_is_cancelled() only
returns true for jobs that have been force-cancelled.
Therefore, this only makes a differences in places that call
job_cancel_requested(). In block/mirror.c, this is done only before
.cancelled was cleared.
In job.c, there are two callers:
- job_completed_txn_abort() asserts that .cancelled is true, so keeping
it true will not affect this place.
- job_complete() refuses to let a job complete that has .cancelled set.
It is correct to refuse to let the user invoke job-complete on mirror
jobs that have already been soft-cancelled.
With this change, there are no places that reset .cancelled to false and
so we can be sure that .force_cancel can only be true if .cancelled is
true as well. Assert this in job_is_cancelled().
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 --
job.c | 4 +++-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/block/mirror.c b/block/mirror.c
index af89c1716a..f94aa52fae 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -939,7 +939,6 @@ static int coroutine_fn mirror_run(Job *job, Error **errp)
while (!job_cancel_requested(&s->common.job) && !s->should_complete) {
job_yield(&s->common.job);
}
- s->common.job.cancelled = false;
goto immediate_exit;
}
@@ -1078,7 +1077,6 @@ static int coroutine_fn mirror_run(Job *job, Error **errp)
* completion.
*/
assert(QLIST_EMPTY(&bs->tracked_requests));
- s->common.job.cancelled = false;
need_drain = false;
break;
}
diff --git a/job.c b/job.c
index be878ca5fc..85c0216734 100644
--- a/job.c
+++ b/job.c
@@ -217,7 +217,9 @@ const char *job_type_str(const Job *job)
bool job_is_cancelled(Job *job)
{
- return job->cancelled && job->force_cancel;
+ /* force_cancel may be true only if cancelled is true, too */
+ assert(job->cancelled || !job->force_cancel);
+ return job->force_cancel;
}
bool job_cancel_requested(Job *job)
--
2.31.1
- [PATCH v4 04/12] job: Force-cancel jobs in a failed transaction, (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, 2021/09/07
- [PATCH v4 11/12] mirror: Do not clear .cancelled,
Hanna Reitz <=
- [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