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

fix session lock leak when asccessing mtl var

Browse Source
This commit is contained in:
obdev
2023-02-06 17:27:58 +08:00
committed by ob-robot
parent 3df47b8112
commit 41a9e671ee
2 changed files with 6 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/sql/session/ob_sql_session_info.cpp
View File

@ -127,7 +127,6 @@ ObSQLSessionInfo::ObSQLSessionInfo() :
trans_type_(transaction::ObTxClass::USER), trans_type_(transaction::ObTxClass::USER),
version_provider_(NULL), version_provider_(NULL),
config_provider_(NULL), config_provider_(NULL),
with_tenant_ctx_(NULL),
request_manager_(NULL), request_manager_(NULL),
flt_span_mgr_(NULL), flt_span_mgr_(NULL),
sql_plan_manager_(NULL), sql_plan_manager_(NULL),
@ -278,10 +277,6 @@ void ObSQLSessionInfo::reset(bool skip_sys_var)
config_provider_ = NULL; config_provider_ = NULL;
request_manager_ = NULL; request_manager_ = NULL;
flt_span_mgr_ = NULL; flt_span_mgr_ = NULL;
if (NULL != with_tenant_ctx_) {
with_tenant_ctx_->~ObTenantSpaceFetcher();
with_tenant_ctx_ = NULL;
}
MEMSET(tenant_buff_, 0, sizeof(share::ObTenantSpaceFetcher)); MEMSET(tenant_buff_, 0, sizeof(share::ObTenantSpaceFetcher));
ps_cache_ = NULL; ps_cache_ = NULL;
found_rows_ = 1; found_rows_ = 1;
@ -758,23 +753,8 @@ ObMySQLRequestManager* ObSQLSessionInfo::get_request_manager()
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if (NULL == request_manager_) { if (NULL == request_manager_) {
uint64_t t_id = get_priv_tenant_id(); MTL_SWITCH(get_priv_tenant_id()) {
with_tenant_ctx_ = new(tenant_buff_) share::ObTenantSpaceFetcher(t_id); request_manager_ = MTL(obmysql::ObMySQLRequestManager*);
if (OB_FAIL(with_tenant_ctx_->get_ret())) {
if (OB_TENANT_NOT_IN_SERVER == ret) {
ret = OB_SUCCESS;
} else {
SERVER_LOG(WARN, "failed to switch tenant context", K(t_id), K(ret));
}
} else if (NULL == with_tenant_ctx_){
request_manager_ = NULL;
} else {
ObTenantBase* tenant = with_tenant_ctx_->entity().get_tenant();
if (NULL == tenant) {
request_manager_ = NULL;
} else {
request_manager_ = tenant->get<obmysql::ObMySQLRequestManager*>();
}
} }
} }
@ -785,23 +765,8 @@ sql::ObFLTSpanMgr* ObSQLSessionInfo::get_flt_span_manager()
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if (NULL == flt_span_mgr_) { if (NULL == flt_span_mgr_) {
uint64_t t_id = get_priv_tenant_id(); MTL_SWITCH(get_priv_tenant_id()) {
with_tenant_ctx_ = new(tenant_buff_) share::ObTenantSpaceFetcher(t_id); flt_span_mgr_ = MTL(sql::ObFLTSpanMgr*);
if (OB_FAIL(with_tenant_ctx_->get_ret())) {
if (OB_TENANT_NOT_IN_SERVER == ret) {
ret = OB_SUCCESS;
} else {
SERVER_LOG(WARN, "failed to switch tenant context", K(t_id), K(ret));
}
} else if (NULL == with_tenant_ctx_){
flt_span_mgr_ = NULL;
} else {
ObTenantBase* tenant = with_tenant_ctx_->entity().get_tenant();
if (NULL == tenant) {
flt_span_mgr_ = NULL;
} else {
flt_span_mgr_ = tenant->get<sql::ObFLTSpanMgr*>();
}
} }
} }
return flt_span_mgr_; return flt_span_mgr_;
@ -811,23 +776,8 @@ ObSqlPlanMgr* ObSQLSessionInfo::get_sql_plan_manager()
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if (NULL == sql_plan_manager_) { if (NULL == sql_plan_manager_) {
uint64_t t_id = get_priv_tenant_id(); MTL_SWITCH(get_priv_tenant_id()) {
with_tenant_ctx_ = new(tenant_buff_) share::ObTenantSpaceFetcher(t_id); sql_plan_manager_ = MTL(ObSqlPlanMgr*);
if (OB_FAIL(with_tenant_ctx_->get_ret())) {
if (OB_TENANT_NOT_IN_SERVER == ret) {
ret = OB_SUCCESS;
} else {
SERVER_LOG(WARN, "failed to switch tenant context", K(t_id), K(ret));
}
} else if (NULL == with_tenant_ctx_){
sql_plan_manager_ = NULL;
} else {
ObTenantBase* tenant = with_tenant_ctx_->entity().get_tenant();
if (NULL == tenant) {
sql_plan_manager_ = NULL;
} else {
sql_plan_manager_ = tenant->get<ObSqlPlanMgr*>();
}
} }
} }
return sql_plan_manager_; return sql_plan_manager_;

1
src/sql/session/ob_sql_session_info.h
View File

@ -1032,7 +1032,6 @@ private:
const common::ObVersionProvider *version_provider_; const common::ObVersionProvider *version_provider_;
const ObSQLConfigProvider *config_provider_; const ObSQLConfigProvider *config_provider_;
char tenant_buff_[sizeof(share::ObTenantSpaceFetcher)]; char tenant_buff_[sizeof(share::ObTenantSpaceFetcher)];
share::ObTenantSpaceFetcher* with_tenant_ctx_;
obmysql::ObMySQLRequestManager *request_manager_; obmysql::ObMySQLRequestManager *request_manager_;
sql::ObFLTSpanMgr *flt_span_mgr_; sql::ObFLTSpanMgr *flt_span_mgr_;
ObSqlPlanMgr *sql_plan_manager_; ObSqlPlanMgr *sql_plan_manager_;