dragonflyoss
/
dragonfly
mirror of https://github.com/dragonflyoss/dragonfly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: potential nil panic (#2602) 

Signed-off-by: Jim Ma <majinjing3@gmail.com>
This commit is contained in:
Jim Ma 2023-08-07 17:55:03 +08:00 committed by GitHub
parent dcea13aa47
commit a64140ff72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/daemon/peer/peertask_manager.go
View File

@ -293,7 +293,7 @@ func (ptm *peerTaskManager) prefetchParentTask(request *schedulerv1.PeerTaskRequ
logger.Infof("prefetch peer task %s/%s", taskID, req.PeerId) logger.Infof("prefetch peer task %s/%s", taskID, req.PeerId)
prefetch, err := ptm.getPeerTaskConductor(context.Background(), taskID, req, limit, nil, nil, desiredLocation, false) prefetch, err := ptm.getPeerTaskConductor(context.Background(), taskID, req, limit, nil, nil, desiredLocation, false)
if err != nil { if err != nil {
logger.Errorf("prefetch peer task %s/%s error: %s", prefetch.taskID, prefetch.peerID, err) logger.Errorf("prefetch peer task %s error: %s", taskID, err)
return nil return nil
} }

2
client/daemon/rpcserver/rpcserver.go
View File

@ -620,7 +620,7 @@ func (s *server) recursiveDownloadWithDirectMetadata(
parentReq := queue.PopFront() parentReq := queue.PopFront()
request, err := source.NewRequestWithContext(ctx, parentReq.Url, parentReq.UrlMeta.Header) request, err := source.NewRequestWithContext(ctx, parentReq.Url, parentReq.UrlMeta.Header)
if err != nil { if err != nil {
log.Errorf("generate url [%v] request error: %v", request.URL, err) log.Errorf("generate url [%v] request error: %v", parentReq.Url, err)
span.RecordError(err) span.RecordError(err)
return err return err
} }