From a64140ff720d987062e96d1675c8bc988613d36f Mon Sep 17 00:00:00 2001 From: Jim Ma Date: Mon, 7 Aug 2023 17:55:03 +0800 Subject: [PATCH] fix: potential nil panic (#2602) Signed-off-by: Jim Ma --- client/daemon/peer/peertask_manager.go | 2 +- client/daemon/rpcserver/rpcserver.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/daemon/peer/peertask_manager.go b/client/daemon/peer/peertask_manager.go index 639e39c19..33ca897c4 100644 --- a/client/daemon/peer/peertask_manager.go +++ b/client/daemon/peer/peertask_manager.go @@ -293,7 +293,7 @@ func (ptm *peerTaskManager) prefetchParentTask(request *schedulerv1.PeerTaskRequ logger.Infof("prefetch peer task %s/%s", taskID, req.PeerId) prefetch, err := ptm.getPeerTaskConductor(context.Background(), taskID, req, limit, nil, nil, desiredLocation, false) 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 } diff --git a/client/daemon/rpcserver/rpcserver.go b/client/daemon/rpcserver/rpcserver.go index cf7122e38..5f2d9e164 100644 --- a/client/daemon/rpcserver/rpcserver.go +++ b/client/daemon/rpcserver/rpcserver.go @@ -620,7 +620,7 @@ func (s *server) recursiveDownloadWithDirectMetadata( parentReq := queue.PopFront() request, err := source.NewRequestWithContext(ctx, parentReq.Url, parentReq.UrlMeta.Header) 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) return err }