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

fixde memory leak after remove tenant on arbserver.

Browse Source
This commit is contained in:
HaHaJeff
2023-02-07 16:52:48 +08:00
committed by ob-robot
parent a06c0fb826
commit a8767462ad
14 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/logservice/palf/palf_env_impl.cpp
View File

@ -146,7 +146,9 @@ PalfEnvImpl::PalfEnvImpl() : palf_meta_lock_(common::ObLatchIds::PALF_ENV_LOCK),
palf_handle_impl_map_(64), // 指定min_size=64
last_palf_epoch_(0),
diskspace_enough_(true),
is_inited_(false)
tenant_id_(0),
is_inited_(false),
is_running_(false)
{
log_dir_[0] = '\0';
tmp_log_dir_[0] = '\0';
@ -160,6 +162,7 @@ PalfEnvImpl::~PalfEnvImpl()
int PalfEnvImpl::init(
const PalfOptions &options,
const char *base_dir, const ObAddr &self,
const int64_t tenant_id,
rpc::frame::ObReqTransport *transport,
common::ObILogAllocator *log_alloc_mgr,
ILogBlockPool *log_block_pool)
@ -182,11 +185,12 @@ int PalfEnvImpl::init(
KP(log_alloc_mgr), KP(log_block_pool));
} else if (OB_FAIL(fetch_log_engine_.init(this, log_alloc_mgr))) {
PALF_LOG(ERROR, "FetchLogEngine init failed", K(ret));
} else if (OB_FAIL(log_rpc_.init(self, transport))) {
} else if (OB_FAIL(log_rpc_.init(self, tenant_id, transport))) {
PALF_LOG(ERROR, "LogRpc init failed", K(ret));
} else if (OB_FAIL(cb_thread_pool_.init(io_cb_num, this))) {
PALF_LOG(ERROR, "LogIOTaskThreadPool init failed", K(ret));
} else if (OB_FAIL(log_io_worker_.init(log_io_worker_config_,
tenant_id,
cb_thread_pool_.get_tg_id(),
log_alloc_mgr, this))) {
PALF_LOG(ERROR, "LogIOWorker init failed", K(ret));
@ -200,7 +204,7 @@ int PalfEnvImpl::init(
} else if (pret < 0 || pret >= MAX_PATH_SIZE) {
ret = OB_BUF_NOT_ENOUGH;
PALF_LOG(ERROR, "construct log path failed", K(ret), K(pret));
} else if (OB_FAIL(palf_handle_impl_map_.init("LOG_HASH_MAP", PALF_ENV_ID))) {
} else if (OB_FAIL(palf_handle_impl_map_.init("LOG_HASH_MAP", tenant_id))) {
PALF_LOG(ERROR, "palf_handle_impl_map_ init failed", K(ret));
} else if (OB_FAIL(log_loop_thread_.init(this))) {
PALF_LOG(ERROR, "log_loop_thread_ init failed", K(ret));
@ -217,6 +221,7 @@ int PalfEnvImpl::init(
log_alloc_mgr_ = log_alloc_mgr;
log_block_pool_ = log_block_pool;
self_ = self;
tenant_id_ = tenant_id;
is_inited_ = true;
is_running_ = true;
PALF_LOG(INFO, "PalfEnvImpl init success", K(ret), K(self_), KPC(this));
@ -248,7 +253,7 @@ int PalfEnvImpl::start()
PALF_LOG(ERROR, "LogUpdater start failed", K(ret));
} else {
is_running_ = true;
PALF_LOG(INFO, "PalfEnv start success", K(ret), K(PALF_ENV_ID));
PALF_LOG(INFO, "PalfEnv start success", K(ret));
}
return ret;
}
@ -1139,5 +1144,10 @@ int PalfEnvImpl::get_io_start_time(int64_t &last_working_time)
return ret;
}
int64_t PalfEnvImpl::get_tenant_id()
{
return tenant_id_;
}
} // end namespace palf
} // end namespace oceanbase