Skip to content

Commit d2cf503

Browse files
authored
chore: print client stream task error log (#1210)
Signed-off-by: Jim Ma <[email protected]>
1 parent a6c8dbf commit d2cf503

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

client/daemon/peer/peertask_piecetask_poller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ retry:
9393
ptc.Debugf("try get piece task from peer %s, piece num: %d, limit: %d\"", peer.PeerId, request.StartNum, request.Limit)
9494
p, err := poller.getPieceTasksByPeer(span, curPeerPacket, peer, request)
9595
if err == nil {
96-
ptc.Infof("got piece task from peer %s ok, pieces length: %d, totalPiece: %d, content length: %d, piece md5 sign: %s",
96+
ptc.Infof("get piece task from peer %s ok, pieces length: %d, totalPiece: %d, content length: %d, piece md5 sign: %s",
9797
peer.PeerId, len(p.PieceInfos), p.TotalPiece, p.ContentLength, p.PieceMd5Sign)
9898
span.SetAttributes(config.AttributeGetPieceCount.Int(len(p.PieceInfos)))
9999
return p, nil

client/daemon/peer/peertask_stream.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,10 @@ func (s *streamTask) Start(ctx context.Context) (io.ReadCloser, map[string]strin
109109
s.span.End()
110110
return nil, attr, ctx.Err()
111111
case <-s.peerTaskConductor.failCh:
112-
return nil, attr, fmt.Errorf("peer task failed: %d/%s",
112+
err := fmt.Errorf("peer task failed: %d/%s",
113113
s.peerTaskConductor.failedCode, s.peerTaskConductor.failedReason)
114+
s.Errorf("wait first piece failed due to %s ", err.Error())
115+
return nil, attr, err
114116
case <-s.peerTaskConductor.successCh:
115117
if s.peerTaskConductor.GetContentLength() != -1 {
116118
attr[headers.ContentLength] = fmt.Sprintf("%d", s.peerTaskConductor.GetContentLength())
@@ -189,11 +191,13 @@ func (s *streamTask) writeToPipe(firstPiece *PieceInfo, pw *io.PipeWriter) {
189191
return
190192
case <-s.ctx.Done():
191193
err = fmt.Errorf("context done due to: %s", s.ctx.Err())
194+
s.Errorf(err.Error())
192195
s.closeWithError(pw, err)
193196
return
194197
case <-s.peerTaskConductor.failCh:
195-
err = fmt.Errorf("context done due to peer task fail: %d/%s",
198+
err = fmt.Errorf("stream close with peer task fail: %d/%s",
196199
s.peerTaskConductor.failedCode, s.peerTaskConductor.failedReason)
200+
s.Errorf(err.Error())
197201
s.closeWithError(pw, err)
198202
return
199203
}

0 commit comments

Comments
 (0)