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

use RlockGuardWithTimeout to get freeze info

Browse Source
This commit is contained in:
a1iive 2024-02-07 18:40:52 +00:00 committed by ob-robot
parent b128237054
commit a48ae4a546
2 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/storage/compaction/ob_tenant_freeze_info_mgr.cpp
View File

@ -192,12 +192,15 @@ int64_t ObTenantFreezeInfoMgr::get_latest_frozen_version()
int ObTenantFreezeInfoMgr::get_min_dependent_freeze_info(ObFreezeInfo &freeze_info) int ObTenantFreezeInfoMgr::get_min_dependent_freeze_info(ObFreezeInfo &freeze_info)
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + RLOCK_TIMEOUT_US;
RLockGuardWithTimeout lock_guard(lock_, abs_timeout_us, ret);
if (OB_UNLIKELY(!inited_)) { if (OB_FAIL(ret)) {
STORAGE_LOG(WARN, "get_lock failed", KR(ret));
} else if (OB_UNLIKELY(!inited_)) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
STORAGE_LOG(WARN, "not init", K(ret)); STORAGE_LOG(WARN, "not init", K(ret));
} else { } else {
RLockGuard lock_guard(lock_);
const int64_t info_cnt = freeze_info_mgr_.get_freeze_info_count(); const int64_t info_cnt = freeze_info_mgr_.get_freeze_info_count();
int64_t idx = 0; int64_t idx = 0;
if (info_cnt > MIN_DEPENDENT_FREEZE_INFO_GAP) { if (info_cnt > MIN_DEPENDENT_FREEZE_INFO_GAP) {
@ -219,9 +222,12 @@ int ObTenantFreezeInfoMgr::get_freeze_info_behind_major_snapshot(
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
ObSEArray<share::ObFreezeInfo, 8> info_list; ObSEArray<share::ObFreezeInfo, 8> info_list;
RLockGuard lock_guard(lock_); const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + RLOCK_TIMEOUT_US;
RLockGuardWithTimeout lock_guard(lock_, abs_timeout_us, ret);
if (OB_UNLIKELY(!inited_)) { if (OB_FAIL(ret)) {
STORAGE_LOG(WARN, "get_lock failed", KR(ret));
} else if (OB_UNLIKELY(!inited_)) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
STORAGE_LOG(WARN, "not init", K(ret)); STORAGE_LOG(WARN, "not init", K(ret));
} else if (OB_UNLIKELY(major_snapshot_version < 0)) { } else if (OB_UNLIKELY(major_snapshot_version < 0)) {
@ -241,9 +247,12 @@ int ObTenantFreezeInfoMgr::get_freeze_info_by_snapshot_version(
{ {
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
ObSEArray<ObFreezeInfo, 1> freeze_infos; ObSEArray<ObFreezeInfo, 1> freeze_infos;
RLockGuard lock_guard(lock_); const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + RLOCK_TIMEOUT_US;
RLockGuardWithTimeout lock_guard(lock_, abs_timeout_us, ret);
if (OB_UNLIKELY(snapshot_version <= 0 || INT64_MAX == snapshot_version)) { if (OB_FAIL(ret)) {
STORAGE_LOG(WARN, "get_lock failed", KR(ret));
} else if (OB_UNLIKELY(snapshot_version <= 0 || INT64_MAX == snapshot_version)) {
ret = OB_INVALID_ARGUMENT; ret = OB_INVALID_ARGUMENT;
STORAGE_LOG(WARN, "snapshot version is invalid", K(ret), K(snapshot_version)); STORAGE_LOG(WARN, "snapshot version is invalid", K(ret), K(snapshot_version));
} else if (OB_UNLIKELY(!inited_)) { } else if (OB_UNLIKELY(!inited_)) {
@ -261,8 +270,15 @@ int ObTenantFreezeInfoMgr::get_freeze_info_behind_snapshot_version(
const int64_t snapshot_version, const int64_t snapshot_version,
ObFreezeInfo &freeze_info) ObFreezeInfo &freeze_info)
{ {
RLockGuard lock_guard(lock_); int ret = OB_SUCCESS;
return get_freeze_info_behind_snapshot_version_(snapshot_version, freeze_info); const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + RLOCK_TIMEOUT_US;
RLockGuardWithTimeout lock_guard(lock_, abs_timeout_us, ret);
if (OB_FAIL(ret)) {
STORAGE_LOG(WARN, "get_lock failed", KR(ret));
} else if (OB_FAIL(get_freeze_info_behind_snapshot_version_(snapshot_version, freeze_info))) {
STORAGE_LOG(WARN, "failed to get_freeze_info_behind_snapshot_version", KR(ret));
}
return ret;
} }
int ObTenantFreezeInfoMgr::get_freeze_info_behind_snapshot_version_( int ObTenantFreezeInfoMgr::get_freeze_info_behind_snapshot_version_(
@ -295,9 +311,12 @@ int ObTenantFreezeInfoMgr::get_neighbour_major_freeze(
bool found = false; bool found = false;
share::ObFreezeInfo prev_frozen_status; share::ObFreezeInfo prev_frozen_status;
share::ObFreezeInfo next_frozen_status; share::ObFreezeInfo next_frozen_status;
RLockGuard lock_guard(lock_); const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + RLOCK_TIMEOUT_US;
RLockGuardWithTimeout lock_guard(lock_, abs_timeout_us, ret);
if (OB_UNLIKELY(!inited_)) { if (OB_FAIL(ret)) {
STORAGE_LOG(WARN, "get_lock failed", KR(ret));
} else if (OB_UNLIKELY(!inited_)) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
STORAGE_LOG(WARN, "not init", K(ret)); STORAGE_LOG(WARN, "not init", K(ret));
} else if (OB_FAIL(freeze_info_mgr_.get_neighbour_frozen_status(snapshot_version, prev_frozen_status, next_frozen_status))) { } else if (OB_FAIL(freeze_info_mgr_.get_neighbour_frozen_status(snapshot_version, prev_frozen_status, next_frozen_status))) {
@ -412,10 +431,12 @@ int ObTenantFreezeInfoMgr::get_min_reserved_snapshot(
bool unused = false; bool unused = false;
snapshot_info.reset(); snapshot_info.reset();
RLockGuard lock_guard(lock_); const int64_t abs_timeout_us = common::ObTimeUtility::current_time() + RLOCK_TIMEOUT_US;
RLockGuardWithTimeout lock_guard(lock_, abs_timeout_us, ret);
ObIArray<ObSnapshotInfo> &snapshots = snapshots_[cur_idx_]; ObIArray<ObSnapshotInfo> &snapshots = snapshots_[cur_idx_];
if (OB_FAIL(ret)) {
if (OB_UNLIKELY(!inited_)) { STORAGE_LOG(WARN, "get_lock failed", KR(ret));
} else if (OB_UNLIKELY(!inited_)) {
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
STORAGE_LOG(WARN, "not init", K(ret)); STORAGE_LOG(WARN, "not init", K(ret));
} else if (OB_FAIL(get_multi_version_duration(duration))) { } else if (OB_FAIL(get_multi_version_duration(duration))) {

2
src/storage/compaction/ob_tenant_freeze_info_mgr.h
View File

@ -131,6 +131,7 @@ public:
private: private:
typedef common::RWLock::RLockGuard RLockGuard; typedef common::RWLock::RLockGuard RLockGuard;
typedef common::RWLock::WLockGuard WLockGuard; typedef common::RWLock::WLockGuard WLockGuard;
typedef common::RWLock::RLockGuardWithTimeout RLockGuardWithTimeout;
static const int64_t RELOAD_INTERVAL = 3L * 1000L * 1000L; static const int64_t RELOAD_INTERVAL = 3L * 1000L * 1000L;
static const int64_t UPDATE_LS_RESERVED_SNAPSHOT_INTERVAL = 10L * 1000L * 1000L; static const int64_t UPDATE_LS_RESERVED_SNAPSHOT_INTERVAL = 10L * 1000L * 1000L;
@ -138,6 +139,7 @@ private:
static const int64_t FLUSH_GC_SNAPSHOT_TS_REFRESH_TS = static const int64_t FLUSH_GC_SNAPSHOT_TS_REFRESH_TS =
common::MODIFY_GC_SNAPSHOT_INTERVAL + 10L * 1000L * 1000L; common::MODIFY_GC_SNAPSHOT_INTERVAL + 10L * 1000L * 1000L;
static const int64_t MIN_DEPENDENT_FREEZE_INFO_GAP = 2; static const int64_t MIN_DEPENDENT_FREEZE_INFO_GAP = 2;
static const int64_t RLOCK_TIMEOUT_US = 2L * 1000L * 1000L; // 2s
int64_t get_next_idx() { return 1L - cur_idx_; } int64_t get_next_idx() { return 1L - cur_idx_; }
void switch_info() { cur_idx_ = get_next_idx(); } void switch_info() { cur_idx_ = get_next_idx(); }