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

fix: tenant memory leak when create tenant failed

Browse Source
This commit is contained in:
obdev
2023-08-21 03:44:14 +00:00
committed by ob-robot
parent ee361e15fe
commit 1ef24c522f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/observer/omt/ob_multi_tenant.cpp
View File

@ -958,9 +958,8 @@ int ObMultiTenant::create_tenant(const ObTenantMeta &meta, bool write_slog, cons
if (!is_virtual_tenant_id(tenant_id) && OB_TMP_FAIL(update_tenant_config(tenant_id))) { if (!is_virtual_tenant_id(tenant_id) && OB_TMP_FAIL(update_tenant_config(tenant_id))) {
LOG_WARN("update tenant config fail", K(tenant_id), K(tmp_ret)); LOG_WARN("update tenant config fail", K(tenant_id), K(tmp_ret));
} }
// no need rollback when replaying slog and creating a virtual tenant,
// in which two case the write_slog flag is set to false if (OB_FAIL(ret)) {
if (OB_FAIL(ret) && write_slog) {
do { do {
tmp_ret = OB_SUCCESS; tmp_ret = OB_SUCCESS;
if (create_step >= ObTenantCreateStep::STEP_TENANT_NEWED) { if (create_step >= ObTenantCreateStep::STEP_TENANT_NEWED) {
@ -973,7 +972,9 @@ int ObMultiTenant::create_tenant(const ObTenantMeta &meta, bool write_slog, cons
ob_delete(tenant); ob_delete(tenant);
tenant = nullptr; tenant = nullptr;
} }
if (OB_SUCCESS != (tmp_ret = clear_persistent_data(tenant_id))) { // no need rollback when replaying slog and creating a virtual tenant,
// in which two case the write_slog flag is set to false
if (write_slog && OB_SUCCESS != (tmp_ret = clear_persistent_data(tenant_id))) {
LOG_ERROR("fail to clear persistent data", K(tenant_id), K(tmp_ret)); LOG_ERROR("fail to clear persistent data", K(tenant_id), K(tmp_ret));
SLEEP(1); SLEEP(1);
} }