Logs Provider Data transfer event handling (#595)

* more logs * log storage client events
filecoin-project · Jul 29, 2021 · 52a5c62 · 52a5c62
1 parent 1a17b2d
commit 52a5c62
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/storagemarket/impl/dtutils/dtutils.go b/storagemarket/impl/dtutils/dtutils.go
@@ -34,18 +34,21 @@ func ProviderDataTransferSubscriber(deals EventReceiver) datatransfer.Subscriber
 		voucher, ok := channelState.Voucher().(*requestvalidation.StorageDataTransferVoucher)
 		// if this event is for a transfer not related to storage, ignore
 		if !ok {
+			log.Debugw("ignoring data-transfer event as it's not storage related", "event", datatransfer.Events[event.Code], "channelID",
+				channelState.ChannelID())
 			return
 		}
 
+		log.Debugw("processing storage provider dt event", "event", datatransfer.Events[event.Code], "proposalCid", voucher.Proposal, "channelID",
+			channelState.ChannelID(), "channelState", datatransfer.Statuses[channelState.Status()])
+
 		if channelState.Status() == datatransfer.Completed {
 			err := deals.Send(voucher.Proposal, storagemarket.ProviderEventDataTransferCompleted)
 			if err != nil {
 				log.Errorf("processing dt event: %s", err)
 			}
 		}
 
-		log.Debugw("processing storage provider dt event", "event", datatransfer.Events[event.Code], "proposalCid", voucher.Proposal)
-
 		// Translate from data transfer events to provider FSM events
 		// Note: We ignore data transfer progress events (they do not affect deal state)
 		err := func() error {
@@ -65,7 +68,8 @@ func ProviderDataTransferSubscriber(deals EventReceiver) datatransfer.Subscriber
 			}
 		}()
 		if err != nil {
-			log.Errorf("processing dt event: %s", err)
+			log.Errorw("error processing storage provider dt event", "event", datatransfer.Events[event.Code], "proposalCid", voucher.Proposal, "channelID",
+				channelState.ChannelID(), "err", err)
 		}
 	}
 }
@@ -82,17 +86,17 @@ func ClientDataTransferSubscriber(deals EventReceiver) datatransfer.Subscriber {
 			return
 		}
 
+		// Note: We ignore data transfer progress events (they do not affect deal state)
+		log.Debugw("processing storage client dt event", "event", datatransfer.Events[event.Code], "proposalCid", voucher.Proposal, "channelID",
+			channelState.ChannelID(), "channelState", datatransfer.Statuses[channelState.Status()])
+
 		if channelState.Status() == datatransfer.Completed {
 			err := deals.Send(voucher.Proposal, storagemarket.ClientEventDataTransferComplete)
 			if err != nil {
 				log.Errorf("processing dt event: %s", err)
 			}
 		}
 
-		// Translate from data transfer events to client FSM events
-		// Note: We ignore data transfer progress events (they do not affect deal state)
-		log.Debugw("processing storage client dt event", "event", datatransfer.Events[event.Code], "proposalCid", voucher.Proposal)
-
 		err := func() error {
 			switch event.Code {
 			case datatransfer.Cancel:
@@ -112,7 +116,8 @@ func ClientDataTransferSubscriber(deals EventReceiver) datatransfer.Subscriber {
 			}
 		}()
 		if err != nil {
-			log.Errorf("processing dt event: %s", err)
+			log.Errorw("error processing storage client dt event", "event", datatransfer.Events[event.Code], "proposalCid", voucher.Proposal, "channelID",
+				channelState.ChannelID(), "err", err)
 		}
 	}
 }