feat: dfdaemon report successful piece before end of piece

Signed-off-by: Gaius <[email protected]>
dragonflyoss · Jan 14, 2022 · 5b6db0e · 5b6db0e
1 parent dd0df3f
commit 5b6db0e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/client/daemon/peer/peertask_conductor.go b/client/daemon/peer/peertask_conductor.go
@@ -630,8 +630,8 @@ func (pt *peerTaskConductor) pullSinglePiece() {
 	}
 
 	if result, err := pt.pieceManager.DownloadPiece(ctx, request); err == nil {
-		pt.PublishPieceInfo(request.piece.PieceNum, request.piece.RangeSize)
 		pt.reportSuccessResult(request, result)
+		pt.PublishPieceInfo(request.piece.PieceNum, request.piece.RangeSize)
 
 		span.SetAttributes(config.AttributePieceSuccess.Bool(true))
 		span.End()
@@ -924,8 +924,8 @@ func (pt *peerTaskConductor) downloadPieceWorker(id int32, requests chan *Downlo
 				continue
 			} else {
 				// broadcast success piece
-				pt.PublishPieceInfo(request.piece.PieceNum, request.piece.RangeSize)
 				pt.reportSuccessResult(request, result)
+				pt.PublishPieceInfo(request.piece.PieceNum, request.piece.RangeSize)
 			}
 
 			span.SetAttributes(config.AttributePieceSuccess.Bool(true))

diff --git a/scheduler/scheduler/scheduler.go b/scheduler/scheduler/scheduler.go
@@ -144,10 +144,10 @@ func (s *scheduler) filterParents(peer *resource.Peer, blocklist set.SafeSet) []
 		}
 
 		parents = append(parents, parent)
-		peer.Log.Infof("parent %s is selected", parent.ID)
 		return true
 	})
 
+	peer.Log.Infof("candidate parents include %#v", parents)
 	return parents
 }
 

diff --git a/scheduler/service/callback.go b/scheduler/service/callback.go
@@ -197,8 +197,6 @@ func (c *callback) PieceFail(ctx context.Context, peer *resource.Peer, piece *rp
 	// It’s not a case of back-to-source downloading failed,
 	// to help peer to reschedule the parent node
 	switch piece.Code {
-	case base.Code_ClientWaitPieceReady:
-		return
 	case base.Code_ClientPieceDownloadFail, base.Code_PeerTaskNotFound, base.Code_CDNError, base.Code_CDNTaskDownloadFail:
 		if err := parent.FSM.Event(resource.PeerEventDownloadFailed); err != nil {
 			peer.Log.Errorf("peer fsm event failed: %v", err)

diff --git a/scheduler/service/service.go b/scheduler/service/service.go
@@ -194,8 +194,15 @@ func (s *service) HandlePiece(ctx context.Context, peer *resource.Peer, piece *r
 		}
 	}
 
-	// Handle piece download failed
+	// Handle piece download code
 	if piece.Code != base.Code_Success {
+		// FIXME(244372610) When dfdaemon download peer return empty, retry later.
+		if piece.Code == base.Code_ClientWaitPieceReady {
+			peer.Log.Infof("receive piece code %d and wait for dfdaemon piece ready", piece.Code)
+			return
+		}
+
+		// Handle piece download failed
 		peer.Log.Errorf("receive failed piece: %#v %#v", piece, piece.PieceInfo)
 		s.callback.PieceFail(ctx, peer, piece)
 		return