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

[CP] fix get_conn core

Browse Source
This commit is contained in:
sdc
2023-08-08 09:13:02 +00:00
committed by ob-robot
parent 7a3548cb4b
commit dc309ed187
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/observer/mysql/obmp_query.cpp
View File

@ -386,7 +386,7 @@ int ObMPQuery::process()
IGNORE_RETURN record_flt_trace(session); IGNORE_RETURN record_flt_trace(session);
} }
if (OB_UNLIKELY(NULL != GCTX.cgroup_ctrl_) && GCTX.cgroup_ctrl_->is_valid()) { if (OB_UNLIKELY(NULL != GCTX.cgroup_ctrl_) && GCTX.cgroup_ctrl_->is_valid() && is_conn_valid()) {
int tmp_ret = OB_SUCCESS; int tmp_ret = OB_SUCCESS;
// Call setup_user_resource_group no matter OB_SUCC or OB_FAIL // Call setup_user_resource_group no matter OB_SUCC or OB_FAIL
// because we have to reset conn.group_id_ according to user_name. // because we have to reset conn.group_id_ according to user_name.

11
src/observer/mysql/obmp_stmt_execute.cpp
View File

@ -1655,7 +1655,8 @@ int ObMPStmtExecute::process_execute_stmt(const ObMultiStmtItem &multi_stmt_item
setup_wb(session); setup_wb(session);
const bool enable_trace_log = lib::is_trace_log_enabled(); const bool enable_trace_log = lib::is_trace_log_enabled();
//============================ 注意这些变量的生命周期 ================================ //============================ 注意这些变量的生命周期 ================================
ObSessionStatEstGuard stat_est_guard(get_conn()->tenant_->id(), session.get_sessid()); ObSMConnection *conn = get_conn();
ObSessionStatEstGuard stat_est_guard(conn->tenant_->id(), session.get_sessid());
if (OB_FAIL(init_process_var(ctx_, multi_stmt_item, session))) { if (OB_FAIL(init_process_var(ctx_, multi_stmt_item, session))) {
LOG_WARN("init process var failed.", K(ret), K(multi_stmt_item)); LOG_WARN("init process var failed.", K(ret), K(multi_stmt_item));
} else { } else {
@ -1719,14 +1720,10 @@ int ObMPStmtExecute::process_execute_stmt(const ObMultiStmtItem &multi_stmt_item
if (OB_FAIL(do_process_single(session, params_, has_more_result, force_sync_resp, async_resp_used))) { if (OB_FAIL(do_process_single(session, params_, has_more_result, force_sync_resp, async_resp_used))) {
LOG_WARN("fail to do process", K(ret), K(ctx_.cur_sql_)); LOG_WARN("fail to do process", K(ret), K(ctx_.cur_sql_));
} }
if (OB_UNLIKELY(NULL != GCTX.cgroup_ctrl_) && GCTX.cgroup_ctrl_->is_valid()) { if (OB_UNLIKELY(NULL != GCTX.cgroup_ctrl_) && GCTX.cgroup_ctrl_->is_valid() && is_conn_valid()) {
int bak_ret = ret; int bak_ret = ret;
ObSMConnection *conn = get_conn();
ObSQLSessionInfo *sess = NULL; ObSQLSessionInfo *sess = NULL;
if (OB_ISNULL(conn)) { if (OB_FAIL(get_session(sess))) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("null conn ptr", K(ret));
} else if (OB_FAIL(get_session(sess))) {
LOG_WARN("get session fail", K(ret)); LOG_WARN("get session fail", K(ret));
} else if (OB_ISNULL(sess)) { } else if (OB_ISNULL(sess)) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;