ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block/replication: drop usage of bs->job 

We are going to remove bs->job pointer. Drop it's usage in replication
code. Additionally we have to return job pointer from some mirror APIs.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2019-06-06 18:41:29 +03:00 committed by Kevin Wolf
parent 835d689d25
commit cc19f1773d
3 changed files with 40 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
block/mirror.c
View File

@ -1482,7 +1482,8 @@ static BlockDriver bdrv_mirror_top = {
.bdrv_child_perm = bdrv_mirror_top_child_perm, .bdrv_child_perm = bdrv_mirror_top_child_perm,
}; };
static void mirror_start_job(const char *job_id, BlockDriverState *bs, static BlockJob *mirror_start_job(
const char *job_id, BlockDriverState *bs,
int creation_flags, BlockDriverState *target, int creation_flags, BlockDriverState *target,
const char *replaces, int64_t speed, const char *replaces, int64_t speed,
uint32_t granularity, int64_t buf_size, uint32_t granularity, int64_t buf_size,
@ -1514,7 +1515,7 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs,
if (buf_size < 0) { if (buf_size < 0) {
error_setg(errp, "Invalid parameter 'buf-size'"); error_setg(errp, "Invalid parameter 'buf-size'");
return; return NULL;
} }
if (buf_size == 0) { if (buf_size == 0) {
@ -1523,7 +1524,7 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs,
if (bs == target) { if (bs == target) {
error_setg(errp, "Can't mirror node into itself"); error_setg(errp, "Can't mirror node into itself");
return; return NULL;
} }
/* In the case of active commit, add dummy driver to provide consistent /* In the case of active commit, add dummy driver to provide consistent
@ -1532,7 +1533,7 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs,
mirror_top_bs = bdrv_new_open_driver(&bdrv_mirror_top, filter_node_name, mirror_top_bs = bdrv_new_open_driver(&bdrv_mirror_top, filter_node_name,
BDRV_O_RDWR, errp); BDRV_O_RDWR, errp);
if (mirror_top_bs == NULL) { if (mirror_top_bs == NULL) {
return; return NULL;
} }
if (!filter_node_name) { if (!filter_node_name) {
mirror_top_bs->implicit = true; mirror_top_bs->implicit = true;
@ -1554,7 +1555,7 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs,
if (local_err) { if (local_err) {
bdrv_unref(mirror_top_bs); bdrv_unref(mirror_top_bs);
error_propagate(errp, local_err); error_propagate(errp, local_err);
return; return NULL;
} }
/* Make sure that the source is not resized while the job is running */ /* Make sure that the source is not resized while the job is running */
@ -1662,7 +1663,8 @@ static void mirror_start_job(const char *job_id, BlockDriverState *bs,
trace_mirror_start(bs, s, opaque); trace_mirror_start(bs, s, opaque);
job_start(&s->common.job); job_start(&s->common.job);
return;
return &s->common;
fail: fail:
if (s) { if (s) {
@ -1684,6 +1686,8 @@ fail:
bdrv_replace_node(mirror_top_bs, backing_bs(mirror_top_bs), &error_abort); bdrv_replace_node(mirror_top_bs, backing_bs(mirror_top_bs), &error_abort);
bdrv_unref(mirror_top_bs); bdrv_unref(mirror_top_bs);
return NULL;
} }
void mirror_start(const char *job_id, BlockDriverState *bs, void mirror_start(const char *job_id, BlockDriverState *bs,
@ -1712,7 +1716,7 @@ void mirror_start(const char *job_id, BlockDriverState *bs,
filter_node_name, true, copy_mode, errp); filter_node_name, true, copy_mode, errp);
} }
void commit_active_start(const char *job_id, BlockDriverState *bs, BlockJob *commit_active_start(const char *job_id, BlockDriverState *bs,
BlockDriverState *base, int creation_flags, BlockDriverState *base, int creation_flags,
int64_t speed, BlockdevOnError on_error, int64_t speed, BlockdevOnError on_error,
const char *filter_node_name, const char *filter_node_name,
@ -1721,16 +1725,18 @@ void commit_active_start(const char *job_id, BlockDriverState *bs,
{ {
bool base_read_only; bool base_read_only;
Error *local_err = NULL; Error *local_err = NULL;
BlockJob *ret;
base_read_only = bdrv_is_read_only(base); base_read_only = bdrv_is_read_only(base);
if (base_read_only) { if (base_read_only) {
if (bdrv_reopen_set_read_only(base, false, errp) < 0) { if (bdrv_reopen_set_read_only(base, false, errp) < 0) {
return; return NULL;
} }
} }
mirror_start_job(job_id, bs, creation_flags, base, NULL, speed, 0, 0, ret = mirror_start_job(
job_id, bs, creation_flags, base, NULL, speed, 0, 0,
MIRROR_LEAVE_BACKING_CHAIN, MIRROR_LEAVE_BACKING_CHAIN,
on_error, on_error, true, cb, opaque, on_error, on_error, true, cb, opaque,
&commit_active_job_driver, false, base, auto_complete, &commit_active_job_driver, false, base, auto_complete,
@ -1741,7 +1747,7 @@ void commit_active_start(const char *job_id, BlockDriverState *bs,
goto error_restore_flags; goto error_restore_flags;
} }
return; return ret;
error_restore_flags: error_restore_flags:
/* ignore error and errp for bdrv_reopen, because we want to propagate /* ignore error and errp for bdrv_reopen, because we want to propagate
@ -1749,5 +1755,5 @@ error_restore_flags:
if (base_read_only) { if (base_read_only) {
bdrv_reopen_set_read_only(base, true, NULL); bdrv_reopen_set_read_only(base, true, NULL);
} }
return; return NULL;
} }

21
block/replication.c
View File

@ -36,8 +36,10 @@ typedef struct BDRVReplicationState {
ReplicationMode mode; ReplicationMode mode;
ReplicationStage stage; ReplicationStage stage;
BdrvChild *active_disk; BdrvChild *active_disk;
BlockJob *commit_job;
BdrvChild *hidden_disk; BdrvChild *hidden_disk;
BdrvChild *secondary_disk; BdrvChild *secondary_disk;
BlockJob *backup_job;
char *top_id; char *top_id;
ReplicationState *rs; ReplicationState *rs;
Error *blocker; Error *blocker;
@ -147,7 +149,7 @@ static void replication_close(BlockDriverState *bs)
replication_stop(s->rs, false, NULL); replication_stop(s->rs, false, NULL);
} }
if (s->stage == BLOCK_REPLICATION_FAILOVER) { if (s->stage == BLOCK_REPLICATION_FAILOVER) {
job_cancel_sync(&s->active_disk->bs->job->job); job_cancel_sync(&s->commit_job->job);
} }
if (s->mode == REPLICATION_MODE_SECONDARY) { if (s->mode == REPLICATION_MODE_SECONDARY) {
@ -315,12 +317,12 @@ static void secondary_do_checkpoint(BDRVReplicationState *s, Error **errp)
Error *local_err = NULL; Error *local_err = NULL;
int ret; int ret;
if (!s->secondary_disk->bs->job) { if (!s->backup_job) {
error_setg(errp, "Backup job was cancelled unexpectedly"); error_setg(errp, "Backup job was cancelled unexpectedly");
return; return;
} }
backup_do_checkpoint(s->secondary_disk->bs->job, &local_err); backup_do_checkpoint(s->backup_job, &local_err);
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
return; return;
@ -449,7 +451,6 @@ static void replication_start(ReplicationState *rs, ReplicationMode mode,
int64_t active_length, hidden_length, disk_length; int64_t active_length, hidden_length, disk_length;
AioContext *aio_context; AioContext *aio_context;
Error *local_err = NULL; Error *local_err = NULL;
BlockJob *job;
aio_context = bdrv_get_aio_context(bs); aio_context = bdrv_get_aio_context(bs);
aio_context_acquire(aio_context); aio_context_acquire(aio_context);
@ -540,7 +541,8 @@ static void replication_start(ReplicationState *rs, ReplicationMode mode,
bdrv_op_block_all(top_bs, s->blocker); bdrv_op_block_all(top_bs, s->blocker);
bdrv_op_unblock(top_bs, BLOCK_OP_TYPE_DATAPLANE, s->blocker); bdrv_op_unblock(top_bs, BLOCK_OP_TYPE_DATAPLANE, s->blocker);
job = backup_job_create(NULL, s->secondary_disk->bs, s->hidden_disk->bs, s->backup_job = backup_job_create(
NULL, s->secondary_disk->bs, s->hidden_disk->bs,
0, MIRROR_SYNC_MODE_NONE, NULL, false, 0, MIRROR_SYNC_MODE_NONE, NULL, false,
BLOCKDEV_ON_ERROR_REPORT, BLOCKDEV_ON_ERROR_REPORT,
BLOCKDEV_ON_ERROR_REPORT, JOB_INTERNAL, BLOCKDEV_ON_ERROR_REPORT, JOB_INTERNAL,
@ -551,7 +553,7 @@ static void replication_start(ReplicationState *rs, ReplicationMode mode,
aio_context_release(aio_context); aio_context_release(aio_context);
return; return;
} }
job_start(&job->job); job_start(&s->backup_job->job);
break; break;
default: default:
aio_context_release(aio_context); aio_context_release(aio_context);
@ -653,8 +655,8 @@ static void replication_stop(ReplicationState *rs, bool failover, Error **errp)
* before the BDS is closed, because we will access hidden * before the BDS is closed, because we will access hidden
* disk, secondary disk in backup_job_completed(). * disk, secondary disk in backup_job_completed().
*/ */
if (s->secondary_disk->bs->job) { if (s->backup_job) {
job_cancel_sync(&s->secondary_disk->bs->job->job); job_cancel_sync(&s->backup_job->job);
} }
if (!failover) { if (!failover) {
@ -665,7 +667,8 @@ static void replication_stop(ReplicationState *rs, bool failover, Error **errp)
} }
s->stage = BLOCK_REPLICATION_FAILOVER; s->stage = BLOCK_REPLICATION_FAILOVER;
commit_active_start(NULL, s->active_disk->bs, s->secondary_disk->bs, s->commit_job = commit_active_start(
NULL, s->active_disk->bs, s->secondary_disk->bs,
JOB_INTERNAL, 0, BLOCKDEV_ON_ERROR_REPORT, JOB_INTERNAL, 0, BLOCKDEV_ON_ERROR_REPORT,
NULL, replication_done, bs, true, errp); NULL, replication_done, bs, true, errp);
break; break;

2
include/block/block_int.h
View File

@ -1082,7 +1082,7 @@ void commit_start(const char *job_id, BlockDriverState *bs,
* @errp: Error object. * @errp: Error object.
* *
*/ */
void commit_active_start(const char *job_id, BlockDriverState *bs, BlockJob *commit_active_start(const char *job_id, BlockDriverState *bs,
BlockDriverState *base, int creation_flags, BlockDriverState *base, int creation_flags,
int64_t speed, BlockdevOnError on_error, int64_t speed, BlockdevOnError on_error,
const char *filter_node_name, const char *filter_node_name,