[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] migration/multifd: close TLS channel before socket finalize
From: |
Chuan Zheng |
Subject: |
[PATCH] migration/multifd: close TLS channel before socket finalize |
Date: |
Fri, 6 Nov 2020 18:18:55 +0800 |
Since we now support tls multifd, when we cancel migration, the TLS
sockets will be left as CLOSE-WAIT On Src which results in socket
leak.
Fix it by closing TLS channel before socket finalize.
Signed-off-by: Chuan Zheng <zhengchuan@huawei.com>
---
migration/multifd.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/migration/multifd.c b/migration/multifd.c
index 68b171f..832e475 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -523,6 +523,19 @@ static void multifd_send_terminate_threads(Error *err)
}
}
+static void multifd_tls_socket_close(QIOChannel *ioc, Error *err)
+{
+ if (ioc &&
+ object_dynamic_cast(OBJECT(ioc),
+ TYPE_QIO_CHANNEL_TLS)) {
+ /*
+ * TLS channel is special, we need close it before
+ * socket finalize.
+ */
+ qio_channel_close(ioc, &err);
+ }
+}
+
void multifd_save_cleanup(void)
{
int i;
@@ -542,6 +555,7 @@ void multifd_save_cleanup(void)
MultiFDSendParams *p = &multifd_send_state->params[i];
Error *local_err = NULL;
+ multifd_tls_socket_close(p->c, NULL);
socket_send_channel_destroy(p->c);
p->c = NULL;
qemu_mutex_destroy(&p->mutex);
--
1.8.3.1
- [PATCH] migration/multifd: close TLS channel before socket finalize,
Chuan Zheng <=