From c0da4cc524773af25613ea1b4cd51b9eb813edcc Mon Sep 17 00:00:00 2001
From: Zexi Li <zexi.li@qq.com>
Date: Wed, 25 Nov 2020 21:48:22 +0800
Subject: [PATCH] fix(scheduler): clean expire cache before schedule

---
 .../algorithm/predicates/disk_schedtag_predicate.go          | 5 +++--
 pkg/scheduler/manager/manager.go                             | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkg/scheduler/algorithm/predicates/disk_schedtag_predicate.go b/pkg/scheduler/algorithm/predicates/disk_schedtag_predicate.go
index dc19b2183c..23aef8c06e 100644
--- a/pkg/scheduler/algorithm/predicates/disk_schedtag_predicate.go
+++ b/pkg/scheduler/algorithm/predicates/disk_schedtag_predicate.go
@@ -168,6 +168,7 @@ func (p *DiskSchedtagPredicate) DoSelect(
 	res []ISchedtagCandidateResource,
 ) []ISchedtagCandidateResource {
 	return p.GetUsedStorages(res, input.(*diskW).Backend)
+
 }
 
 func (p *DiskSchedtagPredicate) GetCandidateResourceSortScore(selectRes ISchedtagCandidateResource) int64 {
@@ -207,8 +208,8 @@ func (p *DiskSchedtagPredicate) GetUsedStorages(res []ISchedtagCandidateResource
 	} else {
 		backendStorages = storages
 	}
-	if len(backendStorages) == 0 {
+	/*if len(backendStorages) == 0 {
 		backendStorages = storages
-	}
+	}*/
 	return backendStorages
 }
diff --git a/pkg/scheduler/manager/manager.go b/pkg/scheduler/manager/manager.go
index 370c3360ad..17e5e13658 100644
--- a/pkg/scheduler/manager/manager.go
+++ b/pkg/scheduler/manager/manager.go
@@ -97,6 +97,9 @@ func (sm *SchedulerManager) start() {
 }
 
 func (sm *SchedulerManager) schedule(info *api.SchedInfo) (*core.ScheduleResult, error) {
+	// force sync clean expire cache before do schedule
+	sm.ExpireManager.Trigger()
+
 	log.V(10).Infof("SchedulerManager do schedule, input: %#v", info)
 	task, err := sm.TaskManager.AddTask(sm, info)
 	if err != nil {