Skip to content

Commit 600ac6a

Browse files
jnsnowcodyprime
authored andcommitted
blockjob: add devops to blockjob backends
This lets us hook into drained_begin and drained_end requests from the backend level, which is particularly useful for making sure that all jobs associated with a particular node (whether the source or the target) receive a drain request. Suggested-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Jeff Cody <jcody@redhat.com> Message-id: 20170316212351.13797-4-jsnow@redhat.com Signed-off-by: Jeff Cody <jcody@redhat.com>
1 parent f4d9cc8 commit 600ac6a

File tree

1 file changed

+24
-5
lines changed

1 file changed

+24
-5
lines changed

blockjob.c

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,23 @@ static const BdrvChildRole child_job = {
6868
.stay_at_node = true,
6969
};
7070

71+
static void block_job_drained_begin(void *opaque)
72+
{
73+
BlockJob *job = opaque;
74+
block_job_pause(job);
75+
}
76+
77+
static void block_job_drained_end(void *opaque)
78+
{
79+
BlockJob *job = opaque;
80+
block_job_resume(job);
81+
}
82+
83+
static const BlockDevOps block_job_dev_ops = {
84+
.drained_begin = block_job_drained_begin,
85+
.drained_end = block_job_drained_end,
86+
};
87+
7188
BlockJob *block_job_next(BlockJob *job)
7289
{
7390
if (!job) {
@@ -205,11 +222,6 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
205222
}
206223

207224
job = g_malloc0(driver->instance_size);
208-
error_setg(&job->blocker, "block device is in use by block job: %s",
209-
BlockJobType_lookup[driver->job_type]);
210-
block_job_add_bdrv(job, "main node", bs, 0, BLK_PERM_ALL, &error_abort);
211-
bdrv_op_unblock(bs, BLOCK_OP_TYPE_DATAPLANE, job->blocker);
212-
213225
job->driver = driver;
214226
job->id = g_strdup(job_id);
215227
job->blk = blk;
@@ -219,8 +231,15 @@ void *block_job_create(const char *job_id, const BlockJobDriver *driver,
219231
job->paused = true;
220232
job->pause_count = 1;
221233
job->refcnt = 1;
234+
235+
error_setg(&job->blocker, "block device is in use by block job: %s",
236+
BlockJobType_lookup[driver->job_type]);
237+
block_job_add_bdrv(job, "main node", bs, 0, BLK_PERM_ALL, &error_abort);
222238
bs->job = job;
223239

240+
blk_set_dev_ops(blk, &block_job_dev_ops, job);
241+
bdrv_op_unblock(bs, BLOCK_OP_TYPE_DATAPLANE, job->blocker);
242+
224243
QLIST_INSERT_HEAD(&block_jobs, job, job_list);
225244

226245
blk_add_aio_context_notifier(blk, block_job_attached_aio_context,

0 commit comments

Comments
 (0)