diff options
| author | Hao Wang | 2021-02-09 11:42:37 +0100 |
|---|---|---|
| committer | Dr. David Alan Gilbert | 2021-03-15 21:01:55 +0100 |
| commit | fca676429ca7f309b5d492c7675d35fec484197c (patch) | |
| tree | 6671d1f673f48222cc9cb854c3a04e8f814ed40c | |
| parent | migration/tls: fix inverted semantics in multifd_channel_connect (diff) | |
| download | qemu-fca676429ca7f309b5d492c7675d35fec484197c.tar.gz qemu-fca676429ca7f309b5d492c7675d35fec484197c.tar.xz qemu-fca676429ca7f309b5d492c7675d35fec484197c.zip | |
migration/tls: add error handling in multifd_tls_handshake_thread
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>
| -rw-r--r-- | migration/multifd.c | 11 |
1 files changed, 10 insertions, 1 deletions
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) |