From 640567a021c1f51c9a6086a3fa52ef598f894dd0 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Tue, 13 Aug 2019 14:34:47 -0700 Subject: [PATCH] More informative link aggregation trace outputs --- node/Trace.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/node/Trace.cpp b/node/Trace.cpp index cccab9c91..6e0b9f05d 100644 --- a/node/Trace.cpp +++ b/node/Trace.cpp @@ -109,17 +109,22 @@ void Trace::peerConfirmingUnknownPath(void *const tPtr,const uint64_t networkId, void Trace::peerLinkNowRedundant(void *const tPtr,Peer &peer) { - ZT_LOCAL_TRACE(tPtr,RR,"link to peer %.10llx is fully redundant",peer.address().toInt()); + if ((RR->node->getMultipathMode() != ZT_MULTIPATH_RANDOM)) { + ZT_LOCAL_TRACE(tPtr,RR,"link to peer %.10llx is now a randomly-distributed aggregate link",peer.address().toInt()); + } + if ((RR->node->getMultipathMode() != ZT_MULTIPATH_PROPORTIONALLY_BALANCED)) { + ZT_LOCAL_TRACE(tPtr,RR,"link to peer %.10llx is now a proportionally-balanced aggregate link",peer.address().toInt()); + } } void Trace::peerLinkNoLongerRedundant(void *const tPtr,Peer &peer) { - ZT_LOCAL_TRACE(tPtr,RR,"link to peer %.10llx is no longer redundant",peer.address().toInt()); + ZT_LOCAL_TRACE(tPtr,RR,"link to peer %.10llx has degraded and is no longer an aggregate link",peer.address().toInt()); } void Trace::peerLinkAggregateStatistics(void *const tPtr,Peer &peer) { - ZT_LOCAL_TRACE(tPtr,RR,"link to peer %.10llx is composed of (%d) physical paths %s, has packet delay variance (%.0f ms), mean latency (%.0f ms)", + ZT_LOCAL_TRACE(tPtr,RR,"link to peer %.10llx is composed of (%d) physical paths %s, has PDV (%.0f ms), mean latency (%.0f ms)", peer.address().toInt(), peer.aggregateLinkPhysicalPathCount(), peer.interfaceListStr(),