From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YvLdI-0003G2-O5 for qemu-devel@nongnu.org; Thu, 21 May 2015 04:15:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YvLdE-00035B-Vd for qemu-devel@nongnu.org; Thu, 21 May 2015 04:15:12 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:55643) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YvLdE-0002zc-7x for qemu-devel@nongnu.org; Thu, 21 May 2015 04:15:08 -0400 From: zhanghailiang Date: Thu, 21 May 2015 16:13:18 +0800 Message-ID: <1432196001-10352-27-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1432196001-10352-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1432196001-10352-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH COLO-Frame v5 26/29] COLO NIC: Implement NIC checkpoint and failover List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: lizhijian@cn.fujitsu.com, quintela@redhat.com, yunhong.jiang@intel.com, eddie.dong@intel.com, peter.huangpeng@huawei.com, dgilbert@redhat.com, zhanghailiang , arei.gonglei@huawei.com, amit.shah@redhat.com, david@gibson.dropbear.id.au Signed-off-by: zhanghailiang Signed-off-by: Li Zhijian --- include/net/colo-nic.h | 2 ++ migration/colo.c | 21 ++++++++++++++++++--- net/colo-nic.c | 23 +++++++++++++++++++++++ 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/include/net/colo-nic.h b/include/net/colo-nic.h index 57c6719..9670512 100644 --- a/include/net/colo-nic.h +++ b/include/net/colo-nic.h @@ -21,5 +21,7 @@ void colo_add_nic_devices(NetClientState *nc); void colo_remove_nic_devices(NetClientState *nc); int colo_proxy_compare(void); +int colo_proxy_failover(void); +int colo_proxy_checkpoint(enum colo_mode mode); #endif diff --git a/migration/colo.c b/migration/colo.c index f5fc79c..ab9dcfe 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -114,6 +114,11 @@ static void slave_do_failover(void) ; } + if (colo_proxy_failover() != 0) { + error_report("colo proxy failed to do failover"); + } + colo_proxy_destroy(COLO_SECONDARY_MODE); + colo = NULL; if (!autostart) { @@ -136,6 +141,8 @@ static void master_do_failover(void) vm_stop_force_state(RUN_STATE_COLO); } + colo_proxy_destroy(COLO_PRIMARY_MODE); + if (s->state != MIGRATION_STATUS_FAILED) { migrate_set_state(s, MIGRATION_STATUS_COLO, MIGRATION_STATUS_COMPLETED); } @@ -259,6 +266,11 @@ static int colo_do_checkpoint_transaction(MigrationState *s, QEMUFile *control) qemu_fflush(trans); + ret = colo_proxy_checkpoint(COLO_PRIMARY_MODE); + if (ret < 0) { + goto out; + } + ret = colo_ctl_put(s->file, COLO_CHECKPOINT_SEND); if (ret < 0) { goto out; @@ -408,8 +420,6 @@ out: qemu_bh_schedule(s->cleanup_bh); qemu_mutex_unlock_iothread(); - colo_proxy_destroy(COLO_PRIMARY_MODE); - return NULL; } @@ -540,6 +550,11 @@ void *colo_process_incoming_checkpoints(void *opaque) goto out; } + ret = colo_proxy_checkpoint(COLO_SECONDARY_MODE); + if (ret < 0) { + goto out; + } + ret = colo_ctl_get(f, COLO_CHECKPOINT_SEND); if (ret < 0) { goto out; @@ -618,6 +633,7 @@ out: * just kill slave */ error_report("SVM is going to exit!"); + colo_proxy_destroy(COLO_SECONDARY_MODE); exit(1); } else { /* if we went here, means master may dead, we are doing failover */ @@ -642,6 +658,5 @@ out: loadvm_exit_colo(); - colo_proxy_destroy(COLO_SECONDARY_MODE); return NULL; } diff --git a/net/colo-nic.c b/net/colo-nic.c index a004e08..a6800b5 100644 --- a/net/colo-nic.c +++ b/net/colo-nic.c @@ -391,6 +391,29 @@ void colo_proxy_destroy(enum colo_mode mode) teardown_nic(mode, getpid()); } +/* +* Note: Weird, Only the VM in slave side need to do failover work !!! +*/ +int colo_proxy_failover(void) +{ + if (colo_proxy_send(NFCOLO_DO_FAILOVER, COLO_SECONDARY_MODE, 0, NULL) < 0) { + return -1; + } + + return 0; +} + +/* +* Note: Only the VM in master side need to do checkpoint +*/ +int colo_proxy_checkpoint(enum colo_mode mode) +{ + if (colo_proxy_send(NFCOLO_DO_CHECKPOINT, mode, 0, NULL) < 0) { + return -1; + } + return 0; +} + int colo_proxy_compare(void) { return atomic_xchg(&packet_compare_different, 0); -- 1.7.12.4