remove the use of trace mode except pl

This commit is contained in:
obdev
2023-08-07 04:12:30 +00:00
committed by ob-robot
parent f6de91c495
commit e112ed684d
5 changed files with 5 additions and 19 deletions

View File

@ -468,6 +468,8 @@ void ObLogger::print_trace_buffer(const char* mod_name,
} }
} }
const char *const ObLogger::errstr_[] = {"ERROR", "WARN", "INFO", "EDIAG", "WDIAG", "TRACE", "DEBUG"}; const char *const ObLogger::errstr_[] = {"ERROR", "WARN", "INFO", "EDIAG", "WDIAG", "TRACE", "DEBUG"};
ObLogger::ObLogger() ObLogger::ObLogger()

View File

@ -318,20 +318,6 @@ LOG_MOD_END(PL)
#define CANCLE_OB_LOG_TRACE_MODE() OB_LOGGER.set_trace_mode(false) #define CANCLE_OB_LOG_TRACE_MODE() OB_LOGGER.set_trace_mode(false)
#define PRINT_OB_LOG_TRACE_BUF(mod_name, level) \ #define PRINT_OB_LOG_TRACE_BUF(mod_name, level) \
(OB_LOG_NEED_TO_PRINT(level) ? OB_LOGGER.print_trace_buffer("["#mod_name"] ", OB_LOG_LEVEL_DIRECT_NO_ERRCODE(level)) : (void) 0) (OB_LOG_NEED_TO_PRINT(level) ? OB_LOGGER.print_trace_buffer("["#mod_name"] ", OB_LOG_LEVEL_DIRECT_NO_ERRCODE(level)) : (void) 0)
#define PRINT_WITH_TRACE_MODE(mod_name, level, body) \
{ \
bool need_cancle_trace_mode = false; \
if (!IS_OB_LOG_TRACE_MODE()) { \
need_cancle_trace_mode = true; \
} \
SET_OB_LOG_TRACE_MODE(); \
PRINT_OB_LOG_TRACE_BUF(COMMON, INFO); \
body; \
PRINT_OB_LOG_TRACE_BUF(mod_name, level); \
if (need_cancle_trace_mode) { \
CANCLE_OB_LOG_TRACE_MODE(); \
} \
}
//for tests/ob_log_test or others //for tests/ob_log_test or others
#define OB_LOG_MOD_NEED_TO_PRINT(parMod, level) \ #define OB_LOG_MOD_NEED_TO_PRINT(parMod, level) \

View File

@ -113,7 +113,7 @@ void flush_trace()
span = next; span = next;
} }
}; };
PRINT_WITH_TRACE_MODE(FLT, INFO, func()); func();
trace.offset_ = trace.buffer_size_ / 2; trace.offset_ = trace.buffer_size_ / 2;
} }
} }

View File

@ -236,9 +236,7 @@ namespace sql
LOG_WARN("failed to deserialize full link trace extra info", LOG_WARN("failed to deserialize full link trace extra info",
KP(buf), K(ret), K(pos), K(v_len)); KP(buf), K(ret), K(pos), K(v_len));
} else { } else {
PRINT_WITH_TRACE_MODE(FLT, INFO, [&] {
_FLT_LOG(INFO, "%s", drv_span.span_info_.ptr()); _FLT_LOG(INFO, "%s", drv_span.span_info_.ptr());
}());
} }
break; break;
} }

View File

@ -29,7 +29,7 @@ void ObPrintTenantMemoryUsage::runTimerTask()
{ {
LOG_INFO("=== Run print tenant memory usage task ==="); LOG_INFO("=== Run print tenant memory usage task ===");
ObTenantMemoryPrinter &printer = ObTenantMemoryPrinter::get_instance(); ObTenantMemoryPrinter &printer = ObTenantMemoryPrinter::get_instance();
PRINT_WITH_TRACE_MODE(LIB, INFO, printer.print_tenant_usage()); printer.print_tenant_usage();
} }
ObTenantMemoryPrinter &ObTenantMemoryPrinter::get_instance() ObTenantMemoryPrinter &ObTenantMemoryPrinter::get_instance()