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

feat: optimize scope size is error (#1831) 

Signed-off-by: Gaius <gaius.qi@gmail.com>
This commit is contained in:
Gaius 2022-11-14 21:01:36 +08:00
parent 0f8b75808a
commit 02543c781d
No known key found for this signature in database
GPG Key ID: 8B4E5D1290FA2FFB
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scheduler/service/service.go
View File

@ -91,10 +91,10 @@ func (s *Service) RegisterPeerTask(ctx context.Context, req *schedulerv1.PeerTas
// does not have a seed peer, it will back-to-source. // does not have a seed peer, it will back-to-source.
peer.NeedBackToSource.Store(needBackToSource) peer.NeedBackToSource.Store(needBackToSource)
sizeScope, err := task.SizeScope() if !task.FSM.Is(resource.TaskStateSucceeded) {
if err != nil || !task.FSM.Is(resource.TaskStateSucceeded) { peer.Log.Infof("task can not be reused directly, because of task state is %s",
peer.Log.Infof("task can not be reused directly, because of task state is %s and %#v", task.FSM.Current())
task.FSM.Current(), err)
result, err := s.registerNormalTask(ctx, peer) result, err := s.registerNormalTask(ctx, peer)
if err != nil { if err != nil {
peer.Log.Error(err) peer.Log.Error(err)
@ -104,6 +104,12 @@ func (s *Service) RegisterPeerTask(ctx context.Context, req *schedulerv1.PeerTas
return result, nil return result, nil
} }
// If SizeScope is invalid, then register as SizeScope_NORMAL.
sizeScope, err := task.SizeScope()
if err != nil {
peer.Log.Warnf("scope size is invalid: %s", err.Error())
}
// The task state is TaskStateSucceeded and SizeScope is not invalid. // The task state is TaskStateSucceeded and SizeScope is not invalid.
peer.Log.Info("task can be reused directly") peer.Log.Info("task can be reused directly")
switch sizeScope { switch sizeScope {