commit 2518aec19250531c4e03208b273a6b44b1344c33
author zhanghailiang <zhang.zhanghailiang@huawei.com> Mon Sep 03 12:38:59 2018 +0800
committer Jason Wang <jasowang@redhat.com> Fri Oct 19 11:15:03 2018 +0800
tree 3a69e23437ab03136427a551a5f0c4df6f1380dc
parent 7b3435309d27910587c7e6e8ba07e4070fb37bbb

COLO: quick failover process by kick COLO thread

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 <zhang.zhanghailiang@huawei.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>

migration/colo.c

diff --git a/migration/colo.c b/migration/colo.c
index 57a8542..956ac23 100644
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -131,6 +131,11 @@
 
     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 @@
 
         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;