From patchwork Tue Dec 29 07:09:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhanghailiang X-Patchwork-Id: 561461 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2A1AB140C15 for ; Tue, 29 Dec 2015 18:24:24 +1100 (AEDT) Received: from localhost ([::1]:47453 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDodp-0004nk-W2 for incoming@patchwork.ozlabs.org; Tue, 29 Dec 2015 02:24:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45460) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDoRK-0005gY-IQ for qemu-devel@nongnu.org; Tue, 29 Dec 2015 02:11:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aDoRJ-000712-By for qemu-devel@nongnu.org; Tue, 29 Dec 2015 02:11:26 -0500 Received: from szxga03-in.huawei.com ([119.145.14.66]:14370) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDoRI-000705-O6 for qemu-devel@nongnu.org; Tue, 29 Dec 2015 02:11:25 -0500 Received: from 172.24.1.48 (EHLO SZXEML424-HUB.china.huawei.com) ([172.24.1.48]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BTP42915; Tue, 29 Dec 2015 15:11:13 +0800 (CST) Received: from localhost (10.177.24.212) by SZXEML424-HUB.china.huawei.com (10.82.67.153) with Microsoft SMTP Server id 14.3.235.1; Tue, 29 Dec 2015 15:11:02 +0800 From: zhanghailiang To: Date: Tue, 29 Dec 2015 15:09:23 +0800 Message-ID: <1451372975-5048-28-git-send-email-zhang.zhanghailiang@huawei.com> X-Mailer: git-send-email 1.9.0.msysgit.0 In-Reply-To: <1451372975-5048-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1451372975-5048-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.24.212] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020206.56823213.0086, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: bd1555130be5e7c974a492562ab3c30b X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.66 Cc: xiecl.fnst@cn.fujitsu.com, 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, stefanha@redhat.com, amit.shah@redhat.com, zhangchen.fnst@cn.fujitsu.com, hongyang.yang@easystack.cn Subject: [Qemu-devel] [PATCH COLO-Frame v13 27/39] COLO failover: Don't do failover during loading VM's state X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We should not do failover work while the main thread is loading VM's state, otherwise it will destroy the consistent of VM's memory and device state. Here we add a new failover status 'RELAUNCH' which means we should relaunch the process of failover. Signed-off-by: zhanghailiang Signed-off-by: Li Zhijian Reviewed-by: Dr. David Alan Gilbert --- v13: - Add Reviewed-by tag --- include/migration/failover.h | 2 ++ migration/colo.c | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/include/migration/failover.h b/include/migration/failover.h index fba3931..e115d25 100644 --- a/include/migration/failover.h +++ b/include/migration/failover.h @@ -20,6 +20,8 @@ typedef enum COLOFailoverStatus { FAILOVER_STATUS_REQUEST = 1, /* Request but not handled */ FAILOVER_STATUS_HANDLING = 2, /* In the process of handling failover */ FAILOVER_STATUS_COMPLETED = 3, /* Finish the failover process */ + /* Optional, Relaunch the failover process, again 'NONE' -> 'COMPLETED' */ + FAILOVER_STATUS_RELAUNCH = 4, } COLOFailoverStatus; void failover_init_state(void); diff --git a/migration/colo.c b/migration/colo.c index 03920d3..de01ade 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -19,6 +19,8 @@ #include "migration/failover.h" #include "qapi-event.h" +static bool vmstate_loading; + /* colo buffer */ #define COLO_BUFFER_BASE_SIZE (4 * 1024 * 1024) @@ -51,6 +53,19 @@ static void secondary_vm_do_failover(void) int old_state; MigrationIncomingState *mis = migration_incoming_get_current(); + /* Can not do failover during the process of VM's loading VMstate, Or + * it will break the secondary VM. + */ + if (vmstate_loading) { + old_state = failover_set_state(FAILOVER_STATUS_HANDLING, + FAILOVER_STATUS_RELAUNCH); + if (old_state != FAILOVER_STATUS_HANDLING) { + error_report("Unknown error while do failover for secondary VM," + "old_state: %d", old_state); + } + return; + } + migrate_set_state(&mis->state, MIGRATION_STATUS_COLO, MIGRATION_STATUS_COMPLETED); @@ -560,13 +575,23 @@ void *colo_process_incoming_thread(void *opaque) qemu_mutex_lock_iothread(); qemu_system_reset(VMRESET_SILENT); + vmstate_loading = true; if (qemu_loadvm_state(fb) < 0) { error_report("COLO: loadvm failed"); + vmstate_loading = false; qemu_mutex_unlock_iothread(); goto out; } + + vmstate_loading = false; qemu_mutex_unlock_iothread(); + if (failover_get_state() == FAILOVER_STATUS_RELAUNCH) { + failover_set_state(FAILOVER_STATUS_RELAUNCH, FAILOVER_STATUS_NONE); + failover_request_active(NULL); + goto out; + } + colo_put_cmd(mis->to_src_file, COLO_COMMAND_VMSTATE_LOADED, &local_err); if (local_err) {