From 02543c781d1904670ffedebdd9dd339f9c5171dd Mon Sep 17 00:00:00 2001 From: Gaius Date: Mon, 14 Nov 2022 21:01:36 +0800 Subject: [PATCH] feat: optimize scope size is error (#1831) Signed-off-by: Gaius --- scheduler/service/service.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/scheduler/service/service.go b/scheduler/service/service.go index a7cbacd8b..aecfb4ffa 100644 --- a/scheduler/service/service.go +++ b/scheduler/service/service.go @@ -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. peer.NeedBackToSource.Store(needBackToSource) - sizeScope, err := task.SizeScope() - if err != nil || !task.FSM.Is(resource.TaskStateSucceeded) { - peer.Log.Infof("task can not be reused directly, because of task state is %s and %#v", - task.FSM.Current(), err) + if !task.FSM.Is(resource.TaskStateSucceeded) { + peer.Log.Infof("task can not be reused directly, because of task state is %s", + task.FSM.Current()) + result, err := s.registerNormalTask(ctx, peer) if err != nil { peer.Log.Error(err) @@ -104,6 +104,12 @@ func (s *Service) RegisterPeerTask(ctx context.Context, req *schedulerv1.PeerTas 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. peer.Log.Info("task can be reused directly") switch sizeScope {