Skip to content

Commits

Permalink
colo-v1.2-deve…
Switch branches/tags

Name already in use

A tag already exists with the provided branch name. Many Git commands accept both tag and branch names, so creating this branch may cause unexpected behavior. Are you sure you want to create this branch?

Commits on Jun 17, 2015

  1. avoid startup another migration chanel in colo mode

    Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
    zhijianli88 committed Jun 17, 2015
    Copy the full SHA
    a3e0b20 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2015

  1. manage colo network in colo-proxy-script.sh

    Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
    zhijianli88 committed Jun 2, 2015
    Copy the full SHA
    ded6e3f View commit details
    Browse the repository at this point in the history
  2. do qemu-ifdown at colo begining and qemu-ifup at failover

    ifdown script must be corrcet, after we execute
    ifdown script, the virt interface 'tap0' will recover
    to the begining of qemu startup
    
    Now, we can use the same ifup/ifdown in both slave
    and master side.
    e.g.
     $ cat /etc/qemu-ifup
     #!/bin/bash
     switch=br0
     if [ -n "$1" ]; then
             ip link set $1 up
             brctl addif ${switch} $1
             exit 0
     else
             echo "Error: no interface specified"
             exit 1
     fi
    ============================================
     $ cat /etc/qemu-ifdown
     #!/bin/bash
     switch=br0
     if [ -n "$1" ]; then
             brctl delif ${switch} $1
             exit 0
     else
             echo "Error: no interface specified"
             exit 1
     fi
    
    Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
    zhijianli88 committed Jun 2, 2015
    Copy the full SHA
    2a1adba View commit details
    Browse the repository at this point in the history
  3. export launch_script which used by colo nic

    Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
    zhijianli88 committed Jun 2, 2015
    Copy the full SHA
    0aae50d View commit details
    Browse the repository at this point in the history
  4. net cleanup and support both -net and -netdev

    Note that, colo only support tap interface now.
    
    Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
    zhijianli88 committed Jun 2, 2015
    Copy the full SHA
    3c869e9 View commit details
    Browse the repository at this point in the history
  5. add COLONicState to maintain colo-script related data

    Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
    zhijianli88 committed Jun 2, 2015
    Copy the full SHA
    8ec4cbb View commit details
    Browse the repository at this point in the history
  6. fix caculate total pages of saving in complete

    Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
    zhijianli88 committed Jun 2, 2015
    Copy the full SHA
    fd2a774 View commit details
    Browse the repository at this point in the history
  7. remove unuse var avoid compiling error

    Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
    zhijianli88 committed Jun 2, 2015
    Copy the full SHA
    06e1618 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2015

  1. COLO: Add some statistics for number of pages transferred

    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    colo-ft committed May 21, 2015
    Copy the full SHA
    7c8e046 View commit details
    Browse the repository at this point in the history
  2. COLO: Save part of dirty pages to slave during the wait time of check…

    …point
    
    We can send part of dirty pages to slave during the wait time of checkpoint,
    where we just sleep before. In this way, we can reduce the pause time for VM
    when do checkpoint.
    
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    colo-ft committed May 21, 2015
    Copy the full SHA
    3ccc59d View commit details
    Browse the repository at this point in the history
  3. COLO: Move the position of ram begin process of saving/loading

    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    colo-ft committed May 21, 2015
    Copy the full SHA
    cc25528 View commit details
    Browse the repository at this point in the history
  4. arch_init: Change the return value of ram_save_complete

    Let ram_save_complete return the number of pages that been sent,
    just like what ram_save_iterate does.
    
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    colo-ft committed May 21, 2015
    Copy the full SHA
    9cfd1d6 View commit details
    Browse the repository at this point in the history
  5. COLO: Separate ram and device save/load process

    We separate the process of saving/loading ram and device when do checkpoint,
    we add new helpers for save/load ram/device. With this change, we can directly
    transfer ram from master to slave without using QEMUSizeBuffer as assistant,
    which also reduce the size of extra memory been used during checkpoint.
    
    Besides, we move the colo_flush_ram_cache to the proper position after the
    above change.
    
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    colo-ft committed May 21, 2015
    Copy the full SHA
    131b1b1 View commit details
    Browse the repository at this point in the history
  6. savevm: Split load vm state function qemu_loadvm_state

    qemu_loadvm_state is too long, and we can simplify it by splitting up
    with three helper functions.
    
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    colo-ft committed May 21, 2015
    Copy the full SHA
    b2c63ea View commit details
    Browse the repository at this point in the history
  7. COLO: Expose statistics information of checkpoint to user

    You can get some statistics information of checkpoint by using qmp command or
    hmp command 'info migrate'.
    
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    colo-ft committed May 21, 2015
    Copy the full SHA
    a7b4c71 View commit details
    Browse the repository at this point in the history
  8. COLO: Add some statistics information for checkpoint

    The statistics include: total checkpoint count, checkpoint count because of
    proxy net packets inconsistent, periodic checkpoint count, also, include
    VM's downtime during checkpoint.
    
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    colo-ft committed May 21, 2015
    Copy the full SHA
    106a372 View commit details
    Browse the repository at this point in the history
  9. COLO: Add block replication into colo process

    Make sure master start block replication after slave's block replication started
    
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com>
    Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
    wencongyang authored and colo-ft committed May 21, 2015
    Copy the full SHA
    3caaa7d View commit details
    Browse the repository at this point in the history
  10. Implement new driver for block replication

    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang authored and colo-ft committed May 21, 2015
    Copy the full SHA
    08f9fa5 View commit details
    Browse the repository at this point in the history
  11. quorum: allow ignoring child errors

    If the child is not ready, read/write/getlength/flush will
    return -errno. It is not critical error, and can be ignored:
    1. read/write:
       Just not report the error event.
    2. getlength:
       just ignore it. If all children's getlength return -errno,
       and be ignored, return -EIO.
    3. flush:
       Just ignore it. If all children's getlength return -errno,
       and be ignored, return 0.
    
    Usage: children.x.ignore-errors=true
    
    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang authored and colo-ft committed May 21, 2015
    Copy the full SHA
    23989d5 View commit details
    Browse the repository at this point in the history
  12. quorum: implement block driver interfaces for block replication

    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang authored and colo-ft committed May 21, 2015
    Copy the full SHA
    823757b View commit details
    Browse the repository at this point in the history
  13. skip nbd_target when starting block replication

    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang authored and colo-ft committed May 21, 2015
    Copy the full SHA
    bfb09d8 View commit details
    Browse the repository at this point in the history
  14. Add new block driver interfaces to control block replication

    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    Cc: Luiz Capitulino <lcapitulino@redhat.com>
    Cc: Michael Roth <mdroth@linux.vnet.ibm.com>
    Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
    wencongyang authored and colo-ft committed May 21, 2015
    Copy the full SHA
    6ca94be View commit details
    Browse the repository at this point in the history
  15. NBD client: connect to nbd server later

    The secondary qemu starts later than the primary qemu, so we
    cannot connect to nbd server in bdrv_open(). Introduce a new
    open flags to control it.
    
    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang authored and colo-ft committed May 21, 2015
    Copy the full SHA
    7306a1c View commit details
    Browse the repository at this point in the history
  16. Introduce a new -drive option to control whether to connect to remote…

    … target
    
    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang authored and colo-ft committed May 21, 2015
    Copy the full SHA
    10b47be View commit details
    Browse the repository at this point in the history
  17. NBD client: implement block driver interfaces to connect/disconnect N…

    …BD server
    
    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang authored and colo-ft committed May 21, 2015
    Copy the full SHA
    c900e1d View commit details
    Browse the repository at this point in the history
  18. Add new block driver interface to connect/disconnect the remote target

    In some cases, we want to connect/disconnect the remote target when
    we need, not in bdrv_open()/bdrv_close().
    
    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang authored and colo-ft committed May 21, 2015
    Copy the full SHA
    515449f View commit details
    Browse the repository at this point in the history
  19. Don't allow a disk use backing reference target

    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang authored and colo-ft committed May 21, 2015
    Copy the full SHA
    39cd386 View commit details
    Browse the repository at this point in the history
  20. Backup: clear all bitmap when doing block checkpoint

    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    Cc: Jeff Cody <jcody@redhat.com>
    wencongyang authored and colo-ft committed May 21, 2015
    Copy the full SHA
    a5a3bfb View commit details
    Browse the repository at this point in the history
  21. block: Parse "backing_reference" option to reference existing BDS

    Usage:
    -drive file=xxx,id=Y, \
    -drive file=xxxx,id=X,backing_reference.drive_id=Y,backing_reference.hidden-disk.*
    
    It will create such backing chain:
                   {virtio-blk dev 'Y'}                                      {virtio-blk dev 'X'}
                             |                                                          |
                             |                                                          |
                             v                                                          v
    
        [base] <- [mid] <- ( Y )  <----------------- (hidden target) <--------------- ( X )
    
                             v                              ^
                             v                              ^
                             v                              ^
                             v                              ^
                             >>>> drive-backup sync=none >>>>
    
    X's backing file is hidden-disk, and hidden-disk's backing file is Y.
    Disk Y may be opened or reopened in read-write mode, so A block backup
    job is automatically created: source is Y and target is hidden disk.
    Active disk X, hidden disk, and Y are all on the same AioContext.
    
    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang authored and colo-ft committed May 21, 2015
    Copy the full SHA
    35d6692 View commit details
    Browse the repository at this point in the history
  22. Allow creating backup jobs when opening BDS

    When opening BDS, we need to create backup jobs for
    image-fleecing.
    
    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    Cc: Jeff Cody <jcody@redhat.com>
    wencongyang authored and colo-ft committed May 21, 2015
    Copy the full SHA
    cae2995 View commit details
    Browse the repository at this point in the history
  23. allow writing to the backing file

    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang authored and colo-ft committed May 21, 2015
    Copy the full SHA
    bedd594 View commit details
    Browse the repository at this point in the history
  24. docs: block replication's description

    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: Yang Hongyang <yanghy@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    wencongyang authored and colo-ft committed May 21, 2015
    Copy the full SHA
    432ac8c View commit details
    Browse the repository at this point in the history
  25. util/hbitmap: Add an API to reset all set bits in hbitmap

    The function bdrv_clear_dirty_bitmap() is updated to use
    faster hbitmap_reset_all() call.
    
    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Gonglei <arei.gonglei@huawei.com>
    Acked-by: Paolo Bonzini <pbonzini@redhat.com>
    wencongyang authored and colo-ft committed May 21, 2015
    Copy the full SHA
    56abea3 View commit details
    Browse the repository at this point in the history
  26. iov: don't touch iov in iov_send_recv()

    Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    wencongyang authored and colo-ft committed May 21, 2015
    Copy the full SHA
    ac129b2 View commit details
    Browse the repository at this point in the history
  27. COLO: Implement shutdown checkpoint

    For SVM, we forbid it shutdown directly when in COLO mode,
    FOR PVM's shutdown, we should do some work to ensure the consistent action
    between PVM and SVM.
    
    Signed-off-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
    Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
    Signed-off-by: Li Zhijian <lizhijian@cn.fujitsu.com>
    colo-ft committed May 21, 2015
    Copy the full SHA
    60556fb View commit details
    Browse the repository at this point in the history
Older