[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 7/9] migration/tls: add error handling in multifd_tls_handshake_th
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 7/9] migration/tls: add error handling in multifd_tls_handshake_thread |
Date: |
Mon, 15 Mar 2021 20:12:13 +0000 |
From: Hao Wang <wanghao232@huawei.com>
If any error happens during multifd send thread creating (e.g. channel broke
because new domain is destroyed by the dst), multifd_tls_handshake_thread
may exit silently, leaving main migration thread hanging (ram_save_setup ->
multifd_send_sync_main -> qemu_sem_wait(&p->sem_sync)).
Fix that by adding error handling in multifd_tls_handshake_thread.
Signed-off-by: Hao Wang <wanghao232@huawei.com>
Message-Id: <20210209104237.2250941-3-wanghao232@huawei.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Chuan Zheng <zhengchuan@huawei.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
migration/multifd.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/migration/multifd.c b/migration/multifd.c
index 2a1ea85ade..03527c564c 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -739,7 +739,16 @@ static void multifd_tls_outgoing_handshake(QIOTask *task,
} else {
trace_multifd_tls_outgoing_handshake_complete(ioc);
}
- multifd_channel_connect(p, ioc, err);
+
+ if (!multifd_channel_connect(p, ioc, err)) {
+ /*
+ * Error happen, mark multifd_send_thread status as 'quit' although it
+ * is not created, and then tell who pay attention to me.
+ */
+ p->quit = true;
+ qemu_sem_post(&multifd_send_state->channels_ready);
+ qemu_sem_post(&p->sem_sync);
+ }
}
static void *multifd_tls_handshake_thread(void *opaque)
--
2.30.2
- [PULL 0/9] virtiofs and migration queue, Dr. David Alan Gilbert (git), 2021/03/15
- [PULL 1/9] virtiofsd: Release vu_dispatch_lock when stopping queue, Dr. David Alan Gilbert (git), 2021/03/15
- [PULL 2/9] virtiofsd: Add qemu version and copyright info, Dr. David Alan Gilbert (git), 2021/03/15
- [PULL 3/9] virtiofsd: Don't allow empty filenames, Dr. David Alan Gilbert (git), 2021/03/15
- [PULL 4/9] virtiofsd: Don't allow empty paths in lookup_name(), Dr. David Alan Gilbert (git), 2021/03/15
- [PULL 7/9] migration/tls: add error handling in multifd_tls_handshake_thread,
Dr. David Alan Gilbert (git) <=
- [PULL 5/9] virtiofsd: Convert some functions to return bool, Dr. David Alan Gilbert (git), 2021/03/15
- [PULL 8/9] monitor: Replaced qemu_mutex_lock calls with QEMU_LOCK_GUARD, Dr. David Alan Gilbert (git), 2021/03/15
- [PULL 6/9] migration/tls: fix inverted semantics in multifd_channel_connect, Dr. David Alan Gilbert (git), 2021/03/15
- [PULL 9/9] migration: Replaced qemu_mutex_lock calls with QEMU_LOCK_GUARD, Dr. David Alan Gilbert (git), 2021/03/15
- Re: [PULL 0/9] virtiofs and migration queue, Peter Maydell, 2021/03/17