[doris] branch branch-1.2-lts updated: [branch-1.2](revert) revert 21282 #21352

[mo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-1.2-lts by this push:
     new 046dc17ece [branch-1.2](revert) revert 21282 #21352
046dc17ece is described below

commit 046dc17ece521d5d1bfcc8bdd3849c62ac1cecbe
Author: Xinyi Zou <zo...@gmail.com>
AuthorDate: Thu Jun 29 22:52:38 2023 +0800

    [branch-1.2](revert) revert 21282 #21352
    
    Should find out why metrics to promethues use more memory, not prohibit
---
 be/src/http/action/metrics_action.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/be/src/http/action/metrics_action.cpp b/be/src/http/action/metrics_action.cpp
index 832f2570d0..f2bd8b43cb 100644
--- a/be/src/http/action/metrics_action.cpp
+++ b/be/src/http/action/metrics_action.cpp
@@ -29,7 +29,6 @@
 #include "http/http_request.h"
 #include "http/http_response.h"
 #include "runtime/exec_env.h"
-#include "util/mem_info.h"
 #include "util/metrics.h"
 
 namespace doris {
@@ -38,9 +37,7 @@ void MetricsAction::handle(HttpRequest* req) {
     const std::string& type = req->param("type");
     const std::string& with_tablet = req->param("with_tablet");
     std::string str;
-    if (MemInfo::is_exceed_soft_mem_limit(GB_EXCHANGE_BYTE)) {
-        str = "";
-    } else if (type == "core") {
+    if (type == "core") {
         str = _metric_registry->to_core_string();
     } else if (type == "json") {
         str = _metric_registry->to_json(with_tablet == "true");


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org