scheduler: fix inaccurate statistics and config (#3949) (#3964)

* scheduler: simplify pending influence (#3658) Signed-off-by: HunDunDM <hundundm@gmail.com> * schedulers: unify the use and GC of hot-region's pendings and regionPendings (#3921) Signed-off-by: HunDunDM <hundundm@gmail.com> * scheduler: remove the useless code in hot-region-scheduler (#3833) Signed-off-by: HunDunDM <hundundm@gmail.com> * scheduler: fix inaccurate statistics and config (#3949) Signed-off-by: HunDunDM <hundundm@gmail.com> * tiny fix Signed-off-by: HunDunDM <hundundm@gmail.com> * tiny fix Signed-off-by: HunDunDM <hundundm@gmail.com> Co-authored-by: HunDunDM <hundundm@gmail.com>
tikv · Sep 1, 2021 · b1adc27 · b1adc27
1 parent 7f6d57e
commit b1adc27
Show file tree

Hide file tree

Showing 5 changed files with 173 additions and 163 deletions.
diff --git a/server/schedule/operator/operator.go b/server/schedule/operator/operator.go
@@ -140,6 +140,18 @@ func (o *Operator) Status() OpStatus {
 	return o.status.Status()
 }
 
+// CheckAndGetStatus returns operator status after `CheckExpired` and `CheckTimeout`.
+func (o *Operator) CheckAndGetStatus() OpStatus {
+	switch {
+	case o.CheckExpired():
+		return EXPIRED
+	case o.CheckTimeout():
+		return TIMEOUT
+	default:
+		return o.Status()
+	}
+}
+
 // GetReachTimeOf returns the time when operator reaches the given status.
 func (o *Operator) GetReachTimeOf(st OpStatus) time.Time {
 	return o.status.ReachTimeOf(st)