mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

migration/tls: add trace points for multifd-tls

Browse Source 
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>
Message-Id: <1600139042-104593-7-git-send-email-zhengchuan@huawei.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Chuan Zheng 2020-09-15 11:04:02 +08:00 committed by Dr. David Alan Gilbert
parent 2964714015
commit 894f021411
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
migration/multifd.c
View File

@ -731,7 +731,11 @@ static void multifd_tls_outgoing_handshake(QIOTask *task,
QIOChannel *ioc = QIO_CHANNEL(qio_task_get_source(task)); QIOChannel *ioc = QIO_CHANNEL(qio_task_get_source(task));
Error *err = NULL; 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); multifd_channel_connect(p, ioc, err);
} }
@ -748,6 +752,7 @@ static void multifd_tls_channel_connect(MultiFDSendParams *p,
return; return;
} }
trace_multifd_tls_outgoing_handshake_start(ioc, tioc, hostname);
qio_channel_set_name(QIO_CHANNEL(tioc), "multifd-tls-outgoing"); qio_channel_set_name(QIO_CHANNEL(tioc), "multifd-tls-outgoing");
qio_channel_tls_handshake(tioc, qio_channel_tls_handshake(tioc,
multifd_tls_outgoing_handshake, multifd_tls_outgoing_handshake,
@ -763,6 +768,9 @@ static bool multifd_channel_connect(MultiFDSendParams *p,
{ {
MigrationState *s = migrate_get_current(); MigrationState *s = migrate_get_current();
trace_multifd_set_outgoing_channel(
ioc, object_get_typename(OBJECT(ioc)), p->tls_hostname, error);
if (!error) { if (!error) {
if (s->parameters.tls_creds && if (s->parameters.tls_creds &&
*s->parameters.tls_creds && *s->parameters.tls_creds &&

4
migration/trace-events
View File

@ -129,6 +129,10 @@ multifd_send_sync_main_wait(uint8_t id) "channel %d"
multifd_send_terminate_threads(bool error) "error %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_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_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 # migration.c
await_return_path_close_on_source_close(void) "" await_return_path_close_on_source_close(void) ""