[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/10] job: Allow complete for jobs on standby
From: |
Kevin Wolf |
Subject: |
[PULL 09/10] job: Allow complete for jobs on standby |
Date: |
Fri, 9 Apr 2021 18:15:47 +0200 |
From: Max Reitz <mreitz@redhat.com>
The only job that implements .complete is the mirror job, and it can
handle completion requests just fine while the job is paused.
Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1945635
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210409120422.144040-4-mreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
job.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/job.c b/job.c
index 289edee143..4aff13d95a 100644
--- a/job.c
+++ b/job.c
@@ -56,7 +56,7 @@ bool JobVerbTable[JOB_VERB__MAX][JOB_STATUS__MAX] = {
[JOB_VERB_PAUSE] = {0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0},
[JOB_VERB_RESUME] = {0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0},
[JOB_VERB_SET_SPEED] = {0, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0},
- [JOB_VERB_COMPLETE] = {0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0},
+ [JOB_VERB_COMPLETE] = {0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0},
[JOB_VERB_FINALIZE] = {0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0},
[JOB_VERB_DISMISS] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0},
};
@@ -991,7 +991,7 @@ void job_complete(Job *job, Error **errp)
if (job_apply_verb(job, JOB_VERB_COMPLETE, errp)) {
return;
}
- if (job->pause_count || job_is_cancelled(job) || !job->driver->complete) {
+ if (job_is_cancelled(job) || !job->driver->complete) {
error_setg(errp, "The active block job '%s' cannot be completed",
job->id);
return;
--
2.30.2
- [PULL 00/10] Block layer fixes for 6.0-rc3, Kevin Wolf, 2021/04/09
- [PULL 01/10] block/rbd: fix memory leak in qemu_rbd_connect(), Kevin Wolf, 2021/04/09
- [PULL 02/10] block/rbd: fix memory leak in qemu_rbd_co_create_opts(), Kevin Wolf, 2021/04/09
- [PULL 03/10] iotests/qsd-jobs: Filter events in the first test, Kevin Wolf, 2021/04/09
- [PULL 04/10] iotests: add test for removing persistent bitmap from backing file, Kevin Wolf, 2021/04/09
- [PULL 09/10] job: Allow complete for jobs on standby,
Kevin Wolf <=
- [PULL 07/10] mirror: Move open_backing_file to exit_common, Kevin Wolf, 2021/04/09
- [PULL 06/10] hw/block/fdc: Fix 'fallback' property on sysbus floppy disk controllers, Kevin Wolf, 2021/04/09
- [PULL 08/10] mirror: Do not enter a paused job on completion, Kevin Wolf, 2021/04/09
- [PULL 05/10] iotests: Test mirror-top filter permissions, Kevin Wolf, 2021/04/09
- [PULL 10/10] test-blockjob: Test job_wait_unpaused(), Kevin Wolf, 2021/04/09
- Re: [PULL 00/10] Block layer fixes for 6.0-rc3, Peter Maydell, 2021/04/10