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

Fix ddl kv mgr deadlock

Browse Source
This commit is contained in:
Hongqin-Li 2023-03-21 17:11:17 +00:00 committed by ob-robot
parent 5ed3fc8cb5
commit a7c5fc2509
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/storage/ddl/ob_tablet_ddl_kv_mgr.cpp
View File

@ -902,7 +902,6 @@ int ObTabletDDLKvMgr::get_active_ddl_kv_impl(ObTableHandleV2 &kv_handle)
int ObTabletDDLKvMgr::get_or_create_ddl_kv(const SCN &start_scn, const SCN &scn, ObTableHandleV2 &kv_handle)
{
int ret = OB_SUCCESS;
const int64_t TRY_LOCK_TIMEOUT = 1 * 1000000; // 1s
kv_handle.reset();
if (IS_NOT_INIT) {
ret = OB_NOT_INIT;
@ -1105,16 +1104,21 @@ int ObTabletDDLKvMgr::get_ddl_kvs(const bool frozen_only, ObTablesHandleArray &k
int ObTabletDDLKvMgr::get_ddl_kvs_for_query(ObTablet &tablet, ObTablesHandleArray &kv_handle_array)
{
int ret = OB_SUCCESS;
uint32_t lock_tid = 0;
kv_handle_array.reset();
ObLatchRGuard guard(lock_, ObLatchIds::TABLET_DDL_KV_MGR_LOCK);
if (IS_NOT_INIT) {
ret = OB_NOT_INIT;
LOG_WARN("ObTabletDDLKvMgr is not inited", K(ret));
} else if (OB_FAIL(rdlock(TRY_LOCK_TIMEOUT, lock_tid))) {
LOG_WARN("failed to rdlock", K(ret), K(tablet.get_tablet_meta()));
} else if (!can_schedule_major_compaction_nolock(tablet.get_tablet_meta())) {
// do nothing
} else if (OB_FAIL(get_ddl_kvs_unlock(true/*frozen_only*/, kv_handle_array))) {
LOG_WARN("get ddl kv unlock failed", K(ret));
}
if (0 != lock_tid) {
unlock(lock_tid);
}
return ret;
}

1
src/storage/ddl/ob_tablet_ddl_kv_mgr.h
View File

@ -99,6 +99,7 @@ private:
bool is_commit_success_unlock() const;
public:
static const int64_t MAX_DDL_KV_CNT_IN_STORAGE = 16;
static const int64_t TRY_LOCK_TIMEOUT = 1 * 1000000; // 1s
private:
bool is_inited_;
share::SCN success_start_scn_;