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

feat: optimize service v2 log print (#2922) 

Signed-off-by: Gaius <gaius.qi@gmail.com>
This commit is contained in:
Gaius 2023-12-06 16:30:59 +08:00 committed by GitHub
parent cfcfbc3c39
commit 81cfc72943
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
scheduler/service/service_v2.go
View File

@ -91,7 +91,7 @@ func (v *V2) AnnouncePeer(stream schedulerv2.Scheduler_AnnouncePeerServer) error
for { for {
select { select {
case <-ctx.Done(): case <-ctx.Done():
logger.Infof("context was done") logger.Info("context was done")
return ctx.Err() return ctx.Err()
default: default:
} }
@ -110,86 +110,86 @@ func (v *V2) AnnouncePeer(stream schedulerv2.Scheduler_AnnouncePeerServer) error
switch announcePeerRequest := req.GetRequest().(type) { switch announcePeerRequest := req.GetRequest().(type) {
case *schedulerv2.AnnouncePeerRequest_RegisterPeerRequest: case *schedulerv2.AnnouncePeerRequest_RegisterPeerRequest:
registerPeerRequest := announcePeerRequest.RegisterPeerRequest registerPeerRequest := announcePeerRequest.RegisterPeerRequest
logger.Infof("receive AnnouncePeerRequest_RegisterPeerRequest: %s", registerPeerRequest.Download.Url) logger.Infof("receive RegisterPeerRequest, url: %s", registerPeerRequest.Download.Url)
if err := v.handleRegisterPeerRequest(ctx, stream, req.GetHostId(), req.GetTaskId(), req.GetPeerId(), registerPeerRequest); err != nil { if err := v.handleRegisterPeerRequest(ctx, stream, req.GetHostId(), req.GetTaskId(), req.GetPeerId(), registerPeerRequest); err != nil {
logger.Error(err) logger.Error(err)
return err return err
} }
case *schedulerv2.AnnouncePeerRequest_RegisterSeedPeerRequest: case *schedulerv2.AnnouncePeerRequest_RegisterSeedPeerRequest:
registerSeedPeerRequest := announcePeerRequest.RegisterSeedPeerRequest registerSeedPeerRequest := announcePeerRequest.RegisterSeedPeerRequest
logger.Infof("receive AnnouncePeerRequest_RegisterSeedPeerRequest: %s", registerSeedPeerRequest.Download.Url) logger.Infof("receive RegisterSeedPeerRequest, url: %s", registerSeedPeerRequest.Download.Url)
if err := v.handleRegisterSeedPeerRequest(ctx, stream, req.GetHostId(), req.GetTaskId(), req.GetPeerId(), registerSeedPeerRequest); err != nil { if err := v.handleRegisterSeedPeerRequest(ctx, stream, req.GetHostId(), req.GetTaskId(), req.GetPeerId(), registerSeedPeerRequest); err != nil {
logger.Error(err) logger.Error(err)
return err return err
} }
case *schedulerv2.AnnouncePeerRequest_DownloadPeerStartedRequest: case *schedulerv2.AnnouncePeerRequest_DownloadPeerStartedRequest:
logger.Info("receive AnnouncePeerRequest_DownloadPeerStartedRequest") logger.Info("receive DownloadPeerStartedRequest")
if err := v.handleDownloadPeerStartedRequest(ctx, req.GetPeerId()); err != nil { if err := v.handleDownloadPeerStartedRequest(ctx, req.GetPeerId()); err != nil {
logger.Error(err) logger.Error(err)
return err return err
} }
case *schedulerv2.AnnouncePeerRequest_DownloadPeerBackToSourceStartedRequest: case *schedulerv2.AnnouncePeerRequest_DownloadPeerBackToSourceStartedRequest:
logger.Info("receive AnnouncePeerRequest_DownloadPeerBackToSourceStartedRequest") logger.Info("receive DownloadPeerBackToSourceStartedRequest")
if err := v.handleDownloadPeerBackToSourceStartedRequest(ctx, req.GetPeerId()); err != nil { if err := v.handleDownloadPeerBackToSourceStartedRequest(ctx, req.GetPeerId()); err != nil {
logger.Error(err) logger.Error(err)
return err return err
} }
case *schedulerv2.AnnouncePeerRequest_RescheduleRequest: case *schedulerv2.AnnouncePeerRequest_RescheduleRequest:
logger.Infof("receive AnnouncePeerRequest_RescheduleRequest: %s", announcePeerRequest.RescheduleRequest.GetDescription()) logger.Infof("receive RescheduleRequest, description: %s", announcePeerRequest.RescheduleRequest.GetDescription())
if err := v.handleRescheduleRequest(ctx, req.GetPeerId()); err != nil { if err := v.handleRescheduleRequest(ctx, req.GetPeerId()); err != nil {
logger.Error(err) logger.Error(err)
return err return err
} }
case *schedulerv2.AnnouncePeerRequest_DownloadPeerFinishedRequest: case *schedulerv2.AnnouncePeerRequest_DownloadPeerFinishedRequest:
downloadPeerFinishedRequest := announcePeerRequest.DownloadPeerFinishedRequest downloadPeerFinishedRequest := announcePeerRequest.DownloadPeerFinishedRequest
logger.Infof("receive AnnouncePeerRequest_DownloadPeerFinishedRequest: %d %d", downloadPeerFinishedRequest.GetContentLength(), downloadPeerFinishedRequest.GetPieceCount()) logger.Infof("receive DownloadPeerFinishedRequest, content length: %d, piece count: %d", downloadPeerFinishedRequest.GetContentLength(), downloadPeerFinishedRequest.GetPieceCount())
if err := v.handleDownloadPeerFinishedRequest(ctx, req.GetPeerId()); err != nil { if err := v.handleDownloadPeerFinishedRequest(ctx, req.GetPeerId()); err != nil {
logger.Error(err) logger.Error(err)
return err return err
} }
case *schedulerv2.AnnouncePeerRequest_DownloadPeerBackToSourceFinishedRequest: case *schedulerv2.AnnouncePeerRequest_DownloadPeerBackToSourceFinishedRequest:
downloadPeerBackToSourceFinishedRequest := announcePeerRequest.DownloadPeerBackToSourceFinishedRequest downloadPeerBackToSourceFinishedRequest := announcePeerRequest.DownloadPeerBackToSourceFinishedRequest
logger.Infof("receive AnnouncePeerRequest_DownloadPeerBackToSourceFinishedRequest: %d %d", downloadPeerBackToSourceFinishedRequest.GetContentLength(), downloadPeerBackToSourceFinishedRequest.GetPieceCount()) logger.Infof("receive DownloadPeerBackToSourceFinishedRequest, content length: %d, piece count: %d", downloadPeerBackToSourceFinishedRequest.GetContentLength(), downloadPeerBackToSourceFinishedRequest.GetPieceCount())
if err := v.handleDownloadPeerBackToSourceFinishedRequest(ctx, req.GetPeerId(), downloadPeerBackToSourceFinishedRequest); err != nil { if err := v.handleDownloadPeerBackToSourceFinishedRequest(ctx, req.GetPeerId(), downloadPeerBackToSourceFinishedRequest); err != nil {
logger.Error(err) logger.Error(err)
return err return err
} }
case *schedulerv2.AnnouncePeerRequest_DownloadPeerFailedRequest: case *schedulerv2.AnnouncePeerRequest_DownloadPeerFailedRequest:
logger.Infof("receive AnnouncePeerRequest_DownloadPeerFailedRequest: %s", announcePeerRequest.DownloadPeerFailedRequest.GetDescription()) logger.Infof("receive DownloadPeerFailedRequest, description: %s", announcePeerRequest.DownloadPeerFailedRequest.GetDescription())
if err := v.handleDownloadPeerFailedRequest(ctx, req.GetPeerId()); err != nil { if err := v.handleDownloadPeerFailedRequest(ctx, req.GetPeerId()); err != nil {
logger.Error(err) logger.Error(err)
return err return err
} }
case *schedulerv2.AnnouncePeerRequest_DownloadPeerBackToSourceFailedRequest: case *schedulerv2.AnnouncePeerRequest_DownloadPeerBackToSourceFailedRequest:
logger.Infof("receive AnnouncePeerRequest_DownloadPeerBackToSourceFailedRequest: %s", announcePeerRequest.DownloadPeerBackToSourceFailedRequest.GetDescription()) logger.Infof("receive DownloadPeerBackToSourceFailedRequest, description: %s", announcePeerRequest.DownloadPeerBackToSourceFailedRequest.GetDescription())
if err := v.handleDownloadPeerBackToSourceFailedRequest(ctx, req.GetPeerId()); err != nil { if err := v.handleDownloadPeerBackToSourceFailedRequest(ctx, req.GetPeerId()); err != nil {
logger.Error(err) logger.Error(err)
return err return err
} }
case *schedulerv2.AnnouncePeerRequest_DownloadPieceFinishedRequest: case *schedulerv2.AnnouncePeerRequest_DownloadPieceFinishedRequest:
piece := announcePeerRequest.DownloadPieceFinishedRequest.Piece piece := announcePeerRequest.DownloadPieceFinishedRequest.Piece
logger.Infof("receive AnnouncePeerRequest_DownloadPieceFinishedRequest: %d %d %s %s %s", piece.GetNumber(), piece.GetLength(), piece.GetTrafficType(), piece.GetCost().AsDuration().String(), piece.GetParentId()) logger.Infof("receive DownloadPieceFinishedRequest, piece number: %d, piece length: %d, traffic type: %s, cost: %s, parent id: %s", piece.GetNumber(), piece.GetLength(), piece.GetTrafficType(), piece.GetCost().AsDuration().String(), piece.GetParentId())
if err := v.handleDownloadPieceFinishedRequest(ctx, req.GetPeerId(), announcePeerRequest.DownloadPieceFinishedRequest); err != nil { if err := v.handleDownloadPieceFinishedRequest(ctx, req.GetPeerId(), announcePeerRequest.DownloadPieceFinishedRequest); err != nil {
logger.Error(err) logger.Error(err)
return err return err
} }
case *schedulerv2.AnnouncePeerRequest_DownloadPieceBackToSourceFinishedRequest: case *schedulerv2.AnnouncePeerRequest_DownloadPieceBackToSourceFinishedRequest:
piece := announcePeerRequest.DownloadPieceBackToSourceFinishedRequest.Piece piece := announcePeerRequest.DownloadPieceBackToSourceFinishedRequest.Piece
logger.Infof("receive AnnouncePeerRequest_DownloadPieceBackToSourceFinishedRequest: %d %d %s %s %s", piece.GetNumber(), piece.GetLength(), piece.GetTrafficType(), piece.GetCost().AsDuration().String(), piece.GetParentId()) logger.Infof("receive DownloadPieceBackToSourceFinishedRequest, piece number: %d, piece length: %d, traffic type: %s, cost: %s, parent id: %s", piece.GetNumber(), piece.GetLength(), piece.GetTrafficType(), piece.GetCost().AsDuration().String(), piece.GetParentId())
if err := v.handleDownloadPieceBackToSourceFinishedRequest(ctx, req.GetPeerId(), announcePeerRequest.DownloadPieceBackToSourceFinishedRequest); err != nil { if err := v.handleDownloadPieceBackToSourceFinishedRequest(ctx, req.GetPeerId(), announcePeerRequest.DownloadPieceBackToSourceFinishedRequest); err != nil {
logger.Error(err) logger.Error(err)
return err return err
} }
case *schedulerv2.AnnouncePeerRequest_DownloadPieceFailedRequest: case *schedulerv2.AnnouncePeerRequest_DownloadPieceFailedRequest:
downloadPieceFailedRequest := announcePeerRequest.DownloadPieceFailedRequest downloadPieceFailedRequest := announcePeerRequest.DownloadPieceFailedRequest
logger.Infof("receive AnnouncePeerRequest_DownloadPieceFailedRequest: %d %t %s", downloadPieceFailedRequest.GetPieceNumber(), downloadPieceFailedRequest.GetTemporary(), downloadPieceFailedRequest.GetParentId()) logger.Infof("receive DownloadPieceFailedRequest, piece number: %d, temporary: %t, parent id: %s", downloadPieceFailedRequest.GetPieceNumber(), downloadPieceFailedRequest.GetTemporary(), downloadPieceFailedRequest.GetParentId())
if err := v.handleDownloadPieceFailedRequest(ctx, req.GetPeerId(), downloadPieceFailedRequest); err != nil { if err := v.handleDownloadPieceFailedRequest(ctx, req.GetPeerId(), downloadPieceFailedRequest); err != nil {
logger.Error(err) logger.Error(err)
return err return err
} }
case *schedulerv2.AnnouncePeerRequest_DownloadPieceBackToSourceFailedRequest: case *schedulerv2.AnnouncePeerRequest_DownloadPieceBackToSourceFailedRequest:
downloadPieceBackToSourceFailedRequest := announcePeerRequest.DownloadPieceBackToSourceFailedRequest downloadPieceBackToSourceFailedRequest := announcePeerRequest.DownloadPieceBackToSourceFailedRequest
logger.Infof("receive AnnouncePeerRequest_DownloadPieceBackToSourceFailedRequest: %d", downloadPieceBackToSourceFailedRequest.GetPieceNumber()) logger.Infof("receive DownloadPieceBackToSourceFailedRequest, piece number: %d", downloadPieceBackToSourceFailedRequest.GetPieceNumber())
if err := v.handleDownloadPieceBackToSourceFailedRequest(ctx, req.GetPeerId(), downloadPieceBackToSourceFailedRequest); err != nil { if err := v.handleDownloadPieceBackToSourceFailedRequest(ctx, req.GetPeerId(), downloadPieceBackToSourceFailedRequest); err != nil {
logger.Error(err) logger.Error(err)
return err return err