From 6db04e8f680b8852d28a11b9477903923e625db1 Mon Sep 17 00:00:00 2001 From: bufferflies <1045931706@qq.com> Date: Tue, 12 Oct 2021 11:43:33 +0800 Subject: [PATCH] resolv conflict Signed-off-by: bufferflies <1045931706@qq.com> --- server/cluster/coordinator.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/server/cluster/coordinator.go b/server/cluster/coordinator.go index e4ddeb08774..4fe6af422de 100644 --- a/server/cluster/coordinator.go +++ b/server/cluster/coordinator.go @@ -775,16 +775,12 @@ func (s *scheduleController) Stop() { func (s *scheduleController) Schedule() []*operator.Operator { for i := 0; i < maxScheduleRetries; i++ { -<<<<<<< HEAD -======= // no need to retry if schedule should stop to speed exit select { case <-s.ctx.Done(): return nil default: } - cacheCluster := opt.NewCacheCluster(s.cluster) ->>>>>>> 49ba6b161 (cluster: speed scheduler exit (#4148)) // If we have schedule, reset interval to the minimal interval. if op := s.Scheduler.Schedule(s.cluster); op != nil { s.nextInterval = s.Scheduler.GetMinInterval()