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

Fix refcnt leak due to incorrect use of link hashmap

Browse Source
This commit is contained in:
Hongqin-Li
2023-05-21 06:52:22 +00:00
committed by ob-robot
parent 3022641952
commit 4ef25bb515
2 changed files with 51 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
src/share/ob_tablet_autoincrement_service.cpp
View File

@ -208,38 +208,36 @@ ObTabletAutoincrementService::~ObTabletAutoincrementService()
{ {
} }
int ObTabletAutoincrementService::get_autoinc_seq(const uint64_t tenant_id, const common::ObTabletID &tablet_id, uint64_t &autoinc_seq) int ObTabletAutoincrementService::acquire_mgr(
const uint64_t tenant_id,
const common::ObTabletID &tablet_id,
const int64_t init_cache_size,
ObTabletAutoincMgr *&autoinc_mgr)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const int64_t auto_increment_cache_size = 10000; //TODO(shuangcan): fix me
ObTabletAutoincKey key; ObTabletAutoincKey key;
key.tenant_id_ = tenant_id; key.tenant_id_ = tenant_id;
key.tablet_id_ = tablet_id; key.tablet_id_ = tablet_id;
ObTabletAutoincParam param;
param.tenant_id_ = tenant_id;
ObTabletAutoincMgr *autoinc_mgr = nullptr;
if (OB_UNLIKELY(!is_inited_)) { if (OB_UNLIKELY(!is_inited_)) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
LOG_WARN("tablet auto increment service is not inited", K(ret), K(tablet_id)); LOG_WARN("tablet auto increment service is not inited", K(ret), K(key));
} else if (!tablet_id.is_valid()) { } else if (OB_UNLIKELY(!key.is_valid() || nullptr != autoinc_mgr)) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
LOG_WARN("invalid argument", K(ret), K(tablet_id)); LOG_WARN("invalid argument", K(ret), K(key));
} else if (OB_FAIL(tablet_autoinc_mgr_map_.get(key, autoinc_mgr))) { } else if (OB_FAIL(tablet_autoinc_mgr_map_.get(key, autoinc_mgr))) {
if (OB_ENTRY_NOT_EXIST != ret) { if (OB_ENTRY_NOT_EXIST != ret) {
LOG_ERROR("get from map failed", K(ret)); LOG_WARN("get from map failed", K(ret));
} else { } else {
lib::ObMutex &mutex = init_node_mutexs_[tablet_id.id() % INIT_NODE_MUTEX_NUM]; lib::ObMutex &mutex = init_node_mutexs_[key.tablet_id_.id() % INIT_NODE_MUTEX_NUM];
lib::ObMutexGuard guard(mutex); lib::ObMutexGuard guard(mutex);
if (OB_ENTRY_NOT_EXIST == (ret = tablet_autoinc_mgr_map_.get(key, autoinc_mgr))) { if (OB_ENTRY_NOT_EXIST == (ret = tablet_autoinc_mgr_map_.get(key, autoinc_mgr))) {
if (NULL == (autoinc_mgr = op_alloc(ObTabletAutoincMgr))) { if (NULL == (autoinc_mgr = op_alloc(ObTabletAutoincMgr))) {
ret = OB_ALLOCATE_MEMORY_FAILED; ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("failed to alloc table mgr", K(ret)); LOG_WARN("failed to alloc table mgr", K(ret));
} else if (OB_FAIL(autoinc_mgr->init(tablet_id, auto_increment_cache_size))) { } else if (OB_FAIL(autoinc_mgr->init(key.tablet_id_, init_cache_size))) {
LOG_WARN("fail to init tablet autoinc mgr", K(ret), K(tablet_id)); LOG_WARN("fail to init tablet autoinc mgr", K(ret), K(key));
} else { } else if (OB_FAIL(tablet_autoinc_mgr_map_.insert_and_get(key, autoinc_mgr))) {
if (OB_FAIL(tablet_autoinc_mgr_map_.insert_and_get(key, autoinc_mgr))) { LOG_WARN("failed to create table node", K(ret));
LOG_WARN("failed to create table node", K(ret));
}
} }
if (OB_FAIL(ret) && autoinc_mgr != nullptr) { if (OB_FAIL(ret) && autoinc_mgr != nullptr) {
op_free(autoinc_mgr); op_free(autoinc_mgr);
@ -248,7 +246,28 @@ int ObTabletAutoincrementService::get_autoinc_seq(const uint64_t tenant_id, cons
} }
} }
} }
if (OB_SUCC(ret)) { return ret;
}
void ObTabletAutoincrementService::release_mgr(ObTabletAutoincMgr *autoinc_mgr)
{
tablet_autoinc_mgr_map_.revert(autoinc_mgr);
return;
}
int ObTabletAutoincrementService::get_autoinc_seq(const uint64_t tenant_id, const common::ObTabletID &tablet_id, uint64_t &autoinc_seq)
{
int ret = OB_SUCCESS;
const int64_t auto_increment_cache_size = 10000; //TODO(shuangcan): fix me
ObTabletAutoincParam param;
param.tenant_id_ = tenant_id;
ObTabletAutoincMgr *autoinc_mgr = nullptr;
if (OB_UNLIKELY(!is_inited_)) {
ret = OB_NOT_INIT;
LOG_WARN("tablet auto increment service is not inited", K(ret));
} else if (OB_FAIL(acquire_mgr(tenant_id, tablet_id, auto_increment_cache_size, autoinc_mgr))) {
LOG_WARN("failed to acquire mgr", K(ret));
} else {
ObTabletCacheInterval interval(tablet_id, 1/*cache size*/); ObTabletCacheInterval interval(tablet_id, 1/*cache size*/);
lib::ObMutex &mutex = init_node_mutexs_[tablet_id.id() % INIT_NODE_MUTEX_NUM]; lib::ObMutex &mutex = init_node_mutexs_[tablet_id.id() % INIT_NODE_MUTEX_NUM];
lib::ObMutexGuard guard(mutex); lib::ObMutexGuard guard(mutex);
@ -262,6 +281,9 @@ int ObTabletAutoincrementService::get_autoinc_seq(const uint64_t tenant_id, cons
LOG_WARN("fail to get next value", K(ret)); LOG_WARN("fail to get next value", K(ret));
} }
} }
if (nullptr != autoinc_mgr) {
release_mgr(autoinc_mgr);
}
return ret; return ret;
} }
@ -298,47 +320,20 @@ int ObTabletAutoincrementService::get_tablet_cache_interval(const uint64_t tenan
LOG_WARN("tablet auto increment service is not inited", K(ret)); LOG_WARN("tablet auto increment service is not inited", K(ret));
} else { } else {
const int64_t auto_increment_cache_size = MAX(interval.cache_size_, 10000); //TODO(shuangcan): fix me const int64_t auto_increment_cache_size = MAX(interval.cache_size_, 10000); //TODO(shuangcan): fix me
ObTabletAutoincKey key;
key.tenant_id_ = tenant_id;
key.tablet_id_ = interval.tablet_id_;
ObTabletAutoincParam param; ObTabletAutoincParam param;
param.tenant_id_ = tenant_id; param.tenant_id_ = tenant_id;
param.auto_increment_cache_size_ = auto_increment_cache_size; param.auto_increment_cache_size_ = auto_increment_cache_size;
ObTabletAutoincMgr *autoinc_mgr = nullptr; ObTabletAutoincMgr *autoinc_mgr = nullptr;
if (!key.is_valid()) { if (OB_FAIL(acquire_mgr(tenant_id, interval.tablet_id_, auto_increment_cache_size, autoinc_mgr))) {
ret = OB_INVALID_ARGUMENT; LOG_WARN("failed to acquire mgr", K(ret));
LOG_WARN("invalid argument", K(ret), K(key)); } else if (OB_ISNULL(autoinc_mgr)) {
} else if (OB_FAIL(tablet_autoinc_mgr_map_.get(key, autoinc_mgr))) { ret = OB_ERR_UNEXPECTED;
if (OB_ENTRY_NOT_EXIST != ret) { LOG_WARN("autoinc mgr is unexpected null", K(ret));
LOG_WARN("get from map failed", K(ret)); } else if (OB_FAIL(autoinc_mgr->fetch_interval_without_cache(param, interval))) {
} else { LOG_WARN("fail to fetch interval", K(ret), K(param));
lib::ObMutex &mutex = init_node_mutexs_[key.tablet_id_.id() % INIT_NODE_MUTEX_NUM];
lib::ObMutexGuard guard(mutex);
if (OB_ENTRY_NOT_EXIST == (ret = tablet_autoinc_mgr_map_.get(key, autoinc_mgr))) {
if (NULL == (autoinc_mgr = op_alloc(ObTabletAutoincMgr))) {
ret = OB_ALLOCATE_MEMORY_FAILED;
LOG_WARN("failed to alloc table mgr", K(ret));
} else if (OB_FAIL(autoinc_mgr->init(key.tablet_id_, auto_increment_cache_size))) {
LOG_WARN("fail to init tablet autoinc mgr", K(ret), K(key));
} else {
if (OB_FAIL(tablet_autoinc_mgr_map_.insert_and_get(key, autoinc_mgr))) {
LOG_WARN("failed to create table node", K(ret));
}
}
if (OB_FAIL(ret) && autoinc_mgr != nullptr) {
op_free(autoinc_mgr);
autoinc_mgr = nullptr;
}
}
}
} }
if (OB_SUCC(ret)) { if (nullptr != autoinc_mgr) {
if (OB_ISNULL(autoinc_mgr)) { release_mgr(autoinc_mgr);
ret = OB_ERR_UNEXPECTED;
LOG_WARN("autoinc mgr is unexpected null", K(ret));
} else if (OB_FAIL(autoinc_mgr->fetch_interval_without_cache(param, interval))) {
LOG_WARN("fail to fetch interval", K(ret), K(param));
}
} }
} }

3
src/share/ob_tablet_autoincrement_service.h
View File

@ -105,6 +105,9 @@ public:
int get_autoinc_seq(const uint64_t tenant_id, const common::ObTabletID &tablet_id, uint64_t &autoinc_seq); int get_autoinc_seq(const uint64_t tenant_id, const common::ObTabletID &tablet_id, uint64_t &autoinc_seq);
int clear_tablet_autoinc_cache(const uint64_t tenant_id, const common::ObTabletID &tablet_id); int clear_tablet_autoinc_cache(const uint64_t tenant_id, const common::ObTabletID &tablet_id);
private: private:
int acquire_mgr(const uint64_t tenant_id, const common::ObTabletID &tablet_id, const int64_t init_cache_size, ObTabletAutoincMgr *&autoinc_mgr);
void release_mgr(ObTabletAutoincMgr *autoinc_mgr);
ObTabletAutoincrementService(); ObTabletAutoincrementService();
~ObTabletAutoincrementService(); ~ObTabletAutoincrementService();