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/executor/ob_executor_rpc_impl.cpp
View File

@ -210,7 +210,7 @@ void ObExecutorRpcImpl::deal_with_rpc_timeout_err(ObExecutorRpcCtx &rpc_ctx,
int a_ret = OB_SUCCESS;
if (OB_UNLIKELY(OB_SUCCESS != (a_ret = retry_info->add_invalid_server_distinctly(
dist_server)))) {
LOG_WARN("fail to add invalid server distinctly", K(a_ret), K(dist_server));
LOG_WARN_RET(a_ret, "fail to add invalid server distinctly", K(a_ret), K(dist_server));
} else {
//LOG_INFO("YZFDEBUG add invalid server distinctly", K(a_ret), K(dist_server), "p", &retry_info->get_invalid_servers());
}

2
src/sql/executor/ob_executor_rpc_impl.h
View File

@ -63,7 +63,7 @@ public:
{
MyResult *ret_result = NULL;
if (!result_.is_inited()) {
SQL_EXE_LOG(ERROR, "result_ is not inited");
SQL_EXE_LOG_RET(ERROR, common::OB_NOT_INIT, "result_ is not inited");
} else {
ret_result = &result_;
}

8
src/sql/executor/ob_remote_executor_processor.cpp
View File

@ -525,7 +525,7 @@ bool ObRemoteBaseExecuteP<T>::query_can_retry_in_remote(int &last_err,
last_err = err;
if (OB_SUCCESS != (err = exec_ctx_.check_status())) {
bret = false;
LOG_WARN("cehck execute status failed", K(err), K(last_err), K(bret));
LOG_WARN_RET(err, "cehck execute status failed", K(err), K(last_err), K(bret));
err = last_err; //返回真实值
} else {
LOG_INFO("query retry in remote", K(retry_times), K(last_err));
@ -537,7 +537,7 @@ bool ObRemoteBaseExecuteP<T>::query_can_retry_in_remote(int &last_err,
}
if (!bret && is_try_lock_row_err(last_err) && is_timeout_err(err)) {
//锁冲突重试到超时，最后直接给用户报LOCK CONFLICT错误
LOG_WARN("retry query until query timeout", K(last_err), K(err));
LOG_WARN_RET(err, "retry query until query timeout", K(last_err), K(err));
err = OB_ERR_EXCLUSIVE_LOCK_CONFLICT;
}
}
@ -763,7 +763,7 @@ int ObRemoteBaseExecuteP<T>::base_before_response(common::ObScanner &scanner)
int get_ret = MTL(transaction::ObTransService*)
->get_tx_exec_result(*session->get_tx_desc(), scanner.get_trans_result());
if (OB_SUCCESS != get_ret) {
LOG_WARN("failed to get trans result",
LOG_WARN_RET(get_ret, "failed to get trans result",
K(get_ret),
"scanner_trans_result", scanner.get_trans_result(),
"tx_desc", *session->get_tx_desc());
@ -794,7 +794,7 @@ int ObRemoteBaseExecuteP<T>::base_before_response(common::ObScanner &scanner)
has_store_pl_msg = true;
}
if (!has_store_pl_msg) {
LOG_WARN("get pl msg fail.", K(exec_errcode_));
LOG_WARN_RET(OB_ERROR, "get pl msg fail.", K(exec_errcode_));
}
}
if (!has_store_pl_msg) {

8
src/sql/executor/ob_task.cpp
View File

@ -160,7 +160,7 @@ OB_DEF_SERIALIZE_SIZE(ObTask)
{
int64_t len = 0;
if (OB_I(t1) OB_ISNULL(exec_ctx_) || OB_ISNULL(ser_phy_plan_)) {
LOG_ERROR("task not init", K_(exec_ctx), K_(ser_phy_plan));
LOG_ERROR_RET(OB_NOT_INIT, "task not init", K_(exec_ctx), K_(ser_phy_plan));
} else {
if (ser_phy_plan_->is_dist_insert_or_replace_plan() && location_idx_ != OB_INVALID_INDEX) {
exec_ctx_->reset_one_row_id_list(exec_ctx_->get_part_row_manager().get_row_id_list(location_idx_));
@ -171,7 +171,7 @@ OB_DEF_SERIALIZE_SIZE(ObTask)
LST_DO_CODE(OB_UNIS_ADD_LEN, runner_svr_);
LST_DO_CODE(OB_UNIS_ADD_LEN, ob_task_id_);
if (OB_ISNULL(root_spec_)) {
LOG_ERROR("unexpected status: op root is null");
LOG_ERROR_RET(OB_ERR_UNEXPECTED, "unexpected status: op root is null");
} else {
const ObExprFrameInfo *frame_info = &ser_phy_plan_->get_expr_frame_info();
len += ObPxTreeSerializer::get_serialize_expr_frame_info_size(*exec_ctx_,
@ -260,7 +260,7 @@ OB_DEF_SERIALIZE_SIZE(ObMiniTask)
OB_UNIS_ADD_LEN(has_extend_root_spec);
if (has_extend_root_spec) {
if (OB_ISNULL(extend_root_spec_) || OB_ISNULL(exec_ctx_)) {
LOG_ERROR("invalid argument", KP(extend_root_spec_), KP(exec_ctx_));
LOG_ERROR_RET(OB_INVALID_ARGUMENT, "invalid argument", KP(extend_root_spec_), KP(exec_ctx_));
} else {
len += ObPxTreeSerializer::get_tree_serialize_size(*extend_root_spec_,
false/*is fulltree*/);
@ -343,7 +343,7 @@ OB_DEF_SERIALIZE_SIZE(ObRemoteTask)
if (OB_ISNULL(remote_sql_info_)
|| OB_ISNULL(session_info_)
|| OB_ISNULL(ps_params = remote_sql_info_->ps_params_)) {
LOG_WARN("remote task not init", K_(remote_sql_info), K_(session_info), K(ps_params));
LOG_WARN_RET(OB_NOT_INIT, "remote task not init", K_(remote_sql_info), K_(session_info), K(ps_params));
} else {
int64_t tenant_id = session_info_->get_effective_tenant_id();
LST_DO_CODE(OB_UNIS_ADD_LEN,

6
src/sql/executor/ob_task_runner_notifier_service.cpp
View File

@ -39,10 +39,10 @@ void ObTaskRunnerNotifierService::ObKillTaskRunnerNotifier::operator()(
ret_ = OB_SUCCESS;
if (OB_ISNULL(entry.second)) {
ret_ = OB_ERR_UNEXPECTED;
LOG_ERROR("notifier is NULL", K(ret_), "key", entry.first);
LOG_ERROR_RET(ret_, "notifier is NULL", K(ret_), "key", entry.first);
} else {
if (OB_SUCCESS != (ret_ = entry.second->kill())) {
LOG_WARN("notify kill task failed", K(ret_));
LOG_WARN_RET(ret_, "notify kill task failed", K(ret_));
}
}
}
@ -103,7 +103,7 @@ ObTaskRunnerNotifierService *ObTaskRunnerNotifierService::get_instance()
{
ObTaskRunnerNotifierService *instance = NULL;
if (OB_ISNULL(instance_) || OB_UNLIKELY(!instance_->inited_)) {
LOG_ERROR("instance is NULL or not inited", K(instance_));
LOG_ERROR_RET(OB_ERR_UNEXPECTED, "instance is NULL or not inited", K(instance_));
} else {
instance = instance_;
}