[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 07/13] job: Do not soft-cancel after a job is done
From: |
Hanna Reitz |
Subject: |
[PATCH v5 07/13] job: Do not soft-cancel after a job is done |
Date: |
Wed, 6 Oct 2021 17:19:34 +0200 |
The only job that supports a soft cancel mode is the mirror job, and in
such a case it resets its .cancelled field before it leaves its .run()
function, so it does not really count as cancelled.
However, it is possible to cancel the job after .run() returns and
before job_exit() (which is run in the main loop) is executed. Then,
.cancelled would still be true and the job would count as cancelled.
This does not seem to be in the interest of the mirror job, so adjust
job_cancel_async() to not set .cancelled in such a case, and
job_cancel() to not invoke job_completed_txn_abort().
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
job.c | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/job.c b/job.c
index 81c016eb10..44e741ebd4 100644
--- a/job.c
+++ b/job.c
@@ -734,9 +734,19 @@ static void job_cancel_async(Job *job, bool force)
assert(job->pause_count > 0);
job->pause_count--;
}
- job->cancelled = true;
- /* To prevent 'force == false' overriding a previous 'force == true' */
- job->force_cancel |= force;
+
+ /*
+ * Ignore soft cancel requests after the job is already done
+ * (We will still invoke job->driver->cancel() above, but if the
+ * job driver supports soft cancelling and the job is done, that
+ * should be a no-op, too. We still call it so it can override
+ * @force.)
+ */
+ if (force || !job->deferred_to_main_loop) {
+ job->cancelled = true;
+ /* To prevent 'force == false' overriding a previous 'force == true' */
+ job->force_cancel |= force;
+ }
}
static void job_completed_txn_abort(Job *job)
@@ -963,7 +973,14 @@ void job_cancel(Job *job, bool force)
if (!job_started(job)) {
job_completed(job);
} else if (job->deferred_to_main_loop) {
- job_completed_txn_abort(job);
+ /*
+ * job_cancel_async() ignores soft-cancel requests for jobs
+ * that are already done (i.e. deferred to the main loop). We
+ * have to check again whether the job is really cancelled.
+ */
+ if (job_is_cancelled(job)) {
+ job_completed_txn_abort(job);
+ }
} else {
job_enter(job);
}
--
2.31.1
- [PATCH v5 00/13] mirror: Handle errors after READY cancel, Hanna Reitz, 2021/10/06
- [PATCH v5 01/13] job: Context changes in job_completed_txn_abort(), Hanna Reitz, 2021/10/06
- [PATCH v5 02/13] mirror: Keep s->synced on error, Hanna Reitz, 2021/10/06
- [PATCH v5 03/13] mirror: Drop s->synced, Hanna Reitz, 2021/10/06
- [PATCH v5 04/13] job: Force-cancel jobs in a failed transaction, Hanna Reitz, 2021/10/06
- [PATCH v5 05/13] job: @force parameter for job_cancel_sync(), Hanna Reitz, 2021/10/06
- [PATCH v5 09/13] mirror: Use job_is_cancelled(), Hanna Reitz, 2021/10/06
- [PATCH v5 07/13] job: Do not soft-cancel after a job is done,
Hanna Reitz <=
- [PATCH v5 06/13] jobs: Give Job.force_cancel more meaning, Hanna Reitz, 2021/10/06
- [PATCH v5 08/13] job: Add job_cancel_requested(), Hanna Reitz, 2021/10/06
- [PATCH v5 12/13] mirror: Do not clear .cancelled, Hanna Reitz, 2021/10/06
- [PATCH v5 11/13] mirror: Stop active mirroring after force-cancel, Hanna Reitz, 2021/10/06
- [PATCH v5 13/13] iotests: Add mirror-ready-cancel-error test, Hanna Reitz, 2021/10/06
- [PATCH v5 10/13] mirror: Check job_is_cancelled() earlier, Hanna Reitz, 2021/10/06