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

[FEAT MERGE] Merge syslog user experience improvement to master

Browse Source 
Co-authored-by: Charles0429 <xiezhenjiang@gmail.com>
Co-authored-by: tino247 <tino247@126.com>
Co-authored-by: chaser-ch <chaser.ch@antgroup.com>
This commit is contained in:
stdliu
2023-02-06 15:52:23 +08:00
committed by ob-robot
parent 1de9266dd0
commit f8c5c2647f
796 changed files with 4465 additions and 3036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/monitor/ob_monitor_info_elimination_task.cpp
View File

@ -30,7 +30,7 @@ int ObMonitorInfoEliminationTask::init(ObMonitorInfoManager *info)
void ObMonitorInfoEliminationTask::runTimerTask()
{
if (OB_ISNULL(monitor_info_)) {
SQL_MONITOR_LOG(ERROR, "invalid history info", K(monitor_info_));
SQL_MONITOR_LOG_RET(ERROR, OB_INVALID_ARGUMENT, "invalid history info", K(monitor_info_));
} else {
monitor_info_->print_memory_size();
monitor_info_->gc();

10
src/sql/monitor/ob_phy_operator_monitor_info.cpp
View File

@ -87,7 +87,7 @@ int ObPhyOperatorMonitorInfo::assign(const ObPhyOperatorMonitorInfo &other)
void ObPhyOperatorMonitorInfo::operator=(const ObPhyOperatorMonitorInfo &other)
{
if (OB_SUCCESS != assign(other)) {
LOG_ERROR("fail to assign", K(&other));
LOG_ERROR_RET(OB_ERROR, "fail to assign", K(&other));
}
}
@ -152,7 +152,7 @@ int64_t ObPhyOperatorMonitorInfo::print_info(char* buf, int64_t buf_len) const
J_OBJ_START();
if (is_timestamp(i)) {
if (OB_SUCCESS != ObTimeUtility2::usec_to_str(info_array_[i], timebuf, time_buf_len, time_buf_pos)) {
LOG_WARN("fail to print time as str", K(i));
LOG_WARN_RET(OB_ERR_UNEXPECTED, "fail to print time as str", K(i));
J_KV(OB_OPERATOR_MONITOR_INFOS[i].info_name_, info_array_[i]);
} else {
timebuf[time_buf_pos] = '\0';
@ -173,7 +173,7 @@ void ObPhyOperatorMonitorInfo::set_value(ObOperatorMonitorInfoIds index, int64_t
if (index >= 0 && index < OB_MAX_INFORMATION_COUNT) {
info_array_[index] = value;
} else {
LOG_WARN("invalid index", K(index), K(value));
LOG_WARN_RET(OB_INVALID_ARGUMENT, "invalid index", K(index), K(value));
}
}
@ -183,7 +183,7 @@ void ObPhyOperatorMonitorInfo::increase_value(ObOperatorMonitorInfoIds index)
if (index >= 0 && index < OB_MAX_INFORMATION_COUNT) {
info_array_[index]++;
} else {
LOG_WARN("invalid index", K(index));
LOG_WARN_RET(OB_INVALID_ARGUMENT, "invalid index", K(index));
}
}
@ -192,7 +192,7 @@ void ObPhyOperatorMonitorInfo::get_value(ObOperatorMonitorInfoIds index, int64_t
if (index >= 0 && index < OB_MAX_INFORMATION_COUNT) {
value = info_array_[index];
} else {
LOG_WARN("invalid index", K(index));
LOG_WARN_RET(OB_INVALID_ARGUMENT, "invalid index", K(index));
}
}

2
src/sql/monitor/ob_phy_plan_exec_info.h
View File

@ -104,7 +104,7 @@ int64_t ObPhyPlanExecInfo::print_info(char *buf, int64_t buf_len) const
J_OBJ_START();
if (is_timestamp(i)) {
if (common::OB_SUCCESS != share::ObTimeUtility2::usec_to_str(plan_info_array_[i], timebuf, time_buf_len, time_buf_pos)) {
SQL_MONITOR_LOG(WARN, "fail to print time as str", K(i));
SQL_MONITOR_LOG_RET(WARN, common::OB_ERR_UNEXPECTED, "fail to print time as str", K(i));
J_KV(OB_PLAN_MONITOR_INFOS[i].info_name_, plan_info_array_[i]);
} else {
timebuf[time_buf_pos] = '\0';