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

feat: change event DownloadFromBackToSource (#1670) 

Signed-off-by: Gaius <gaius.qi@gmail.com>
This commit is contained in:
Gaius 2022-09-08 21:08:34 +08:00
parent 65f231fb68
commit 19a2bd5801
No known key found for this signature in database
GPG Key ID: 8B4E5D1290FA2FFB
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scheduler/resource/peer.go
View File

@ -89,8 +89,8 @@ const (
// Peer is downloading. // Peer is downloading.
PeerEventDownload = "Download" PeerEventDownload = "Download"
// Peer is downloading from back-to-source. // Peer is downloading back-to-source.
PeerEventDownloadFromBackToSource = "DownloadFromBackToSource" PeerEventDownloadBackToSource = "DownloadBackToSource"
// Peer downloaded successfully. // Peer downloaded successfully.
PeerEventDownloadSucceeded = "DownloadSucceeded" PeerEventDownloadSucceeded = "DownloadSucceeded"
@ -207,7 +207,7 @@ func NewPeer(id string, task *Task, host *Host, options ...PeerOption) *Peer {
{Name: PeerEventRegisterSmall, Src: []string{PeerStatePending}, Dst: PeerStateReceivedSmall}, {Name: PeerEventRegisterSmall, Src: []string{PeerStatePending}, Dst: PeerStateReceivedSmall},
{Name: PeerEventRegisterNormal, Src: []string{PeerStatePending}, Dst: PeerStateReceivedNormal}, {Name: PeerEventRegisterNormal, Src: []string{PeerStatePending}, Dst: PeerStateReceivedNormal},
{Name: PeerEventDownload, Src: []string{PeerStateReceivedTiny, PeerStateReceivedSmall, PeerStateReceivedNormal}, Dst: PeerStateRunning}, {Name: PeerEventDownload, Src: []string{PeerStateReceivedTiny, PeerStateReceivedSmall, PeerStateReceivedNormal}, Dst: PeerStateRunning},
{Name: PeerEventDownloadFromBackToSource, Src: []string{PeerStateReceivedTiny, PeerStateReceivedSmall, PeerStateReceivedNormal, PeerStateRunning}, Dst: PeerStateBackToSource}, {Name: PeerEventDownloadBackToSource, Src: []string{PeerStateReceivedTiny, PeerStateReceivedSmall, PeerStateReceivedNormal, PeerStateRunning}, Dst: PeerStateBackToSource},
{Name: PeerEventDownloadSucceeded, Src: []string{ {Name: PeerEventDownloadSucceeded, Src: []string{
// Since ReportPeerResult and ReportPieceResult are called in no order, // Since ReportPeerResult and ReportPieceResult are called in no order,
// the result may be reported after the register is successful. // the result may be reported after the register is successful.
@ -240,7 +240,7 @@ func NewPeer(id string, task *Task, host *Host, options ...PeerOption) *Peer {
p.UpdateAt.Store(time.Now()) p.UpdateAt.Store(time.Now())
p.Log.Infof("peer state is %s", e.FSM.Current()) p.Log.Infof("peer state is %s", e.FSM.Current())
}, },
PeerEventDownloadFromBackToSource: func(e *fsm.Event) { PeerEventDownloadBackToSource: func(e *fsm.Event) {
p.IsBackToSource.Store(true) p.IsBackToSource.Store(true)
p.Task.BackToSourcePeers.Add(p.ID) p.Task.BackToSourcePeers.Add(p.ID)

2
scheduler/scheduler/scheduler.go
View File

@ -93,7 +93,7 @@ func (s *scheduler) ScheduleParent(ctx context.Context, peer *resource.Peer, blo
return return
} }
if err := peer.FSM.Event(resource.PeerEventDownloadFromBackToSource); err != nil { if err := peer.FSM.Event(resource.PeerEventDownloadBackToSource); err != nil {
peer.Log.Errorf("peer fsm event failed: %s", err.Error()) peer.Log.Errorf("peer fsm event failed: %s", err.Error())
return return
} }