[V12,18/19] COLO: quick failover process by kick COLO thread

Commit Message

Zhang Chen Sept. 3, 2018, 4:38 a.m. UTC

From: zhanghailiang <[e-mail]>

COLO thread may sleep at qemu_sem_wait(&s->colo_checkpoint_sem),
while failover works begin, It's better to wakeup it to quick
the process.

Signed-off-by: zhanghailiang <[e-mail]>
Reviewed-by: Dr. David Alan Gilbert <[e-mail]>
---
 migration/colo.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Patch

diff --git a/migration/colo.c b/migration/colo.c
index 365e913e51..3a3efb916b 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -131,6 +131,11 @@  static void primary_vm_do_failover(void)
 
     migrate_set_state(&s->state, MIGRATION_STATUS_COLO,
                       MIGRATION_STATUS_COMPLETED);
+    /*
+     * kick COLO thread which might wait at
+     * qemu_sem_wait(&s->colo_checkpoint_sem).
+     */
+    colo_checkpoint_notify(migrate_get_current());
 
     /*
      * Wake up COLO thread which may blocked in recv() or send(),
@@ -539,6 +544,9 @@  static void colo_process_checkpoint(MigrationState *s)
 
         qemu_sem_wait(&s->colo_checkpoint_sem);
 
+        if (s->state != MIGRATION_STATUS_COLO) {
+            goto out;
+        }
         ret = colo_do_checkpoint_transaction(s, bioc, fb);
         if (ret < 0) {
             goto out;