diff options
author | Hanna Reitz | 2021-10-06 17:19:39 +0200 |
---|---|---|
committer | Vladimir Sementsov-Ogievskiy | 2021-10-07 10:42:50 +0200 |
commit | a640fa0e381caf572266c6c07d026dd07cf66a49 (patch) | |
tree | 82881efacc0d07969f4568a6cef501273d1e4f45 /job.c | |
parent | mirror: Stop active mirroring after force-cancel (diff) | |
download | qemu-a640fa0e381caf572266c6c07d026dd07cf66a49.tar.gz qemu-a640fa0e381caf572266c6c07d026dd07cf66a49.tar.xz qemu-a640fa0e381caf572266c6c07d026dd07cf66a49.zip |
mirror: Do not clear .cancelled
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: <20211006151940.214590-13-hreitz@redhat.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Diffstat (limited to 'job.c')
-rw-r--r-- | job.c | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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) |