| Message ID | 20210517064428.16223-20-vsementsov@virtuozzo.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | block: publish backup-top filter | expand |
On 17.05.21 08:44, Vladimir Sementsov-Ogievskiy wrote: > Now block-copy will crash if user don't set progress meter by > block_copy_set_progress_meter(). copy-before-write filter will be used > in separate of backup job, and it doesn't want any progress meter (for > now). So, allow not setting it. > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > --- > block/block-copy.c | 18 +++++++++++------- > 1 file changed, 11 insertions(+), 7 deletions(-) Makes me wonder whether an “if (not NULL)” check in progress_meter.h wouldn’t be a nice addition, but: Reviewed-by: Max Reitz <mreitz@redhat.com>
18.05.2021 17:26, Max Reitz wrote: > On 17.05.21 08:44, Vladimir Sementsov-Ogievskiy wrote: >> Now block-copy will crash if user don't set progress meter by >> block_copy_set_progress_meter(). copy-before-write filter will be used >> in separate of backup job, and it doesn't want any progress meter (for >> now). So, allow not setting it. >> >> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> >> --- >> block/block-copy.c | 18 +++++++++++------- >> 1 file changed, 11 insertions(+), 7 deletions(-) > > Makes me wonder whether an “if (not NULL)” check in progress_meter.h wouldn’t be a nice addition, but: IMHO it isn't. It's unusual to check if (obj is not NULL) in all obj API functions.. The only place where it is usual is obj_free() like functions. > > Reviewed-by: Max Reitz <mreitz@redhat.com> > Thanks!
diff --git a/block/block-copy.c b/block/block-copy.c index 4126f7e8cc..63ec5c41a2 100644 --- a/block/block-copy.c +++ b/block/block-copy.c @@ -506,7 +506,7 @@ static coroutine_fn int block_copy_task_entry(AioTask *task) if (ret < 0 && !t->call_state->ret) { t->call_state->ret = ret; t->call_state->error_is_read = error_is_read; - } else { + } else if (t->s->progress) { progress_work_done(t->s->progress, t->bytes); } co_put_to_shres(t->s->mem, t->bytes); @@ -610,9 +610,11 @@ int64_t block_copy_reset_unallocated(BlockCopyState *s, if (!ret) { bdrv_reset_dirty_bitmap(s->copy_bitmap, offset, bytes); - progress_set_remaining(s->progress, - bdrv_get_dirty_count(s->copy_bitmap) + - s->in_flight_bytes); + if (s->progress) { + progress_set_remaining(s->progress, + bdrv_get_dirty_count(s->copy_bitmap) + + s->in_flight_bytes); + } } *count = bytes; @@ -672,9 +674,11 @@ block_copy_dirty_clusters(BlockCopyCallState *call_state) } if (s->skip_unallocated && !(ret & BDRV_BLOCK_ALLOCATED)) { block_copy_task_end(task, 0); - progress_set_remaining(s->progress, - bdrv_get_dirty_count(s->copy_bitmap) + - s->in_flight_bytes); + if (s->progress) { + progress_set_remaining(s->progress, + bdrv_get_dirty_count(s->copy_bitmap) + + s->in_flight_bytes); + } trace_block_copy_skip_range(s, task->offset, task->bytes); offset = task_end(task); bytes = end - offset;
Now block-copy will crash if user don't set progress meter by block_copy_set_progress_meter(). copy-before-write filter will be used in separate of backup job, and it doesn't want any progress meter (for now). So, allow not setting it. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> --- block/block-copy.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)