From patchwork Wed Oct 7 06:20:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 527153 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 DE9C9140D95 for ; Wed, 7 Oct 2015 17:24:47 +1100 (AEDT) Received: from localhost ([::1]:55459 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zji9d-0000mS-Jh for incoming@patchwork.ozlabs.org; Wed, 07 Oct 2015 02:24:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48986) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zji61-0002co-QS for qemu-devel@nongnu.org; Wed, 07 Oct 2015 02:21:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zji60-0000RR-Qb for qemu-devel@nongnu.org; Wed, 07 Oct 2015 02:21:01 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:24031 helo=relay.sw.ru) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zji60-0000R1-Dx for qemu-devel@nongnu.org; Wed, 07 Oct 2015 02:21:00 -0400 Received: from irbis.sw.ru ([10.30.2.139]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id t976KkkW031932; Wed, 7 Oct 2015 09:20:58 +0300 (MSK) From: "Denis V. Lunev" To: Date: Wed, 7 Oct 2015 09:20:45 +0300 Message-Id: <1444198846-5383-8-git-send-email-den@openvz.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1444198846-5383-1-git-send-email-den@openvz.org> References: <5614531B.5080107@redhat.com> <1444198846-5383-1-git-send-email-den@openvz.org> MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by relay.sw.ru id t976KkkW031932 X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x X-Received-From: 195.214.232.25 Cc: "Denis V. Lunev" , Igor Redko , jsnow@redhat.com, qemu-devel@nongnu.org, annam@virtuozzo.com Subject: [Qemu-devel] [PATCH 7/8] migration: new migration test mode 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 From: Igor Redko In this patch the ability to start a migration with test-only capability was added. It allows to gather the guest VM’s memory usage statistics avoiding time and memory overheads and real data transmission. New MIGRATION_STATUS_TEST_COMPLETED was added to distinguish between test migration and true migration success states. Signed-off-by: Igor Redko Reviewed-by: Anna Melekhova Signed-off-by: Denis V. Lunev --- migration/migration.c | 12 ++++++++++-- qapi-schema.json | 4 +++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index 3182e15..3470d39 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -790,7 +790,9 @@ void qmp_migrate(const char *uri, bool has_blk, bool blk, s = migrate_init(¶ms); - if (strstart(uri, "tcp:", &p)) { + if (migrate_is_test()) { + test_start_migration(s, p, &local_err); + } else if (strstart(uri, "tcp:", &p)) { tcp_start_outgoing_migration(s, p, &local_err); #ifdef CONFIG_RDMA } else if (strstart(uri, "rdma:", &p)) { @@ -1054,8 +1056,14 @@ static void *migration_thread(void *opaque) } if (qemu_file_get_error(s->file)) { - migrate_set_state(s, MIGRATION_STATUS_ACTIVE, + /*FIXME replace magic number with smth legit*/ + if (migrate_is_test() && qemu_file_get_error(s->file) == -42) { + migrate_set_state(s, MIGRATION_STATUS_ACTIVE, + MIGRATION_STATUS_TEST_COMPLETED); + } else { + migrate_set_state(s, MIGRATION_STATUS_ACTIVE, MIGRATION_STATUS_FAILED); + } break; } diff --git a/qapi-schema.json b/qapi-schema.json index 38bf199..e022f9c 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -432,6 +432,8 @@ # # @completed: migration is finished. # +# @test-completed: migration time estimation finished. +# # @failed: some error occurred during migration process. # # Since: 2.3 @@ -439,7 +441,7 @@ ## { 'enum': 'MigrationStatus', 'data': [ 'none', 'setup', 'cancelling', 'cancelled', - 'active', 'completed', 'failed' ] } + 'active', 'completed', 'test-completed', 'failed' ] } ## # @MigrationInfo