apache · morningman · Jan 21, 2021 · Jan 19, 2021
diff --git a/be/src/agent/pusher.cpp b/be/src/agent/pusher.cpp
@@ -134,7 +134,7 @@ AgentStatus Pusher::process(vector<TTabletInfo>* tablet_infos) {
             time_t now = time(NULL);
             if (_push_req.timeout > 0 && _push_req.timeout < now) {
                 // return status to break this callback
-                VLOG(3) << "check time out. time_out:" << _push_req.timeout << ", now:" << now;
+                VLOG_NOTICE << "check time out. time_out:" << _push_req.timeout << ", now:" << now;
                 is_timeout = true;
                 return Status::OK();
             }

diff --git a/be/src/agent/task_worker_pool.cpp b/be/src/agent/task_worker_pool.cpp
@@ -639,7 +639,7 @@ void TaskWorkerPool::_push_worker_thread_callback() {
         }
 
         if (status == DORIS_SUCCESS) {
-            VLOG(3) << "push ok. signature: " << agent_task_req.signature
+            VLOG_NOTICE << "push ok. signature: " << agent_task_req.signature
                     << ", push_type: " << push_req.push_type;
             error_msgs.push_back("push success");
 

diff --git a/be/src/common/logging.h b/be/src/common/logging.h
@@ -62,13 +62,22 @@
 #define VLOG_FILE VLOG(2)
 #define VLOG_ROW VLOG(10)
 #define VLOG_PROGRESS VLOG(2)
+#define VLOG_TRACE VLOG(10)
+#define VLOG_DEBUG VLOG(7)
+#define VLOG_NOTICE VLOG(3)
+#define VLOG_CRITICAL VLOG(1)
+
 
 #define VLOG_CONNECTION_IS_ON VLOG_IS_ON(1)
-#define VLOG_RPC_IS_ON VLOG_IS_ON(2)
+#define VLOG_RPC_IS_ON VLOG_IS_ON(8)
 #define VLOG_QUERY_IS_ON VLOG_IS_ON(1)
 #define VLOG_FILE_IS_ON VLOG_IS_ON(2)
-#define VLOG_ROW_IS_ON VLOG_IS_ON(3)
-#define VLOG_PROGRESS_IS_ON VLOG_IS_ON(2)
+#define VLOG_ROW_IS_ON VLOG_IS_ON(10)
+#define VLOG_TRACE_IS_ON VLOG_IS_ON(10)
+#define VLOG_DEBUG_IS_ON VLOG_IS_ON(7)
+#define VLOG_NOTICE_IS_ON VLOG_IS_ON(3)
+#define VLOG_CRITICAL_IS_ON VLOG_IS_ON(1)
+
 
 /// Define a wrapper around DCHECK for strongly typed enums that print a useful error
 /// message on failure.

diff --git a/be/src/exec/broker_scanner.cpp b/be/src/exec/broker_scanner.cpp
@@ -155,7 +155,7 @@ Status BrokerScanner::open_file_reader() {
     case TFileType::FILE_STREAM: {
         _stream_load_pipe = _state->exec_env()->load_stream_mgr()->get(range.load_id);
         if (_stream_load_pipe == nullptr) {
-            VLOG(3) << "unknown stream load id: " << UniqueId(range.load_id);
+            VLOG_NOTICE << "unknown stream load id: " << UniqueId(range.load_id);
             return Status::InternalError("unknown stream load id");
         }
         _cur_file_reader = _stream_load_pipe.get();

diff --git a/be/src/exec/csv_scan_node.cpp b/be/src/exec/csv_scan_node.cpp
@@ -112,7 +112,7 @@ Status CsvScanNode::init(const TPlanNode& tnode) {
 }
 
 Status CsvScanNode::prepare(RuntimeState* state) {
-    VLOG(1) << "CsvScanNode::Prepare";
+    VLOG_CRITICAL << "CsvScanNode::Prepare";
 
     if (_is_init) {
         return Status::OK();
@@ -206,7 +206,7 @@ Status CsvScanNode::prepare(RuntimeState* state) {
 
 Status CsvScanNode::open(RuntimeState* state) {
     RETURN_IF_ERROR(ExecNode::open(state));
-    VLOG(1) << "CsvScanNode::Open";
+    VLOG_CRITICAL << "CsvScanNode::Open";
 
     if (nullptr == state) {
         return Status::InternalError("input pointer is nullptr.");
@@ -227,7 +227,7 @@ Status CsvScanNode::open(RuntimeState* state) {
 }
 
 Status CsvScanNode::get_next(RuntimeState* state, RowBatch* row_batch, bool* eos) {
-    VLOG(1) << "CsvScanNode::GetNext";
+    VLOG_CRITICAL << "CsvScanNode::GetNext";
     if (nullptr == state || nullptr == row_batch || nullptr == eos) {
         return Status::InternalError("input is nullptr pointer");
     }
@@ -315,7 +315,7 @@ Status CsvScanNode::close(RuntimeState* state) {
     if (is_closed()) {
         return Status::OK();
     }
-    VLOG(1) << "CsvScanNode::Close";
+    VLOG_CRITICAL << "CsvScanNode::Close";
     RETURN_IF_ERROR(exec_debug_action(TExecNodePhase::CLOSE));
 
     SCOPED_TIMER(_runtime_profile->total_time_counter());

diff --git a/be/src/exec/csv_scanner.cpp b/be/src/exec/csv_scanner.cpp
@@ -40,7 +40,7 @@ CsvScanner::~CsvScanner() {
 }
 
 Status CsvScanner::open() {
-    VLOG(1) << "CsvScanner::Connect";
+    VLOG_CRITICAL << "CsvScanner::Connect";
 
     if (_is_open) {
         LOG(INFO) << "this scanner already opened";

diff --git a/be/src/exec/decompressor.cpp b/be/src/exec/decompressor.cpp
@@ -111,7 +111,7 @@ Status GzipDecompressor::decompress(uint8_t* input, size_t input_len, size_t* in
         *input_bytes_read = input_len - _z_strm.avail_in;
         *decompressed_len = output_max_len - _z_strm.avail_out;
 
-        VLOG(10) << "gzip dec ret: " << ret << " input_bytes_read: " << *input_bytes_read
+        VLOG_TRACE << "gzip dec ret: " << ret << " input_bytes_read: " << *input_bytes_read
                  << " decompressed_len: " << *decompressed_len;
 
         if (ret == Z_BUF_ERROR) {

diff --git a/be/src/exec/es/es_scan_reader.cpp b/be/src/exec/es/es_scan_reader.cpp
@@ -111,7 +111,7 @@ Status ESScanReader::open() {
         LOG(WARNING) << ss.str();
         return Status::InternalError(ss.str());
     }
-    VLOG(1) << "open _cached response: " << _cached_response;
+    VLOG_CRITICAL << "open _cached response: " << _cached_response;
     return Status::OK();
 }
 
@@ -153,7 +153,7 @@ Status ESScanReader::get_next(bool* scan_eos, std::unique_ptr<ScrollParser>& scr
     }
 
     scroll_parser.reset(new ScrollParser(_doc_value_mode));
-    VLOG(1) << "get_next request ES, returned response: " << response;
+    VLOG_CRITICAL << "get_next request ES, returned response: " << response;
     Status status = scroll_parser->parse(response, _exactly_once);
     if (!status.ok()) {
         _eos = true;

diff --git a/be/src/exec/es_http_scan_node.cpp b/be/src/exec/es_http_scan_node.cpp
@@ -99,7 +99,7 @@ Status EsHttpScanNode::build_conjuncts_list() {
             _predicates.push_back(predicate);
             _predicate_to_conjunct.push_back(i);
         } else {
-            VLOG(1) << status.get_error_msg();
+            VLOG_CRITICAL << status.get_error_msg();
             status = predicate->get_es_query_status();
             if (!status.ok()) {
                 LOG(WARNING) << status.get_error_msg();

diff --git a/be/src/exec/es_scan_node.cpp b/be/src/exec/es_scan_node.cpp
@@ -60,7 +60,7 @@ EsScanNode::EsScanNode(ObjectPool* pool, const TPlanNode& tnode, const Descripto
 EsScanNode::~EsScanNode() {}
 
 Status EsScanNode::prepare(RuntimeState* state) {
-    VLOG(1) << "EsScanNode::Prepare";
+    VLOG_CRITICAL << "EsScanNode::Prepare";
 
     RETURN_IF_ERROR(ScanNode::prepare(state));
     _tuple_desc = state->desc_tbl().get_tuple_descriptor(_tuple_id);
@@ -76,7 +76,7 @@ Status EsScanNode::prepare(RuntimeState* state) {
 }
 
 Status EsScanNode::open(RuntimeState* state) {
-    VLOG(1) << "EsScanNode::Open";
+    VLOG_CRITICAL << "EsScanNode::Open";
 
     RETURN_IF_ERROR(exec_debug_action(TExecNodePhase::OPEN));
     RETURN_IF_CANCELLED(state);
@@ -99,7 +99,7 @@ Status EsScanNode::open(RuntimeState* state) {
     std::vector<vector<TExtPredicate>> predicates;
     std::vector<int> predicate_to_conjunct;
     for (int i = 0; i < _conjunct_ctxs.size(); ++i) {
-        VLOG(1) << "conjunct: " << _conjunct_ctxs[i]->root()->debug_string();
+        VLOG_CRITICAL << "conjunct: " << _conjunct_ctxs[i]->root()->debug_string();
         std::vector<TExtPredicate> disjuncts;
         if (get_disjuncts(_conjunct_ctxs[i], _conjunct_ctxs[i]->root(), disjuncts)) {
             predicates.emplace_back(std::move(disjuncts));
@@ -196,7 +196,7 @@ Status EsScanNode::open(RuntimeState* state) {
 }
 
 Status EsScanNode::get_next(RuntimeState* state, RowBatch* row_batch, bool* eos) {
-    VLOG(1) << "EsScanNode::GetNext";
+    VLOG_CRITICAL << "EsScanNode::GetNext";
 
     RETURN_IF_ERROR(exec_debug_action(TExecNodePhase::GETNEXT));
     RETURN_IF_CANCELLED(state);
@@ -216,7 +216,7 @@ Status EsScanNode::get_next(RuntimeState* state, RowBatch* row_batch, bool* eos)
     _offsets[_scan_range_idx] += result.rows.num_rows;
 
     // convert
-    VLOG(1) << "begin to convert: scan_range_idx=" << _scan_range_idx
+    VLOG_CRITICAL << "begin to convert: scan_range_idx=" << _scan_range_idx
             << ", num_rows=" << result.rows.num_rows;
     std::vector<TExtColumnData>& cols = result.rows.cols;
     // indexes of the next non-null value in the row batch, per column.
@@ -237,10 +237,10 @@ Status EsScanNode::get_next(RuntimeState* state, RowBatch* row_batch, bool* eos)
         }
     }
 
-    VLOG(1) << "finish one batch: num_rows=" << row_batch->num_rows();
+    VLOG_CRITICAL << "finish one batch: num_rows=" << row_batch->num_rows();
     COUNTER_SET(_rows_returned_counter, _num_rows_returned);
     if (result.__isset.eos && result.eos) {
-        VLOG(1) << "es finish one scan_range: scan_range_idx=" << _scan_range_idx;
+        VLOG_CRITICAL << "es finish one scan_range: scan_range_idx=" << _scan_range_idx;
         ++_scan_range_idx;
     }
     if (_scan_range_idx == _scan_ranges.size()) {
@@ -252,7 +252,7 @@ Status EsScanNode::get_next(RuntimeState* state, RowBatch* row_batch, bool* eos)
 
 Status EsScanNode::close(RuntimeState* state) {
     if (is_closed()) return Status::OK();
-    VLOG(1) << "EsScanNode::Close";
+    VLOG_CRITICAL << "EsScanNode::Close";
     RETURN_IF_ERROR(exec_debug_action(TExecNodePhase::CLOSE));
     SCOPED_TIMER(_runtime_profile->total_time_counter());
     Expr::close(_pushdown_conjunct_ctxs, state);
@@ -275,7 +275,7 @@ Status EsScanNode::close(RuntimeState* state) {
             }
 
             try {
-                VLOG(1) << "es close param=" << apache::thrift::ThriftDebugString(params);
+                VLOG_CRITICAL << "es close param=" << apache::thrift::ThriftDebugString(params);
                 client->close(result, params);
             } catch (apache::thrift::transport::TTransportException& e) {
                 LOG(WARNING) << "es close retrying, because: " << e.what();
@@ -289,7 +289,7 @@ Status EsScanNode::close(RuntimeState* state) {
             return Status::ThriftRpcError(ss.str());
         }
 
-        VLOG(1) << "es close result=" << apache::thrift::ThriftDebugString(result);
+        VLOG_CRITICAL << "es close result=" << apache::thrift::ThriftDebugString(result);
         Status status(result.status);
         if (!status.ok()) {
             LOG(WARNING) << "es close error: : scan_range_idx=" << i
@@ -329,7 +329,7 @@ Status EsScanNode::set_scan_ranges(const std::vector<TScanRangeParams>& scan_ran
 
 Status EsScanNode::open_es(TNetworkAddress& address, TExtOpenResult& result,
                            TExtOpenParams& params) {
-    VLOG(1) << "es open param=" << apache::thrift::ThriftDebugString(params);
+    VLOG_CRITICAL << "es open param=" << apache::thrift::ThriftDebugString(params);
 #ifndef BE_TEST
     try {
         ExtDataSourceServiceClientCache* client_cache = _env->extdatasource_client_cache();
@@ -349,7 +349,7 @@ Status EsScanNode::open_es(TNetworkAddress& address, TExtOpenResult& result,
             RETURN_IF_ERROR(client.reopen());
             client->open(result, params);
         }
-        VLOG(1) << "es open result=" << apache::thrift::ThriftDebugString(result);
+        VLOG_CRITICAL << "es open result=" << apache::thrift::ThriftDebugString(result);
         return Status(result.status);
     } catch (apache::thrift::TException& e) {
         std::stringstream ss;
@@ -393,7 +393,7 @@ bool EsScanNode::get_disjuncts(ExprContext* context, Expr* conjunct,
                                std::vector<TExtPredicate>& disjuncts) {
     if (TExprNodeType::BINARY_PRED == conjunct->node_type()) {
         if (conjunct->children().size() != 2) {
-            VLOG(1) << "get disjuncts fail: number of children is not 2";
+            VLOG_CRITICAL << "get disjuncts fail: number of children is not 2";
             return false;
         }
         SlotRef* slotRef;
@@ -408,19 +408,19 @@ bool EsScanNode::get_disjuncts(ExprContext* context, Expr* conjunct,
             slotRef = (SlotRef*)(conjunct->get_child(1));
             op = conjunct->op();
         } else {
-            VLOG(1) << "get disjuncts fail: no SLOT_REF child";
+            VLOG_CRITICAL << "get disjuncts fail: no SLOT_REF child";
             return false;
         }
 
         SlotDescriptor* slot_desc = get_slot_desc(slotRef);
         if (slot_desc == nullptr) {
-            VLOG(1) << "get disjuncts fail: slot_desc is null";
+            VLOG_CRITICAL << "get disjuncts fail: slot_desc is null";
             return false;
         }
 
         TExtLiteral literal;
         if (!to_ext_literal(context, expr, &literal)) {
-            VLOG(1) << "get disjuncts fail: can't get literal, node_type=" << expr->node_type();
+            VLOG_CRITICAL << "get disjuncts fail: can't get literal, node_type=" << expr->node_type();
             return false;
         }
 
@@ -445,7 +445,7 @@ bool EsScanNode::get_disjuncts(ExprContext* context, Expr* conjunct,
 
         TExtLiteral literal;
         if (!to_ext_literal(context, conjunct->get_child(1), &literal)) {
-            VLOG(1) << "get disjuncts fail: can't get literal, node_type="
+            VLOG_CRITICAL << "get disjuncts fail: can't get literal, node_type="
                     << conjunct->get_child(1)->node_type();
             return false;
         }
@@ -496,7 +496,7 @@ bool EsScanNode::get_disjuncts(ExprContext* context, Expr* conjunct,
             TExtLiteral literal;
             if (!to_ext_literal(slot_desc->type().type, const_cast<void*>(iter->get_value()),
                                 &literal)) {
-                VLOG(1) << "get disjuncts fail: can't get literal, node_type="
+                VLOG_CRITICAL << "get disjuncts fail: can't get literal, node_type="
                         << slot_desc->type().type;
                 return false;
             }
@@ -511,7 +511,7 @@ bool EsScanNode::get_disjuncts(ExprContext* context, Expr* conjunct,
         return true;
     } else if (TExprNodeType::COMPOUND_PRED == conjunct->node_type()) {
         if (TExprOpcode::COMPOUND_OR != conjunct->op()) {
-            VLOG(1) << "get disjuncts fail: op is not COMPOUND_OR";
+            VLOG_CRITICAL << "get disjuncts fail: op is not COMPOUND_OR";
             return false;
         }
         if (!get_disjuncts(context, conjunct->get_child(0), disjuncts)) {
@@ -522,7 +522,7 @@ bool EsScanNode::get_disjuncts(ExprContext* context, Expr* conjunct,
         }
         return true;
     } else {
-        VLOG(1) << "get disjuncts fail: node type is " << conjunct->node_type()
+        VLOG_CRITICAL << "get disjuncts fail: node type is " << conjunct->node_type()
                 << ", should be BINARY_PRED or COMPOUND_PRED";
         return false;
     }
@@ -688,7 +688,7 @@ Status EsScanNode::get_next_from_es(TExtGetNextResult& result) {
         }
 
         try {
-            VLOG(1) << "es get_next param=" << apache::thrift::ThriftDebugString(params);
+            VLOG_CRITICAL << "es get_next param=" << apache::thrift::ThriftDebugString(params);
             client->getNext(result, params);
         } catch (apache::thrift::transport::TTransportException& e) {
             std::stringstream ss;
@@ -725,7 +725,7 @@ Status EsScanNode::get_next_from_es(TExtGetNextResult& result) {
 #endif
 
     // check result
-    VLOG(1) << "es get_next result=" << apache::thrift::ThriftDebugString(result);
+    VLOG_CRITICAL << "es get_next result=" << apache::thrift::ThriftDebugString(result);
     Status get_next_status(result.status);
     if (!get_next_status.ok()) {
         LOG(WARNING) << "es get_next error: scan_range_idx=" << _scan_range_idx

diff --git a/be/src/exec/exec_node.cpp b/be/src/exec/exec_node.cpp
@@ -330,7 +330,7 @@ Status ExecNode::create_node(RuntimeState* state, ObjectPool* pool, const TPlanN
                              const DescriptorTbl& descs, ExecNode** node) {
     std::stringstream error_msg;
 
-    VLOG(2) << "tnode:\n" << apache::thrift::ThriftDebugString(tnode);
+    VLOG_CRITICAL << "tnode:\n" << apache::thrift::ThriftDebugString(tnode);
     switch (tnode.node_type) {
     case TPlanNodeType::CSV_SCAN_NODE:
         *node = pool->add(new CsvScanNode(pool, tnode, descs));

diff --git a/be/src/exec/json_scanner.cpp b/be/src/exec/json_scanner.cpp
@@ -122,7 +122,7 @@ Status JsonScanner::open_next_reader() {
     case TFileType::FILE_STREAM: {
         _stream_load_pipe = _state->exec_env()->load_stream_mgr()->get(range.load_id);
         if (_stream_load_pipe == nullptr) {
-            VLOG(3) << "unknown stream load id: " << UniqueId(range.load_id);
+            VLOG_NOTICE << "unknown stream load id: " << UniqueId(range.load_id);
             return Status::InternalError("unknown stream load id");
         }
         file = _stream_load_pipe.get();

diff --git a/be/src/exec/mysql_scan_node.cpp b/be/src/exec/mysql_scan_node.cpp
@@ -41,7 +41,7 @@ MysqlScanNode::MysqlScanNode(ObjectPool* pool, const TPlanNode& tnode, const Des
 MysqlScanNode::~MysqlScanNode() {}
 
 Status MysqlScanNode::prepare(RuntimeState* state) {
-    VLOG(1) << "MysqlScanNode::Prepare";
+    VLOG_CRITICAL << "MysqlScanNode::Prepare";
 
     if (_is_init) {
         return Status::OK();
@@ -99,7 +99,7 @@ Status MysqlScanNode::prepare(RuntimeState* state) {
 
 Status MysqlScanNode::open(RuntimeState* state) {
     RETURN_IF_ERROR(ExecNode::open(state));
-    VLOG(1) << "MysqlScanNode::Open";
+    VLOG_CRITICAL << "MysqlScanNode::Open";
 
     if (NULL == state) {
         return Status::InternalError("input pointer is NULL.");
@@ -144,7 +144,7 @@ Status MysqlScanNode::write_text_slot(char* value, int value_length, SlotDescrip
 }
 
 Status MysqlScanNode::get_next(RuntimeState* state, RowBatch* row_batch, bool* eos) {
-    VLOG(1) << "MysqlScanNode::GetNext";
+    VLOG_CRITICAL << "MysqlScanNode::GetNext";
 
     if (NULL == state || NULL == row_batch || NULL == eos) {
         return Status::InternalError("input is NULL pointer");

diff --git a/be/src/exec/mysql_scanner.cpp b/be/src/exec/mysql_scanner.cpp
@@ -51,7 +51,7 @@ Status MysqlScanner::open() {
         return Status::InternalError("mysql init failed.");
     }
 
-    VLOG(1) << "MysqlScanner::Connect";
+    VLOG_CRITICAL << "MysqlScanner::Connect";
 
     if (NULL == mysql_real_connect(_my_conn, _my_param.host.c_str(), _my_param.user.c_str(),
                                    _my_param.passwd.c_str(), _my_param.db.c_str(),