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

Fix slog reader doesnt switch file when theres no switch log at EOF

Browse Source
This commit is contained in:
JiahuaChen
2022-03-17 15:11:18 +08:00
committed by LINxiansheng
parent 9aa337ba9e
commit 655020509b
2 changed files with 98 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/storage/blocksstable/slog/ob_storage_log_reader.cpp
View File

@ -437,10 +437,12 @@ int ObStorageLogReader::load_buf()
int ObStorageLogReader::check_switch_file(const int get_ret, const LogCommand cmd)
{
int ret = get_ret;
// Check switch file when meet below situation:
// 1) Meet switch log command
const bool fetch_log_again = (OB_READ_NOTHING == get_ret);
// Check switch file when meet below 2 situation:
// 1) Meet switch log command, or
// 2) read the last log (which may be incomplete and ignored)
// Otherwise directly ret
if (common::OB_SUCCESS == get_ret && OB_LOG_SWITCH_LOG == cmd) {
if ((common::OB_SUCCESS == get_ret && OB_LOG_SWITCH_LOG == cmd) || fetch_log_again) {
STORAGE_REDO_LOG(INFO, "reach the end of log", K_(file_id));
if (OB_FAIL(close())) {
STORAGE_REDO_LOG(ERROR, "close error", K(ret));