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

check NULL for mtl_init && mtl_wait

Browse Source
This commit is contained in:
obdev
2024-04-30 04:50:57 +00:00
committed by ob-robot
parent 963b0090aa
commit f2627c972a
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/share/rc/ob_tenant_base.h
View File

@ -250,6 +250,7 @@ using ObTableScanIteratorObjPool = common::ObServerObjectPool<oceanbase::storage
MTL_LIST( \ MTL_LIST( \
blocksstable::ObDecodeResourcePool*, \ blocksstable::ObDecodeResourcePool*, \
omt::ObSharedTimer*, \ omt::ObSharedTimer*, \
oceanbase::sql::ObTenantSQLSessionMgr*, \
storage::ObTenantMetaMemMgr*, \ storage::ObTenantMetaMemMgr*, \
storage::ObTenantFTPluginMgr*, \ storage::ObTenantFTPluginMgr*, \
ObPartTransCtxObjPool*, \ ObPartTransCtxObjPool*, \
@ -349,7 +350,6 @@ using ObTableScanIteratorObjPool = common::ObServerObjectPool<oceanbase::storage
storage::ObEmptyReadBucket*, \ storage::ObEmptyReadBucket*, \
TenantErrsimModule \ TenantErrsimModule \
TenantErrsimEvent \ TenantErrsimEvent \
oceanbase::sql::ObTenantSQLSessionMgr*, \
storage::ObTenantDirectLoadMgr*, \ storage::ObTenantDirectLoadMgr*, \
oceanbase::common::ObOptStatMonitorManager*, \ oceanbase::common::ObOptStatMonitorManager*, \
omt::ObTenantSrs*, \ omt::ObTenantSrs*, \

20
src/sql/session/ob_sql_session_mgr.cpp
View File

@ -131,18 +131,22 @@ int ObTenantSQLSessionMgr::mtl_new(ObTenantSQLSessionMgr *&t_session_mgr)
int ObTenantSQLSessionMgr::mtl_init(ObTenantSQLSessionMgr *&t_session_mgr) int ObTenantSQLSessionMgr::mtl_init(ObTenantSQLSessionMgr *&t_session_mgr)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
if (OB_FAIL(t_session_mgr->init())) { if (t_session_mgr != NULL) {
LOG_WARN("failed to init tenant session manager", K(ret)); if (OB_FAIL(t_session_mgr->init())) {
LOG_WARN("failed to init tenant session manager", K(ret));
}
} }
return ret; return ret;
} }
void ObTenantSQLSessionMgr::mtl_wait(ObTenantSQLSessionMgr *&t_session_mgr) void ObTenantSQLSessionMgr::mtl_wait(ObTenantSQLSessionMgr *&t_session_mgr)
{ {
while (t_session_mgr->count() != 0) { if (t_session_mgr != NULL) {
LOG_WARN_RET(OB_NEED_RETRY, "tenant session mgr should be empty", while (t_session_mgr->count() != 0) {
K(t_session_mgr->count())); LOG_WARN_RET(OB_NEED_RETRY, "tenant session mgr should be empty",
usleep(1000 * 1000); K(t_session_mgr->count()));
usleep(1000 * 1000);
}
} }
LOG_INFO("success to wait tenant session mgr"); LOG_INFO("success to wait tenant session mgr");
} }
@ -165,7 +169,9 @@ ObSQLSessionInfo *ObTenantSQLSessionMgr::alloc_session()
OX (session = op_instance_alloc_args(&session_allocator_, OX (session = op_instance_alloc_args(&session_allocator_,
ObSQLSessionInfo, ObSQLSessionInfo,
tenant_id_)); tenant_id_));
OX (ATOMIC_FAA(&count_, 1)); if (session != NULL) {
OX (ATOMIC_FAA(&count_, 1));
}
} }
OV (OB_NOT_NULL(session)); OV (OB_NOT_NULL(session));
OX (session->set_tenant_session_mgr(this)); OX (session->set_tenant_session_mgr(this));