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

del advance_clock timer in speed_limit

Browse Source
This commit is contained in:
obdev
2022-12-28 03:38:20 +00:00
committed by ob-robot
parent 4226320168
commit 7fe3d87f72
2 changed files with 29 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/share/allocator/ob_fifo_arena.cpp
View File

@ -85,14 +85,8 @@ int ObFifoArena::init(uint64_t tenant_id)
int ret = OB_SUCCESS; int ret = OB_SUCCESS;
lib::ObMallocAllocator *allocator = lib::ObMallocAllocator::get_instance(); lib::ObMallocAllocator *allocator = lib::ObMallocAllocator::get_instance();
uint64_t ctx_id = ObCtxIds::MEMSTORE_CTX_ID; uint64_t ctx_id = ObCtxIds::MEMSTORE_CTX_ID;
MTL_SWITCH(tenant_id) {
advance_clock_timer_.set_run_wrapper(MTL_CTX()); if (OB_ISNULL(allocator)) {
}
if (OB_FAIL(advance_clock_timer_.init("ADV_CLOCK"))) {
STORAGE_LOG(ERROR, "fail to init advance_clock_timer_", K(ret));
} else if (OB_FAIL(advance_clock_timer_.schedule(advance_clock_task_, ADVANCE_CLOCK_INTERVAL, true))) {
STORAGE_LOG(ERROR, "fail to schedule advance_clock task", K(ret));
} else if (OB_ISNULL(allocator)) {
ret = OB_INIT_FAIL; ret = OB_INIT_FAIL;
OB_LOG(ERROR, "mallocator instance is NULLL", K(ret)); OB_LOG(ERROR, "mallocator instance is NULLL", K(ret));
} else if (OB_ISNULL(allocator_ = allocator->get_tenant_ctx_allocator(tenant_id, ctx_id))) { } else if (OB_ISNULL(allocator_ = allocator->get_tenant_ctx_allocator(tenant_id, ctx_id))) {
@ -114,9 +108,6 @@ int ObFifoArena::init(uint64_t tenant_id)
void ObFifoArena::reset() void ObFifoArena::reset()
{ {
advance_clock_timer_.stop();
advance_clock_timer_.wait();
advance_clock_timer_.destroy();
COMMON_LOG(INFO, "MTALLOC.reset", "tenant_id", get_tenant_id()); COMMON_LOG(INFO, "MTALLOC.reset", "tenant_id", get_tenant_id());
shrink_cached_page(0); shrink_cached_page(0);
} }
@ -312,6 +303,7 @@ void ObFifoArena::speed_limit(const int64_t cur_mem_hold, const int64_t alloc_si
COMMON_LOG(WARN, "failed to check_and_calc_decay_factor", K(cur_mem_hold), K(alloc_size), K(throttle_info_)); COMMON_LOG(WARN, "failed to check_and_calc_decay_factor", K(cur_mem_hold), K(alloc_size), K(throttle_info_));
} }
} }
advance_clock();
seq = ATOMIC_AAF(&max_seq_, alloc_size); seq = ATOMIC_AAF(&max_seq_, alloc_size);
get_seq() = seq; get_seq() = seq;
tl_need_speed_limit() = need_speed_limit; tl_need_speed_limit() = need_speed_limit;
@ -326,12 +318,17 @@ void ObFifoArena::speed_limit(const int64_t cur_mem_hold, const int64_t alloc_si
bool ObFifoArena::check_clock_over_seq(const int64_t req) bool ObFifoArena::check_clock_over_seq(const int64_t req)
{ {
advance_clock();
int64_t clock = ATOMIC_LOAD(&clock_); int64_t clock = ATOMIC_LOAD(&clock_);
return req <= clock; return req <= clock;
} }
void ObFifoArena::advance_clock() void ObFifoArena::advance_clock()
{ {
int64_t cur_ts = ObTimeUtility::current_time();
int64_t old_ts = last_update_ts_;
if ((cur_ts - last_update_ts_ > ADVANCE_CLOCK_INTERVAL) &&
old_ts == ATOMIC_CAS(&last_update_ts_, old_ts, cur_ts)) {
int64_t trigger_percentage = get_writing_throttling_trigger_percentage_(); int64_t trigger_percentage = get_writing_throttling_trigger_percentage_();
int64_t trigger_mem_limit = lastest_memstore_threshold_ * trigger_percentage / 100; int64_t trigger_mem_limit = lastest_memstore_threshold_ * trigger_percentage / 100;
int64_t cur_mem_hold = ATOMIC_LOAD(&hold_); int64_t cur_mem_hold = ATOMIC_LOAD(&hold_);
@ -350,6 +347,7 @@ void ObFifoArena::advance_clock()
K(clock_), K(max_seq_), K(mem_limit), K(cur_mem_hold), K(attr_.tenant_id_)); K(clock_), K(max_seq_), K(mem_limit), K(cur_mem_hold), K(attr_.tenant_id_));
} }
} }
}
int64_t ObFifoArena::expected_wait_time(const int64_t seq) const int64_t ObFifoArena::expected_wait_time(const int64_t seq) const
{ {

22
src/share/allocator/ob_fifo_arena.h
View File

@ -144,20 +144,9 @@ public:
int64_t allocated_; int64_t allocated_;
}; };
class ObAdvanceClockTask : public common::ObTimerTask
{
public:
ObAdvanceClockTask(ObFifoArena &arena) : arena_(arena) {}
virtual ~ObAdvanceClockTask() {}
virtual void runTimerTask() {
arena_.advance_clock();
}
private:
ObFifoArena &arena_;
};
public: public:
enum { MAX_CACHED_GROUP_COUNT = 16, MAX_CACHED_PAGE_COUNT = MAX_CACHED_GROUP_COUNT * Handle::MAX_NWAY, PAGE_SIZE = OB_MALLOC_BIG_BLOCK_SIZE + sizeof(Page) + sizeof(Ref)}; enum { MAX_CACHED_GROUP_COUNT = 16, MAX_CACHED_PAGE_COUNT = MAX_CACHED_GROUP_COUNT * Handle::MAX_NWAY, PAGE_SIZE = OB_MALLOC_BIG_BLOCK_SIZE + sizeof(Page) + sizeof(Ref)};
ObFifoArena(): allocator_(NULL), nway_(0), allocated_(0), reclaimed_(0), hold_(0), retired_(0), max_seq_(0), clock_(0), advance_clock_timer_(), advance_clock_task_(*this), ObFifoArena(): allocator_(NULL), nway_(0), allocated_(0), reclaimed_(0), hold_(0), retired_(0), max_seq_(0), clock_(0), last_update_ts_(0),
last_reclaimed_(0), lastest_memstore_threshold_(0) last_reclaimed_(0), lastest_memstore_threshold_(0)
{ memset(cur_pages_, 0, sizeof(cur_pages_)); } { memset(cur_pages_, 0, sizeof(cur_pages_)); }
~ObFifoArena() { reset(); } ~ObFifoArena() { reset(); }
@ -236,7 +225,7 @@ private:
int64_t get_writing_throttling_maximum_duration_() const; int64_t get_writing_throttling_maximum_duration_() const;
private: private:
static const int64_t MAX_WAIT_INTERVAL = 20 * 1000 * 1000;//20s static const int64_t MAX_WAIT_INTERVAL = 20 * 1000 * 1000;//20s
static const int64_t ADVANCE_CLOCK_INTERVAL = 200;// 200us static const int64_t ADVANCE_CLOCK_INTERVAL = 50;// 50us
static const int64_t MEM_SLICE_SIZE = 2 * 1024 * 1024; //Bytes per usecond static const int64_t MEM_SLICE_SIZE = 2 * 1024 * 1024; //Bytes per usecond
static const int64_t MIN_INTERVAL = 20000; static const int64_t MIN_INTERVAL = 20000;
static const int64_t DEFAULT_TRIGGER_PERCENTAGE = 100; static const int64_t DEFAULT_TRIGGER_PERCENTAGE = 100;
@ -249,14 +238,9 @@ private:
int64_t hold_;//for single tenant int64_t hold_;//for single tenant
int64_t retired_; int64_t retired_;
// typedef common::SpinRWLock RWLock;
// typedef common::SpinRLockGuard RLockGuard;
// typedef common::SpinWLockGuard WLockGuard;
// RWLock rwlock_;
int64_t max_seq_; int64_t max_seq_;
int64_t clock_; int64_t clock_;
common::ObTimer advance_clock_timer_; int64_t last_update_ts_;
ObAdvanceClockTask advance_clock_task_;
int64_t last_reclaimed_; int64_t last_reclaimed_;
Page* cur_pages_[MAX_CACHED_PAGE_COUNT]; Page* cur_pages_[MAX_CACHED_PAGE_COUNT];