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

modify some sys log

Browse Source
This commit is contained in:
obdev 2023-04-04 07:41:41 +00:00 committed by ob-robot
parent a920d19e0a
commit 41ff6f80d3
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/storage/blocksstable/ob_shared_macro_block_manager.cpp
View File

@ -440,10 +440,11 @@ int ObSharedMacroBlockMgr::defragment()
rewrite_cnt,
*sstable_index_builder,
*index_block_rebuilder))) {
LOG_WARN("fail to update tablet", K(ret), K(tablet_handle), K(macro_ids));
}
if (OB_UNLIKELY(OB_EAGAIN == ret)) {
ret = OB_SUCCESS;
if (OB_UNLIKELY(OB_EAGAIN != ret)) {
LOG_WARN("fail to update tablet", K(ret), K(tablet_handle), K(macro_ids));
} else {
ret = OB_SUCCESS;
}
}
}
}
@ -464,8 +465,12 @@ int ObSharedMacroBlockMgr::defragment()
index_block_rebuilder = nullptr;
}
if (OB_FAIL(ret) && REACH_COUNT_INTERVAL(FAILURE_COUNT_INTERVAL)) {
LOG_ERROR("defragmentation can't be finished, something is wrong", K(ret), K(macro_ids));
if (OB_FAIL(ret)) {
if (REACH_COUNT_INTERVAL(FAILURE_COUNT_INTERVAL)) {
LOG_ERROR("defragmentation failed 10 times, something is wrong", K(ret), K(macro_ids));
} else {
LOG_WARN("fail to finish defragmentation", K(ret), K(macro_ids));
}
}
return ret;

2
src/storage/tablet/ob_tablet.cpp
View File

@ -1232,7 +1232,7 @@ int ObTablet::get_sstables_size(int64_t &used_size, const bool ignore_shared_blo
}
}
if (OB_SUCC(ret) && tablet_meta_.has_next_tablet_ && OB_FAIL(
next_tablet_guard_.get_obj()->get_sstables_size(used_size, true /*ignore shared block*/))) {
next_tablet_guard_.get_obj()->get_sstables_size(used_size, ignore_shared_block /*whether ignore shared block*/))) {
LOG_WARN("failed to get size of tablets on the list", K(ret), K(used_size));
}
}