From patchwork Thu Jan 4 06:01:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 10143885 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 924DC602A0 for ; Thu, 4 Jan 2018 06:03:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E477283ED for ; Thu, 4 Jan 2018 06:03:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7244528417; Thu, 4 Jan 2018 06:03:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BDF1028414 for ; Thu, 4 Jan 2018 06:03:35 +0000 (UTC) Received: from localhost ([::1]:47455 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWyco-0004tk-W7 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 04 Jan 2018 01:03:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36808) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWybJ-0003cD-Eb for qemu-devel@nongnu.org; Thu, 04 Jan 2018 01:02:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWybI-000470-7W for qemu-devel@nongnu.org; Thu, 04 Jan 2018 01:02:01 -0500 Received: from mail-pl0-x244.google.com ([2607:f8b0:400e:c01::244]:36426) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWybH-00046f-Ut for qemu-devel@nongnu.org; Thu, 04 Jan 2018 01:02:00 -0500 Received: by mail-pl0-x244.google.com with SMTP id b12so521050plm.3 for ; Wed, 03 Jan 2018 22:01:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RYaeajl/PXeBCb3ZAtFya+2/+i1BhYWMfvQa7R4SAwQ=; b=OzfEjZRTwimWc7c6gj/3V4ikYnFa5zz0HFJf/Q1DYGC22Ps7aPC7te/PwgnVO7UJ+i bTuB8NJmLnjVEpzPlaM7c9dXavYPQhPDehYqJKAQGiDwSCWf5eh5ePSUfpX7N3iPOHRV kTFZgwKDOfynRC8BAr5UcI6PZIowpKaip0SbTvgf84JL9eWjrEkqc7PeIM9eCNgFqjfH 7u7+AGRtSfomYyKKvOIu1OGLDg1KPSyyedyCzvBLgramhW4E8LRwOw7EiLOKTQPwicwi EVYaTxkjtP+312AegF/T4C3a93MG34RPIw4jLD0TrVQuLrdLHoMTjxflBR+bAxIXMSqX NwHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RYaeajl/PXeBCb3ZAtFya+2/+i1BhYWMfvQa7R4SAwQ=; b=aIMDXdK9c0QS/anVlt/2n8EOdylR/Kc5WlVt8YHxKGuPiXkiodQ4dd0Yk8R0hNvksJ Kv/Se0atX3l6UVltnWngOpZxLJy3buFokmKXSEWPZg8eJh98FQms5CNE30MRQYuD/ZV0 D/PVovYaLeUnMXgAESo0sLoK9gDixKkwu00LRtwW0Va+dOChkuEJ0P3dLn8SywIhm/uT BbarOU+Q7m9km8h/uZz7iQnQlF1OZ5cTUsXR8zzWD8OKgwV2y2B0RF2qXN0xKrMICFYl i0wsk8Pjm/bdUkEbz5vFlChFOsBTKBkiDqVtTSi2bYx6O7F/lO2u1Sbe/gzqpj0cgcqQ eLcA== X-Gm-Message-State: AKGB3mKOy2dO7/WhD58g/QdOr033yenyUmODC/Y5MRbliYLIQrH3gqhA GUc5uIf71cbeSBa/ZkYVy36e/SQ4 X-Google-Smtp-Source: ACJfBovsQgSYXmBt9l9D4Ry10/27v2DwqsRL/H+bGRJEice/AfhrK4hYmp4xQ5TWtttGxgEe9To9bw== X-Received: by 10.159.246.129 with SMTP id c1mr3628405pls.262.1515045718621; Wed, 03 Jan 2018 22:01:58 -0800 (PST) Received: from localhost.localdomain (120.236.201.35.bc.googleusercontent.com. [35.201.236.120]) by smtp.gmail.com with ESMTPSA id w5sm6214775pfi.74.2018.01.03.22.01.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 03 Jan 2018 22:01:57 -0800 (PST) From: Zhang Chen To: qemu devel Date: Thu, 4 Jan 2018 14:01:04 +0800 Message-Id: <1515045675-6993-6-git-send-email-zhangckid@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515045675-6993-1-git-send-email-zhangckid@gmail.com> References: <1515045675-6993-1-git-send-email-zhangckid@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c01::244 Subject: [Qemu-devel] [PATCH RESEND V3 05/16] COLO: Add block replication into colo process X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , zhanghailiang , Li Zhijian , Xie Changlong , Max Reitz , Stefan Hajnoczi , Zhang Chen Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Make sure master start block replication after slave's block replication started. Besides, we need to activate VM's blocks before goes into COLO state. Signed-off-by: zhanghailiang Signed-off-by: Li Zhijian Signed-off-by: Zhang Chen Cc: Stefan Hajnoczi Cc: Kevin Wolf Cc: Max Reitz Cc: Xie Changlong --- migration/colo.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ migration/migration.c | 9 +++++++++ 2 files changed, 55 insertions(+) diff --git a/migration/colo.c b/migration/colo.c index c513805..0e689df 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -26,6 +26,9 @@ #include "qmp-commands.h" #include "net/colo-compare.h" #include "net/colo.h" +#include "qapi-event.h" +#include "block/block.h" +#include "replication.h" static bool vmstate_loading; static Notifier packets_compare_notifier; @@ -55,6 +58,7 @@ static void secondary_vm_do_failover(void) { int old_state; MigrationIncomingState *mis = migration_incoming_get_current(); + Error *local_err = NULL; /* Can not do failover during the process of VM's loading VMstate, Or * it will break the secondary VM. @@ -72,6 +76,11 @@ static void secondary_vm_do_failover(void) migrate_set_state(&mis->state, MIGRATION_STATUS_COLO, MIGRATION_STATUS_COMPLETED); + replication_stop_all(true, &local_err); + if (local_err) { + error_report_err(local_err); + } + if (!autostart) { error_report("\"-S\" qemu option will be ignored in secondary side"); /* recover runstate to normal migration finish state */ @@ -109,6 +118,7 @@ static void primary_vm_do_failover(void) { MigrationState *s = migrate_get_current(); int old_state; + Error *local_err = NULL; migrate_set_state(&s->state, MIGRATION_STATUS_COLO, MIGRATION_STATUS_COMPLETED); @@ -132,6 +142,13 @@ static void primary_vm_do_failover(void) FailoverStatus_str(old_state)); return; } + + replication_stop_all(true, &local_err); + if (local_err) { + error_report_err(local_err); + local_err = NULL; + } + /* Notify COLO thread that failover work is finished */ qemu_sem_post(&s->colo_exit_sem); } @@ -355,6 +372,11 @@ static int colo_do_checkpoint_transaction(MigrationState *s, qemu_savevm_state_header(fb); qemu_savevm_state_setup(fb); qemu_mutex_lock_iothread(); + replication_do_checkpoint_all(&local_err); + if (local_err) { + qemu_mutex_unlock_iothread(); + goto out; + } qemu_savevm_state_complete_precopy(fb, false, false); qemu_mutex_unlock_iothread(); @@ -396,6 +418,7 @@ static int colo_do_checkpoint_transaction(MigrationState *s, ret = 0; qemu_mutex_lock_iothread(); + vm_start(); qemu_mutex_unlock_iothread(); trace_colo_vm_state_change("stop", "run"); @@ -445,6 +468,12 @@ static void colo_process_checkpoint(MigrationState *s) object_unref(OBJECT(bioc)); qemu_mutex_lock_iothread(); + replication_start_all(REPLICATION_MODE_PRIMARY, &local_err); + if (local_err) { + qemu_mutex_unlock_iothread(); + goto out; + } + vm_start(); qemu_mutex_unlock_iothread(); trace_colo_vm_state_change("stop", "run"); @@ -584,6 +613,11 @@ void *colo_process_incoming_thread(void *opaque) object_unref(OBJECT(bioc)); qemu_mutex_lock_iothread(); + replication_start_all(REPLICATION_MODE_SECONDARY, &local_err); + if (local_err) { + qemu_mutex_unlock_iothread(); + goto out; + } vm_start(); trace_colo_vm_state_change("stop", "run"); qemu_mutex_unlock_iothread(); @@ -664,6 +698,18 @@ void *colo_process_incoming_thread(void *opaque) goto out; } + replication_get_error_all(&local_err); + if (local_err) { + qemu_mutex_unlock_iothread(); + goto out; + } + /* discard colo disk buffer */ + replication_do_checkpoint_all(&local_err); + if (local_err) { + qemu_mutex_unlock_iothread(); + goto out; + } + vmstate_loading = false; vm_start(); trace_colo_vm_state_change("stop", "run"); diff --git a/migration/migration.c b/migration/migration.c index ced463c..3410145 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -318,6 +318,7 @@ static void process_incoming_migration_co(void *opaque) MigrationIncomingState *mis = migration_incoming_get_current(); PostcopyState ps; int ret; + Error *local_err = NULL; assert(mis->from_src_file); mis->largest_page_size = qemu_ram_pagesize_largest(); @@ -349,6 +350,14 @@ static void process_incoming_migration_co(void *opaque) /* we get COLO info, and know if we are in COLO mode */ if (!ret && migration_incoming_enable_colo()) { + /* Make sure all file formats flush their mutable metadata */ + bdrv_invalidate_cache_all(&local_err); + if (local_err) { + migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE, + MIGRATION_STATUS_FAILED); + error_report_err(local_err); + exit(EXIT_FAILURE); + } mis->migration_incoming_co = qemu_coroutine_self(); qemu_thread_create(&mis->colo_incoming_thread, "COLO incoming", colo_process_incoming_thread, mis, QEMU_THREAD_JOINABLE);