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

fix passing relative timeout to rwlock

Browse Source
This commit is contained in:
wxhwang 2024-12-17 02:15:20 +00:00 committed by ob-robot
parent 94505cabc0
commit 5ba6532eda
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/storage/tx_storage/ob_tablet_gc_service.cpp
View File

@ -361,7 +361,8 @@ uint8_t ObTabletGCHandler::get_tablet_persist_trigger_and_reset()
int ObTabletGCHandler::disable_gc()
{
int ret = OB_SUCCESS;
if (OB_FAIL(gc_rwlock_.rdlock(GC_LOCK_TIMEOUT))) {
const int64_t abs_timeout_us = get_gc_lock_abs_timeout();
if (OB_FAIL(gc_rwlock_.rdlock(abs_timeout_us))) {
ret = OB_TABLET_GC_LOCK_CONFLICT;
LOG_WARN("try lock failed, please retry later", KPC(ls_), K(ret));
} else if (check_stop()) {
@ -384,7 +385,8 @@ void ObTabletGCHandler::enable_gc()
int ObTabletGCHandler::set_tablet_change_checkpoint_scn(const share::SCN &scn)
{
int ret = OB_SUCCESS;
if (OB_FAIL(gc_rwlock_.wrlock(GC_LOCK_TIMEOUT))) {
const int64_t abs_timeout_us = get_gc_lock_abs_timeout();
if (OB_FAIL(gc_rwlock_.wrlock(abs_timeout_us))) {
ret = OB_TABLET_GC_LOCK_CONFLICT;
LOG_WARN("try lock failed, please retry later", KPC(ls_), K(ret));
} else {
@ -822,11 +824,12 @@ int ObTabletGCHandler::set_ls_transfer_scn(const common::ObIArray<ObTabletHandle
int ObTabletGCHandler::offline()
{
int ret = OB_SUCCESS;
const int64_t abs_timeout_us = get_gc_lock_abs_timeout();
set_stop();
if (!is_finish()) {
ret = OB_EAGAIN;
STORAGE_LOG(INFO, "tablet gc handler not finish, retry", KR(ret), KPC(this), KPC(ls_), K(ls_->get_ls_meta()));
} else if (OB_FAIL(gc_rwlock_.wrlock(GC_LOCK_TIMEOUT))) {
} else if (OB_FAIL(gc_rwlock_.wrlock(abs_timeout_us))) {
// make sure 'gc_rwlock_' is not using.
ret = OB_TABLET_GC_LOCK_CONFLICT;
LOG_WARN("tablet gc handler not finish, retry", KPC(ls_), K(ret));
@ -845,6 +848,11 @@ void ObTabletGCHandler::online()
STORAGE_LOG(INFO, "tablet gc handler online", KPC(this), KPC(ls_), K(ls_->get_ls_meta()));
}
int64_t ObTabletGCHandler::get_gc_lock_abs_timeout() const
{
const int64_t abs_timeout_us = GC_LOCK_TIMEOUT + ObTimeUtility::current_time();
return abs_timeout_us;
}
} // checkpoint
} // storage
} // oceanbase

2
src/storage/tx_storage/ob_tablet_gc_service.h
View File

@ -120,6 +120,8 @@ private:
void set_stop() { ATOMIC_STORE(&update_enabled_, false); }
void set_start() { ATOMIC_STORE(&update_enabled_, true); }
int64_t get_gc_lock_abs_timeout() const;
public:
static const int64_t GC_LOCK_TIMEOUT = 100_ms; // 100ms
obsys::ObRWLock wait_lock_;