[branch-1.1-lts](hot) Fix old mem tracker cancel (#13248)

apache · Oct 10, 2022 · 579c609 · 579c609
1 parent 5d3bc77
commit 579c609
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/be/src/runtime/mem_tracker.h b/be/src/runtime/mem_tracker.h
@@ -186,7 +186,7 @@ class MemTracker : public std::enable_shared_from_this<MemTracker> {
         for (i = all_trackers_.size() - 1; i >= 0; --i) {
             MemTracker* tracker = all_trackers_[i];
             const int64_t limit = tracker->GetLimit(mode);
-            if (limit < 0 || !config::enable_cancel_query) {
+            if (limit < 0) {
                 tracker->consumption_->add(bytes); // No limit at this tracker.
             } else {
                 // If TryConsume fails, we can try to GC, but we may need to try several times if
@@ -262,7 +262,7 @@ class MemTracker : public std::enable_shared_from_this<MemTracker> {
     /// exceeded.
     bool AnyLimitExceeded(MemLimit mode) {
         for (const auto& tracker : limit_trackers_) {
-            if (tracker->LimitExceeded(mode) && config::enable_cancel_query) {
+            if (tracker->LimitExceeded(mode)) {
                 return true;
             }
         }
@@ -281,7 +281,7 @@ class MemTracker : public std::enable_shared_from_this<MemTracker> {
     // Return limit exceeded tracker or null
     MemTracker* find_limit_exceeded_tracker() {
         for (const auto& tracker : limit_trackers_) {
-            if (tracker->limit_exceeded() && config::enable_cancel_query) {
+            if (tracker->limit_exceeded()) {
                 return tracker;
             }
         }
@@ -298,7 +298,7 @@ class MemTracker : public std::enable_shared_from_this<MemTracker> {
     void RefreshConsumptionFromMetric();
 
     // TODO(yingchun): following functions are old style which have no MemLimit parameter
-    bool limit_exceeded() const { return limit_ >= 0 && limit_ < consumption() && config::enable_cancel_query; }
+    bool limit_exceeded() const { return limit_ >= 0 && limit_ < consumption(); }
 
     int64_t limit() const { return limit_; }
     bool has_limit() const { return limit_ >= 0; }
@@ -396,7 +396,7 @@ class MemTracker : public std::enable_shared_from_this<MemTracker> {
 
     static bool limit_exceeded(const std::vector<std::shared_ptr<MemTracker>>& trackers) {
         for (const auto& tracker : trackers) {
-            if (tracker->limit_exceeded() && config::enable_cancel_query) {
+            if (tracker->limit_exceeded()) {
                 // TODO: remove logging
                 LOG(WARNING) << "exceeded limit: limit=" << tracker->limit()
                              << " consumption=" << tracker->consumption();