Commit 90ab48eb authored by Anton Nefedov's avatar Anton Nefedov Committed by Jeff Cody
Browse files

mirror: do not increase offset during initial zero_or_discard phase 



If explicit zeroing out before mirroring is required for the target image,
it moves the block job offset counter to EOF, then offset and len counters
count the image size twice. There is no harm but stats are confusing,
specifically the progress of the operation is always reported as 99% by
management tools.

The patch skips offset increase for the first "technical" pass over the
image. This should not cause any further harm.

Signed-off-by: default avatarAnton Nefedov <anton.nefedov@virtuozzo.com>
Signed-off-by: default avatarDenis V. Lunev <den@openvz.org>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: 1486045515-8009-1-git-send-email-den@openvz.org
CC: Jeff Cody <jcody@redhat.com>
CC: Kevin Wolf <kwolf@redhat.com>
CC: Max Reitz <mreitz@redhat.com>
CC: Eric Blake <eblake@redhat.com>
Signed-off-by: default avatarJeff Cody <jcody@redhat.com>
parent b1660997

block/mirror.c

+7 −2
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ typedef struct MirrorBlockJob { 
    bool waiting_for_io;

    int target_cluster_sectors;

    int max_iov;

    bool initial_zeroing_ongoing;

} MirrorBlockJob;



typedef struct MirrorOp {
@@ -117,9 +118,10 @@ static void mirror_iteration_done(MirrorOp *op, int ret) 
        if (s->cow_bitmap) {

            bitmap_set(s->cow_bitmap, chunk_num, nb_chunks);

        }

        if (!s->initial_zeroing_ongoing) {

            s->common.offset += (uint64_t)op->nb_sectors * BDRV_SECTOR_SIZE;

        }



    }

    qemu_iovec_destroy(&op->qiov);

    g_free(op);
@@ -572,6 +574,7 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s) 
            return 0;

        }



        s->initial_zeroing_ongoing = true;

        for (sector_num = 0; sector_num < end; ) {

            int nb_sectors = MIN(end - sector_num,

                QEMU_ALIGN_DOWN(INT_MAX, s->granularity) >> BDRV_SECTOR_BITS);
@@ -579,6 +582,7 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s) 
            mirror_throttle(s);



            if (block_job_is_cancelled(&s->common)) {

                s->initial_zeroing_ongoing = false;

                return 0;

            }
@@ -593,6 +597,7 @@ static int coroutine_fn mirror_dirty_init(MirrorBlockJob *s) 
        }



        mirror_wait_for_all_io(s);

        s->initial_zeroing_ongoing = false;

    }



    /* First part, loop on the sectors and initialize the dirty bitmap.  */