45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
From 3577b5c059bd3f83d47f72ef400e85160d56bc58 Mon Sep 17 00:00:00 2001
|
|
From: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
|
Date: Fri, 1 Dec 2023 11:11:43 +0800
|
|
Subject: [PATCH] migration/colo: More accurate update checkpoint time
|
|
|
|
cherry picked from commit 0e0f0479e28c6c1a1d024b2e5200cade479d6901
|
|
|
|
Previous operation(like vm_start and replication_start_all) will consume
|
|
extra time before update the timer, so reduce time in this patch.
|
|
|
|
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
|
|
Reviewed-by: Juan Quintela <quintela@redhat.com>
|
|
Signed-off-by: Juan Quintela <quintela@redhat.com>
|
|
Signed-off-by: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
|
---
|
|
migration/colo.c | 5 ++---
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/migration/colo.c b/migration/colo.c
|
|
index 2415325262..c8fadae956 100644
|
|
--- a/migration/colo.c
|
|
+++ b/migration/colo.c
|
|
@@ -530,7 +530,6 @@ static void colo_process_checkpoint(MigrationState *s)
|
|
{
|
|
QIOChannelBuffer *bioc;
|
|
QEMUFile *fb = NULL;
|
|
- int64_t current_time = qemu_clock_get_ms(QEMU_CLOCK_HOST);
|
|
Error *local_err = NULL;
|
|
int ret;
|
|
|
|
@@ -578,8 +577,8 @@ static void colo_process_checkpoint(MigrationState *s)
|
|
qemu_mutex_unlock_iothread();
|
|
trace_colo_vm_state_change("stop", "run");
|
|
|
|
- timer_mod(s->colo_delay_timer,
|
|
- current_time + s->parameters.x_checkpoint_delay);
|
|
+ timer_mod(s->colo_delay_timer, qemu_clock_get_ms(QEMU_CLOCK_HOST) +
|
|
+ s->parameters.x_checkpoint_delay);
|
|
|
|
while (s->state == MIGRATION_STATUS_COLO) {
|
|
if (failover_get_state() != FAILOVER_STATUS_NONE) {
|
|
--
|
|
2.27.0
|
|
|