hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

change record and print trace log config parameter

Browse Source
This commit is contained in:
zh0
2022-03-28 16:35:13 +08:00
committed by LINxiansheng
parent 403f881b89
commit a496e671a7
4 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
deps/oblib/src/lib/oblog/ob_trace_log.h vendored
View File

@ -52,23 +52,23 @@
})
#define NG_TRACE_EXT_TIMES(times, ...) \
if (CHECK_TRACE_TIMES(times, 500, NULL)) { \
if (oceanbase::lib::is_trace_log_enabled() && CHECK_TRACE_TIMES(times, 500, NULL)) { \
NG_TRACE_EXT(__VA_ARGS__); \
}
#define NG_TRACE_TIMES(times, ...) \
if (CHECK_TRACE_TIMES(times, 500, NULL)) { \
if (oceanbase::lib::is_trace_log_enabled() && CHECK_TRACE_TIMES(times, 500, NULL)) { \
NG_TRACE(__VA_ARGS__); \
}
#define NG_TRACE_TIMES_WITH_TRACE_ID(times, tmp_cur_trace_id, ...) \
if (CHECK_TRACE_TIMES(times, 500, tmp_cur_trace_id)) { \
if (oceanbase::lib::is_trace_log_enabled() && CHECK_TRACE_TIMES(times, 500, tmp_cur_trace_id)) { \
NG_TRACE(__VA_ARGS__); \
}
// Ordinary print log level, judged according to the current system configuration level
#define PRINT_TRACE(log_buffer) \
if (OB_TRACE_CONFIG::get_log_level() <= OB_LOGGER.get_log_level()) { \
if (oceanbase::lib::is_trace_log_enabled() && OB_TRACE_CONFIG::get_log_level() <= OB_LOGGER.get_log_level()) { \
if (NULL != log_buffer) { \
::oceanbase::common::OB_PRINT("[TRACE]", OB_LOG_LEVEL_DIRECT(TRACE), "[normal]", "TRACE", log_buffer); \
} \
@ -77,7 +77,7 @@
// For logs that are forced to be printed, you can also judge according to the log level: if it is ERROR level, it will
// not print, and other levels will be forced to print
#define FORCE_PRINT_TRACE(log_buffer, HEAD) \
if (OB_LOGGER.get_log_level() != ObLogger::LogLevel::LOG_ERROR) { \
if (oceanbase::lib::is_trace_log_enabled() && OB_LOGGER.get_log_level() != ObLogger::LogLevel::LOG_ERROR) { \
if (NULL != log_buffer) { \
::oceanbase::common::OB_PRINT("[TRACE]", OB_LOG_LEVEL_DIRECT(TRACE), HEAD, "TRACE", *log_buffer); \
} \

2
src/observer/ob_server_reload_config.cpp
View File

@ -124,7 +124,7 @@ int ObServerReloadConfig::operator()()
}
(void)reload_diagnose_info_config(GCONF.enable_perf_event);
(void)reload_trace_log_config(GCONF.enable_sql_audit);
(void)reload_trace_log_config(GCONF.enable_record_trace_log);
ObTenantManager::get_instance().reload_config();
}

4
src/share/parameter/ob_parameter_seed.ipp
View File

@ -111,8 +111,8 @@ DEF_BOOL(enable_one_phase_commit, OB_CLUSTER_PARAMETER, "False", "enable one pha
ObParameterAttr(Section::OBSERVER, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
DEPRECATED_DEF_BOOL(enable_pg, OB_CLUSTER_PARAMETER, "False", "open partition group",
ObParameterAttr(Section::OBSERVER, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
DEF_BOOL(enable_record_trace_log, OB_CLUSTER_PARAMETER, "False",
"specifies whether to always record the trace log. The default value is False.",
DEF_BOOL(enable_record_trace_log, OB_CLUSTER_PARAMETER, "True",
"specifies whether to always record the trace log. The default value is True.",
ObParameterAttr(Section::OBSERVER, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
DEF_INT(system_trace_level, OB_CLUSTER_PARAMETER, "1", "[0,2]",
"system trace log level, 0:none, 1:standard, 2:debug. "

6
src/storage/transaction/ob_trans_ctx.cpp
View File

@ -357,16 +357,16 @@ int ObTransCtx::set_partition_trans_ctx_mgr(ObPartitionTransCtxMgr* partition_mg
int ObTransCtx::alloc_audit_rec_and_trace_log_(ObTransService* trans_service, ObTransTraceLog*& trace_log)
{
int ret = OB_SUCCESS;
// 1. sql_audit is on. If fail to get recod but revert successfully,
// 1. enable_record_trace_log is on. If fail to get recod but revert successfully,
// it needs to be allocated dynamically. Return error if fail to revert.
// 2. sql_audit is off. Trace log is not required to be recorded
// 2. enable_record_trace_log is off. Trace log is not required to be recorded
bool need_alloc = true;
ObTransTraceLog* tmp_tlog = NULL;
if (OB_ISNULL(trans_service)) {
TRANS_LOG(WARN, "invalid argument", K(trans_service));
ret = OB_INVALID_ARGUMENT;
} else if (!GCONF.enable_sql_audit) {
} else if (!oceanbase::lib::is_trace_log_enabled()) {
need_alloc = false;
ret = OB_SUCCESS;
} else {