Skip to content

chore: print client stream task error log #1210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 30, 2022
Merged

chore: print client stream task error log #1210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/daemon/peer/peertask_piecetask_poller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ retry:
ptc.Debugf("try get piece task from peer %s, piece num: %d, limit: %d\"", peer.PeerId, request.StartNum, request.Limit)
p, err := poller.getPieceTasksByPeer(span, curPeerPacket, peer, request)
if err == nil {
ptc.Infof("got piece task from peer %s ok, pieces length: %d, totalPiece: %d, content length: %d, piece md5 sign: %s",
ptc.Infof("get piece task from peer %s ok, pieces length: %d, totalPiece: %d, content length: %d, piece md5 sign: %s",
peer.PeerId, len(p.PieceInfos), p.TotalPiece, p.ContentLength, p.PieceMd5Sign)
span.SetAttributes(config.AttributeGetPieceCount.Int(len(p.PieceInfos)))
return p, nil
Expand Down
8 changes: 6 additions & 2 deletions client/daemon/peer/peertask_stream.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,10 @@ func (s *streamTask) Start(ctx context.Context) (io.ReadCloser, map[string]strin
s.span.End()
return nil, attr, ctx.Err()
case <-s.peerTaskConductor.failCh:
return nil, attr, fmt.Errorf("peer task failed: %d/%s",
err := fmt.Errorf("peer task failed: %d/%s",
s.peerTaskConductor.failedCode, s.peerTaskConductor.failedReason)
s.Errorf("wait first piece failed due to %s ", err.Error())
return nil, attr, err
case <-s.peerTaskConductor.successCh:
if s.peerTaskConductor.GetContentLength() != -1 {
attr[headers.ContentLength] = fmt.Sprintf("%d", s.peerTaskConductor.GetContentLength())
Expand Down Expand Up @@ -189,11 +191,13 @@ func (s *streamTask) writeToPipe(firstPiece *PieceInfo, pw *io.PipeWriter) {
return
case <-s.ctx.Done():
err = fmt.Errorf("context done due to: %s", s.ctx.Err())
s.Errorf(err.Error())
s.closeWithError(pw, err)
return
case <-s.peerTaskConductor.failCh:
err = fmt.Errorf("context done due to peer task fail: %d/%s",
err = fmt.Errorf("stream close with peer task fail: %d/%s",
s.peerTaskConductor.failedCode, s.peerTaskConductor.failedReason)
s.Errorf(err.Error())
s.closeWithError(pw, err)
return
}
Expand Down