Skip to content

Commit 7409ebc

Browse files
obdevgaopy3
authored andcommitted
Revert set log level to DBA WARN
Co-authored-by: gaopy3 <gao.panyu@qq.com>
1 parent abeb6ca commit 7409ebc

File tree

8 files changed

+8
-11
lines changed

8 files changed

+8
-11
lines changed

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ function build_package
157157
{
158158
STATIC_LINK_LGPL_DEPS_OPTION=ON
159159
ENABLE_BOLT_OPTION=OFF
160-
do_build "$@" -DOB_BUILD_PACKAGE=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOB_USE_LLD=$LLD_OPTION -DENABLE_FATAL_ERROR_HANG=OFF -DENABLE_AUTO_FDO=ON -DENABLE_THIN_LTO=ON -DENABLE_HOTFUNC=ON -DENABLE_BOLT=$ENABLE_BOLT_OPTION -DOB_STATIC_LINK_LGPL_DEPS=$STATIC_LINK_LGPL_DEPS_OPTION -DDEFAULT_LOG_LEVEL=OB_LOG_LEVEL_DBA_WARN
160+
do_build "$@" -DOB_BUILD_PACKAGE=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOB_USE_LLD=$LLD_OPTION -DENABLE_FATAL_ERROR_HANG=OFF -DENABLE_AUTO_FDO=ON -DENABLE_THIN_LTO=ON -DENABLE_HOTFUNC=ON -DENABLE_BOLT=$ENABLE_BOLT_OPTION -DOB_STATIC_LINK_LGPL_DEPS=$STATIC_LINK_LGPL_DEPS_OPTION
161161
}
162162

163163
# build - configurate project and prepare to compile, by calling make

cmake/Env.cmake

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ ob_define(OB_CC "")
2929
ob_define(OB_CXX "")
3030
ob_define(OB_BUILD_STANDALONE OFF)
3131
ob_define(OB_BUILD_LITE ON)
32-
ob_define(DEFAULT_LOG_LEVEL OB_LOG_LEVEL_WARN)
3332

3433
# 'ENABLE_PERF_MODE' use for offline system insight performance test
3534
# PERF_MODE macro controls many special code path in system
@@ -167,8 +166,6 @@ if(BUILD_EMBED_MODE)
167166
add_definitions(-DOB_BUILD_EMBED_MODE)
168167
endif()
169168

170-
add_definitions(-DDEFAULT_LOG_LEVEL=${DEFAULT_LOG_LEVEL})
171-
172169
set(OB_OBJCOPY_BIN "${DEVTOOLS_DIR}/bin/objcopy")
173170

174171
# NO RELERO: -Wl,-znorelro

deps/oblib/src/lib/oblog/ob_log.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,7 @@ void ObLogger::print_trace_buffer(const char* mod_name,
469469

470470

471471

472+
const char *const ObLogger::errstr_[] = {"ERROR", "WARN", "INFO", "EDIAG", "WDIAG", "TRACE", "DEBUG"};
472473

473474
ObLogger::ObLogger()
474475
: ObBaseLogWriter(), log_file_(), max_file_size_(DEFAULT_MAX_FILE_SIZE), max_file_index_(0),

deps/oblib/src/lib/oblog/ob_log.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,6 @@ class ObLogger : public ObBaseLogWriter
631631
int32_t get_log_level(const uint64_t par_mod_id) const;
632632
int32_t get_log_level(const uint64_t par_mod_id, const uint64_t sub_mod_id) const;
633633
inline const char *get_level_str() const { return errstr_[id_level_map_.get_level()]; }
634-
static constexpr const char *get_level_str(const int8_t level) { return errstr_[level]; }
635634

636635
void disable_thread_log_level() { disable_thread_log_level_ = true; }
637636

@@ -791,7 +790,7 @@ class ObLogger : public ObBaseLogWriter
791790
void drop_log_items(ObIBaseLogItem **items, const int64_t item_cnt) override;
792791
void unlink_if_need(const char *file);
793792
private:
794-
static constexpr const char *const errstr_[] = {"ERROR", "WARN", "INFO", "EDIAG", "WDIAG", "TRACE", "DEBUG"};
793+
static const char *const errstr_[];
795794
// default log rate limiter if there's no tl_log_limiger
796795
static ::oceanbase::lib::ObRateLimiter *default_log_limiter_;
797796
RLOCAL_STATIC(lib::ObRateLimiter*, tl_log_limiter_);

src/observer/embed/python/ob_embed_impl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ int ObLiteEmbed::do_open_(const char* db_dir, int64_t port)
220220
MPRINT("db %s opened by other process", db_dir);
221221
} else if (FALSE_IT(pid_locked = true)) {
222222
} else {
223-
OB_LOGGER.set_log_level(DEFAULT_LOG_LEVEL);
223+
OB_LOGGER.set_log_level("INFO");
224224
ObSqlString log_file;
225225
if (OB_FAIL(log_file.assign_fmt("%s/log/seekdb.log", opts.base_dir_.ptr()))) {
226226
MPRINT("calculate log file failed %d", ret);

src/observer/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ int inner_main(int argc, char *argv[])
310310
setlocale(LC_TIME, "en_US.UTF-8");
311311
setlocale(LC_NUMERIC, "en_US.UTF-8");
312312

313-
opts->log_level_ = DEFAULT_LOG_LEVEL;
313+
opts->log_level_ = OB_LOG_LEVEL_WARN;
314314
if (FAILEDx(parse_args(argc, argv, *opts))) {
315315
}
316316

src/observer/ob_command_line_parser.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,9 @@ int ObCommandLineParser::handle_option(int option, const char* value, ObServerOp
203203
MPRINT("Invalid argument, the value should not be empty");
204204
} else {
205205
if (OB_FAIL(OB_LOGGER.level_str2int(value, opts.log_level_))) {
206-
MPRINT("Invalid log level. Back to default log level.");
206+
MPRINT("Invalid log level. Back to INFO log level.");
207207
ret = OB_SUCCESS;
208-
opts.log_level_ = DEFAULT_LOG_LEVEL;
208+
opts.log_level_ = OB_LOG_LEVEL_WARN;
209209
}
210210
}
211211
break;

src/share/parameter/ob_parameter_seed.ipp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ DEF_INT(cluster_id, OB_CLUSTER_PARAMETER, "1", "[1,4294901759]", "ID of the clus
202202
ObParameterAttr(Section::OBSERVER, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
203203
DEF_STR(obconfig_url, OB_CLUSTER_PARAMETER, "", "URL for OBConfig service",
204204
ObParameterAttr(Section::OBSERVER, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE));
205-
DEF_LOG_LEVEL(syslog_level, OB_CLUSTER_PARAMETER, ObLogger::get_level_str(DEFAULT_LOG_LEVEL), "specifies the current level of logging. There are DEBUG, TRACE, WDIAG, EDIAG, INFO, WARN, ERROR, seven different log levels.",
205+
DEF_LOG_LEVEL(syslog_level, OB_CLUSTER_PARAMETER, "WDIAG", "specifies the current level of logging. There are DEBUG, TRACE, WDIAG, EDIAG, INFO, WARN, ERROR, seven different log levels.",
206206
ObParameterAttr(Section::OBSERVER, Source::DEFAULT, EditLevel::DYNAMIC_EFFECTIVE),
207207
"DEBUG, TRACE, WDIAG, EDIAG, INFO, WARN, ERROR");
208208
DEF_STR_WITH_CHECKER(alert_log_level, OB_CLUSTER_PARAMETER, "INFO",

0 commit comments

Comments
 (0)