* Zhang Chen (zhangc...@gmail.com) wrote:
> From: zhanghailiang <zhang.zhanghaili...@huawei.com>
>
> 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.zhanghaili...@huawei.com>
Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com>
> ---
> migration/colo.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/migration/colo.c b/migration/colo.c
> index 15463e2823..16def4865c 100644
> --- a/migration/colo.c
> +++ b/migration/colo.c
> @@ -135,6 +135,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(),
> @@ -552,6 +557,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;
> --
> 2.17.0
>
--
Dr. David Alan Gilbert / dgilb...@redhat.com / Manchester, UK
