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

fix using uninited per_log_limiters_

Browse Source
This commit is contained in:
obdev
2023-02-09 18:24:15 +00:00
committed by ob-robot
parent 0797855767
commit 3a51959b4e
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deps/oblib/src/lib/alloc/memory_dump.cpp vendored
View File

@ -338,7 +338,7 @@ int print_object_meta(AChunk *chunk, ABlock *block, AObject *object, char *buf,
int len = end ? (char*)end - (char*)label : sizeof(object->label_);
ret = databuff_printf(buf, buf_len, pos,
" object: %p, offset: %04d, in_use: %d, is_large: %d, nobjs: %04d," \
" label: \'%.*s\', alloc_bytes: %d\n",
" label: \'%.*s\', alloc_bytes: %u\n",
object, offset, object->in_use_, object->is_large_, object->nobjs_,
len, (char*)label, object->alloc_bytes_);
return ret;

30
deps/oblib/src/lib/oblog/ob_log.cpp vendored
View File

@ -1607,20 +1607,22 @@ int ObLogger::check_tl_log_limiter(const uint64_t location_hash_val,
{
int ret = OB_SUCCESS;
allow = true;
auto log_limiter = (nullptr != tl_log_limiter_ ? tl_log_limiter_ : default_log_limiter_);
if (enable_log_limit_) {
if (nullptr != log_limiter) {
allow = OB_SUCCESS == log_limiter->try_acquire(log_size, level, errcode);
}
if (allow) {
int64_t idx0 = (location_hash_val >> 32) % N_LIMITER;
int64_t idx1 = ((location_hash_val << 32) >> 32) % N_LIMITER;
bool r0 = OB_SUCCESS == per_log_limiters_[idx0].try_acquire(1, level, errcode);
bool r1 = OB_SUCCESS == per_log_limiters_[idx1].try_acquire(1, level, errcode);
allow = r0 || r1;
}
if (!allow && nullptr != log_limiter && log_limiter->is_force_allows()) {
allow = true;
if (OB_LIKELY(is_inited())) {
auto log_limiter = (nullptr != tl_log_limiter_ ? tl_log_limiter_ : default_log_limiter_);
if (enable_log_limit_) {
if (nullptr != log_limiter) {
allow = OB_SUCCESS == log_limiter->try_acquire(log_size, level, errcode);
}
if (allow) {
int64_t idx0 = (location_hash_val >> 32) % N_LIMITER;
int64_t idx1 = ((location_hash_val << 32) >> 32) % N_LIMITER;
bool r0 = OB_SUCCESS == per_log_limiters_[idx0].try_acquire(1, level, errcode);
bool r1 = OB_SUCCESS == per_log_limiters_[idx1].try_acquire(1, level, errcode);
allow = r0 || r1;
}
if (!allow && nullptr != log_limiter && log_limiter->is_force_allows()) {
allow = true;
}
}
}
return ret;