[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/12] mirror: Do not clear .cancelled
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PULL 11/12] mirror: Do not clear .cancelled |
Date: |
Tue, 21 Sep 2021 13:20:16 +0300 |
From: Hanna Reitz <hreitz@redhat.com>
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>
Message-Id: <20210907124245.143492-12-hreitz@redhat.com>
Signed-off-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 bbf5815fd7..bb837db46e 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -946,7 +946,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;
}
@@ -1085,7 +1084,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.29.2
- [PULL 04/12] job: Force-cancel jobs in a failed transaction, (continued)
- [PULL 04/12] job: Force-cancel jobs in a failed transaction, Vladimir Sementsov-Ogievskiy, 2021/09/21
- [PULL 01/12] job: Context changes in job_completed_txn_abort(), Vladimir Sementsov-Ogievskiy, 2021/09/21
- [PULL 05/12] job: @force parameter for job_cancel_sync(), Vladimir Sementsov-Ogievskiy, 2021/09/21
- [PULL 02/12] mirror: Keep s->synced on error, Vladimir Sementsov-Ogievskiy, 2021/09/21
- [PULL 06/12] jobs: Give Job.force_cancel more meaning, Vladimir Sementsov-Ogievskiy, 2021/09/21
- [PULL 07/12] job: Add job_cancel_requested(), Vladimir Sementsov-Ogievskiy, 2021/09/21
- [PULL 09/12] mirror: Check job_is_cancelled() earlier, Vladimir Sementsov-Ogievskiy, 2021/09/21
- [PULL 08/12] mirror: Use job_is_cancelled(), Vladimir Sementsov-Ogievskiy, 2021/09/21
- [PULL 03/12] mirror: Drop s->synced, Vladimir Sementsov-Ogievskiy, 2021/09/21
- [PULL 10/12] mirror: Stop active mirroring after force-cancel, Vladimir Sementsov-Ogievskiy, 2021/09/21
- [PULL 11/12] mirror: Do not clear .cancelled,
Vladimir Sementsov-Ogievskiy <=
- [PULL 12/12] iotests: Add mirror-ready-cancel-error test, Vladimir Sementsov-Ogievskiy, 2021/09/21
- Re: [PULL 00/12] jobs: mirror: Handle errors after READY cancel, Richard Henderson, 2021/09/22