[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 6/6] migration/tls: add trace points for multifd-tls
From: |
Chuan Zheng |
Subject: |
[PATCH v4 6/6] migration/tls: add trace points for multifd-tls |
Date: |
Tue, 15 Sep 2020 11:04:02 +0800 |
add trace points for multifd-tls for debug.
Signed-off-by: Chuan Zheng <zhengchuan@huawei.com>
Signed-off-by: Yan Jin <jinyan12@huawei.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
migration/multifd.c | 10 +++++++++-
migration/trace-events | 4 ++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/migration/multifd.c b/migration/multifd.c
index 3325c66..6f36e8c 100644
--- a/migration/multifd.c
+++ b/migration/multifd.c
@@ -731,7 +731,11 @@ static void multifd_tls_outgoing_handshake(QIOTask *task,
QIOChannel *ioc = QIO_CHANNEL(qio_task_get_source(task));
Error *err = NULL;
- qio_task_propagate_error(task, &err);
+ if (qio_task_propagate_error(task, &err)) {
+ trace_multifd_tls_outgoing_handshake_error(ioc, error_get_pretty(err));
+ } else {
+ trace_multifd_tls_outgoing_handshake_complete(ioc);
+ }
multifd_channel_connect(p, ioc, err);
}
@@ -748,6 +752,7 @@ static void multifd_tls_channel_connect(MultiFDSendParams
*p,
return;
}
+ trace_multifd_tls_outgoing_handshake_start(ioc, tioc, hostname);
qio_channel_set_name(QIO_CHANNEL(tioc), "multifd-tls-outgoing");
qio_channel_tls_handshake(tioc,
multifd_tls_outgoing_handshake,
@@ -763,6 +768,9 @@ static bool multifd_channel_connect(MultiFDSendParams *p,
{
MigrationState *s = migrate_get_current();
+ trace_multifd_set_outgoing_channel(
+ ioc, object_get_typename(OBJECT(ioc)), p->tls_hostname, error);
+
if (!error) {
if (s->parameters.tls_creds &&
*s->parameters.tls_creds &&
diff --git a/migration/trace-events b/migration/trace-events
index 7ba2fa6..6b5a053 100644
--- a/migration/trace-events
+++ b/migration/trace-events
@@ -129,6 +129,10 @@ multifd_send_sync_main_wait(uint8_t id) "channel %d"
multifd_send_terminate_threads(bool error) "error %d"
multifd_send_thread_end(uint8_t id, uint64_t packets, uint64_t pages) "channel
%d packets %" PRIu64 " pages %" PRIu64
multifd_send_thread_start(uint8_t id) "%d"
+multifd_tls_outgoing_handshake_start(void *ioc, void *tioc, const char
*hostname) "ioc=%p tioc=%p hostname=%s"
+multifd_tls_outgoing_handshake_error(void *ioc, const char *err) "ioc=%p
err=%s"
+multifd_tls_outgoing_handshake_complete(void *ioc) "ioc=%p"
+multifd_set_outgoing_channel(void *ioc, const char *ioctype, const char
*hostname, void *err) "ioc=%p ioctype=%s hostname=%s err=%p"
# migration.c
await_return_path_close_on_source_close(void) ""
--
1.8.3.1
- [PATCH v4 0/6] *** Add Multifd support for TLS migration ***, Chuan Zheng, 2020/09/14
- [PATCH v4 1/6] migration/tls: save hostname into MigrationState, Chuan Zheng, 2020/09/14
- [PATCH v4 3/6] migration/tls: add tls_hostname into MultiFDSendParams, Chuan Zheng, 2020/09/14
- [PATCH v4 2/6] migration/tls: extract migration_tls_client_create for common-use, Chuan Zheng, 2020/09/14
- [PATCH v4 6/6] migration/tls: add trace points for multifd-tls,
Chuan Zheng <=
- [PATCH v4 5/6] migration/tls: add support for multifd tls-handshake, Chuan Zheng, 2020/09/14
- [PATCH v4 4/6] migration/tls: extract cleanup function for common-use, Chuan Zheng, 2020/09/14
- Re: [PATCH v4 0/6] *** Add Multifd support for TLS migration ***, Dr. David Alan Gilbert, 2020/09/24