[V2,2/2] migration/colo: Update checkpoint time lately

Commit Message

Zhang, Chen June 4, 2020, 8:55 a.m. UTC

From: Zhang Chen <[e-mail]>

Previous operation(like vm_start and replication_start_all) will consume
extra time for first forced synchronization, so reduce it in this patch.

Signed-off-by: Zhang Chen <[e-mail]>
Reviewed-by: zhanghailiang <[e-mail]>
---
 migration/colo.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Comments

Lukas Straub June 6, 2020, 7:53 p.m. UTC | #1

On Thu,  4 Jun 2020 16:55:33 +0800
Zhang Chen <[e-mail] > wrote:

> From: Zhang Chen <[e-mail]>
> 
> Previous operation(like vm_start and replication_start_all) will consume
> extra time for first forced synchronization, so reduce it in this patch.
> 
> Signed-off-by: Zhang Chen <[e-mail]>
> Reviewed-by: zhanghailiang <[e-mail]>
> ---

Hi,
Looks good and works well in my tests.
Reviewed-by: Lukas Straub <[e-mail]>
Tested-by: Lukas Straub <[e-mail]>

Regards,
Lukas Straub

Patch

diff --git a/migration/colo.c b/migration/colo.c
index 91c76789fa..2b837e1255 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -532,7 +532,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;
 
@@ -581,8 +580,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) {