fix active_set bug in min tso scheduler (#7693) (#7709)

ti-chi-bot · web-flow · commit 8765fe90208b · 2023-06-28T03:01:06.000Z
close #7692
diff --git a/dbms/src/Flash/Mpp/MinTSOScheduler.cpp b/dbms/src/Flash/Mpp/MinTSOScheduler.cpp
@@ -186,7 +186,7 @@ bool MinTSOScheduler::scheduleImp(const UInt64 tso, const MPPQueryTaskSetPtr & q
 {
     auto needed_threads = task->getNeededThreads();
     auto check_for_new_min_tso = tso <= min_tso && estimated_thread_usage + needed_threads <= thread_hard_limit;
-    auto check_for_not_min_tso = (active_set.size() < active_set_soft_limit || tso <= *active_set.rbegin()) && (estimated_thread_usage + needed_threads <= thread_soft_limit);
+    auto check_for_not_min_tso = (active_set.size() < active_set_soft_limit || active_set.find(tso) != active_set.end()) && (estimated_thread_usage + needed_threads <= thread_soft_limit);
     if (check_for_new_min_tso || check_for_not_min_tso)
     {
         updateMinTSO(tso, false, isWaiting ? "from the waiting set" : "when directly schedule it");

Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ bool MinTSOScheduler::scheduleImp(const UInt64 tso, const MPPQueryTaskSetPtr & q`
`186`	`186`	`{`
`187`	`187`	`auto needed_threads = task->getNeededThreads();`
`188`	`188`	`auto check_for_new_min_tso = tso <= min_tso && estimated_thread_usage + needed_threads <= thread_hard_limit;`
`189`		`- auto check_for_not_min_tso = (active_set.size() < active_set_soft_limit \|\| tso <= *active_set.rbegin()) && (estimated_thread_usage + needed_threads <= thread_soft_limit);`
	`189`	`+ auto check_for_not_min_tso = (active_set.size() < active_set_soft_limit \|\| active_set.find(tso) != active_set.end()) && (estimated_thread_usage + needed_threads <= thread_soft_limit);`
`190`	`190`	`if (check_for_new_min_tso \|\| check_for_not_min_tso)`
`191`	`191`	`{`
`192`	`192`	`updateMinTSO(tso, false, isWaiting ? "from the waiting set" : "when directly schedule it");`