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

fix __all_virtual_memory_info can not show all tenant

Browse Source
This commit is contained in:
nroskill 2021-12-06 20:15:46 +08:00 committed by LINxiansheng
parent 0657b959cd
commit 66288ad214
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -410,7 +410,7 @@ void ObMemoryDump::handle(void* task)
w_stat_->tcr_cnt_ = 0;
int64_t item_used = 0;
int64_t log_pos = 0;
ret = databuff_printf(log_buf_,
IGNORE_RETURN databuff_printf(log_buf_,
LOG_BUF_LEN,
log_pos,
"\ntenant_cnt: %d, max_chunk_cnt: %d\n"
@ -434,6 +434,7 @@ void ObMemoryDump::handle(void* task)
int64_t print_pos = 0;
const int64_t orig_item_used = item_used;
int chunk_cnt = 0;
ret = OB_SUCCESS;
ta->get_chunks(chunks_, MAX_CHUNK_CNT, chunk_cnt);
auto& w_stat = w_stat_;
auto& lmap = lmap_;
@ -497,7 +498,7 @@ void ObMemoryDump::handle(void* task)
std::swap(*ta->get_r_mod_set(), *ta->get_w_mod_set());
}
if (OB_SUCC(ret) && (chunk_cnt != 0 || segv_cnt != 0)) {
ret = databuff_printf(log_buf_,
IGNORE_RETURN databuff_printf(log_buf_,
LOG_BUF_LEN,
log_pos,
"%-15lu%-15d%-15d%-15ld%-15d\n",
@ -510,7 +511,8 @@ void ObMemoryDump::handle(void* task)
} // iter ctx end
} // iter tenant end
if (OB_SUCC(ret)) {
ret = databuff_printf(log_buf_, LOG_BUF_LEN, log_pos, "cost_time: %ld", ObTimeUtility::current_time() - start_ts);
IGNORE_RETURN databuff_printf(
log_buf_, LOG_BUF_LEN, log_pos, "cost_time: %ld", ObTimeUtility::current_time() - start_ts);
}
if (log_pos > 0) {
_OB_LOG(INFO, "statistics: %.*s", static_cast<int32_t>(log_pos), log_buf_);

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

@ -101,7 +101,7 @@ private:
static const int MAX_TENANT_CNT = OB_MAX_SERVER_TENANT_CNT;
static const int MAX_LABEL_ITEM_CNT = 16L << 10;
static const int64_t STAT_LABEL_INTERVAL = 10L * 1000L * 1000L;
static const int64_t LOG_BUF_LEN = 8L << 10;
static const int64_t LOG_BUF_LEN = 64L << 10;
struct TenantCtxRange {
static bool compare(const TenantCtxRange& tcr, const std::pair<uint64_t, uint64_t>& cmp_val)