From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39639) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoPty-0000x7-4R for qemu-devel@nongnu.org; Fri, 08 Apr 2016 02:28:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aoPtu-00071r-Q3 for qemu-devel@nongnu.org; Fri, 08 Apr 2016 02:28:17 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:40714) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoPtq-00070q-FG for qemu-devel@nongnu.org; Fri, 08 Apr 2016 02:28:14 -0400 From: zhanghailiang Date: Fri, 8 Apr 2016 14:26:22 +0800 Message-ID: <1460096797-14916-21-git-send-email-zhang.zhanghailiang@huawei.com> In-Reply-To: <1460096797-14916-1-git-send-email-zhang.zhanghailiang@huawei.com> References: <1460096797-14916-1-git-send-email-zhang.zhanghailiang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH COLO-Frame v16 20/35] COLO: Implement failover work for Secondary VM List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com, quintela@redhat.com, dgilbert@redhat.com, eblake@redhat.com, peter.huangpeng@huawei.com, eddie.dong@intel.com, yunhong.jiang@intel.com, wency@cn.fujitsu.com, lizhijian@cn.fujitsu.com, arei.gonglei@huawei.com, stefanha@redhat.com, hongyang.yang@easystack.cn, zhangchen.fnst@cn.fujitsu.com, xiecl.fnst@cn.fujitsu.com, armbru@redhat.com, zhanghailiang If users require SVM to takeover work, colo incoming thread should exit from loop while failover BH helps backing to migration incoming coroutine. Signed-off-by: zhanghailiang Signed-off-by: Li Zhijian Reviewed-by: Dr. David Alan Gilbert --- v12: - Improve error message that suggested by Dave - Add Reviewed-by tag --- migration/colo.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/migration/colo.c b/migration/colo.c index bdde182..b3d88ef 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -46,6 +46,33 @@ static bool colo_runstate_is_stopped(void) return runstate_check(RUN_STATE_COLO) || !runstate_is_running(); } +static void secondary_vm_do_failover(void) +{ + int old_state; + MigrationIncomingState *mis = migration_incoming_get_current(); + + migrate_set_state(&mis->state, MIGRATION_STATUS_COLO, + MIGRATION_STATUS_COMPLETED); + + if (!autostart) { + error_report("\"-S\" qemu option will be ignored in secondary side"); + /* recover runstate to normal migration finish state */ + autostart = true; + } + + old_state = failover_set_state(FAILOVER_STATUS_HANDLING, + FAILOVER_STATUS_COMPLETED); + if (old_state != FAILOVER_STATUS_HANDLING) { + error_report("Incorrect state (%d) while doing failover for " + "secondary VM", old_state); + return; + } + /* For Secondary VM, jump to incoming co */ + if (mis->migration_incoming_co) { + qemu_coroutine_enter(mis->migration_incoming_co, NULL); + } +} + static void primary_vm_do_failover(void) { MigrationState *s = migrate_get_current(); @@ -72,6 +99,8 @@ void colo_do_failover(MigrationState *s) if (get_colo_mode() == COLO_MODE_PRIMARY) { primary_vm_do_failover(); + } else { + secondary_vm_do_failover(); } } @@ -431,6 +460,11 @@ void *colo_process_incoming_thread(void *opaque) goto out; } assert(request); + if (failover_request_is_active()) { + error_report("failover request"); + goto out; + } + /* FIXME: This is unnecessary for periodic checkpoint mode */ colo_send_message(mis->to_src_file, COLO_MESSAGE_CHECKPOINT_REPLY, &local_err); @@ -502,10 +536,11 @@ out: qemu_fclose(fb); } qsb_free(buffer); - - qemu_mutex_lock_iothread(); + /* Here, we can ensure BH is hold the global lock, and will join colo + * incoming thread, so here it is not necessary to lock here again, + * or there will be a deadlock error. + */ colo_release_ram_cache(); - qemu_mutex_unlock_iothread(); if (mis->to_src_file) { qemu_fclose(mis->to_src_file); -- 1.8.3.1