From f8c3b80199726832c30ee06ec6c692c9c31fd24d Mon Sep 17 00:00:00 2001 From: Aarsh Shah Date: Thu, 19 Aug 2021 12:35:29 +0530 Subject: [PATCH 1/2] log completion message flow --- impl/events.go | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/impl/events.go b/impl/events.go index 6a8ee5b7..e3ef39d4 100644 --- a/impl/events.go +++ b/impl/events.go @@ -165,6 +165,11 @@ func (m *manager) OnTransferQueued(chid datatransfer.ChannelID) { } func (m *manager) OnResponseReceived(chid datatransfer.ChannelID, response datatransfer.Response) error { + if response.IsComplete() { + log.Infow("received complete response", "chid", chid, "isAccepted", response.Accepted()) + } + + if response.IsCancel() { log.Infof("channel %s: received cancel response, cancelling channel", chid) return m.channels.Cancel(chid) @@ -202,9 +207,11 @@ func (m *manager) OnResponseReceived(chid datatransfer.ChannelID, response datat } if response.IsComplete() && response.Accepted() { if !response.IsPaused() { - log.Infof("channel %s: received complete response, completing channel", chid) + log.Infow("received complete response,responder not paused, completing channel", "chid", chid) return m.channels.ResponderCompletes(chid) } + + log.Infow("received complete response, responder is paused, not completing channel", "chid", chid) err := m.channels.ResponderBeginsFinalization(chid) if err != nil { return nil @@ -244,17 +251,20 @@ func (m *manager) OnChannelCompleted(chid datatransfer.ChannelID, completeErr er if completeErr == nil { // If the channel was initiated by the other peer if chid.Initiator != m.peerID { + log.Infow("received OnChannelCompleted, will send completion message to initiator", "chid", chid) msg, err := m.completeMessage(chid) if err != nil { - return nil + return err } if msg != nil { // Send the other peer a message that the transfer has completed - log.Infof("channel %s: sending completion message to initiator", chid) + log.Infow("sending completion message to initiator", "chid", chid) if err := m.dataTransferNetwork.SendMessage(context.Background(), chid.Initiator, msg); err != nil { err := xerrors.Errorf("channel %s: failed to send completion message to initiator: %w", chid, err) - log.Warn(err) + log.Warnw("failed to send completion message to initiator", "chid", chid, "err", err) return m.OnRequestDisconnected(chid, err) + } else { + log.Infow("successfully sent completion message to initiator", "chid", chid) } } if msg.Accepted() { From f72c2a9822eca147b3f244447068831ae8dcb279 Mon Sep 17 00:00:00 2001 From: Aarsh Shah Date: Thu, 19 Aug 2021 12:37:02 +0530 Subject: [PATCH 2/2] go fmt --- impl/events.go | 1 - 1 file changed, 1 deletion(-) diff --git a/impl/events.go b/impl/events.go index e3ef39d4..5297d04f 100644 --- a/impl/events.go +++ b/impl/events.go @@ -169,7 +169,6 @@ func (m *manager) OnResponseReceived(chid datatransfer.ChannelID, response datat log.Infow("received complete response", "chid", chid, "isAccepted", response.Accepted()) } - if response.IsCancel() { log.Infof("channel %s: received cancel response, cancelling channel", chid) return m.channels.Cancel(chid)