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

make log print friendly after restart observer failed due to there is unexpected log file.

Browse Source
This commit is contained in:
HaHaJeff
2023-10-17 10:39:33 +00:00
committed by ob-robot
parent 9dfa1f53af
commit c508817d24
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/logservice/ob_server_log_block_mgr.cpp
View File

@ -577,19 +577,19 @@ int ObServerLogBlockMgr::do_load_(const char *log_disk_path)
int64_t has_allocated_block_cnt = 0;
ObTimeGuard time_guard("RestartServerBlockMgr", 1 * 1000 * 1000);
if (OB_FAIL(remove_tmp_file_or_directory_for_tenant_(log_disk_path))) {
CLOG_LOG(ERROR, "remove_tmp_file_or_directory_at failed", K(ret), K(log_disk_path));
CLOG_LOG(WARN, "remove_tmp_file_or_directory_at failed", K(ret), K(log_disk_path));
} else if (OB_FAIL(scan_log_disk_dir_(log_disk_path, has_allocated_block_cnt))) {
CLOG_LOG(ERROR, "scan_log_disk_dir_ failed", K(ret), KPC(this), K(log_disk_path),
CLOG_LOG(WARN, "scan_log_disk_dir_ failed", K(ret), KPC(this), K(log_disk_path),
K(has_allocated_block_cnt));
} else if (FALSE_IT(time_guard.click("scan_log_disk_"))
|| OB_FAIL(scan_log_pool_dir_and_do_trim_())) {
CLOG_LOG(ERROR, "scan_log_pool_dir_ failed", K(ret), KPC(this), K(log_disk_path));
CLOG_LOG(WARN, "scan_log_pool_dir_ failed", K(ret), KPC(this), K(log_disk_path));
} else if (FALSE_IT(time_guard.click("scan_log_pool_dir_and_do_trim_"))
|| OB_FAIL(load_meta_())) {
CLOG_LOG(ERROR, "load_meta_ failed", K(ret), KPC(this), K(log_disk_path));
CLOG_LOG(WARN, "load_meta_ failed", K(ret), KPC(this), K(log_disk_path));
} else if (FALSE_IT(time_guard.click("load_meta_"))
|| OB_FAIL(try_continous_to_resize_(has_allocated_block_cnt * BLOCK_SIZE))) {
CLOG_LOG(ERROR, "try_continous_do_resize_ failed", K(ret), KPC(this),
CLOG_LOG(WARN, "try_continous_do_resize_ failed", K(ret), KPC(this),
K(log_disk_path), K(has_allocated_block_cnt));
} else if (FALSE_IT(time_guard.click("try_continous_to_resize_"))
|| false
@ -1242,7 +1242,9 @@ int ObServerLogBlockMgr::get_has_allocated_blocks_cnt_in_(
|| true == std::regex_match(current_file_path, pattern_meta)) {
GetBlockCountFunctor functor(current_file_path);
if (OB_FAIL(palf::scan_dir(current_file_path, functor))) {
CLOG_LOG(ERROR, "scan_dir failed", K(ret), K(current_file_path));
LOG_DBA_ERROR(OB_ERR_UNEXPECTED, "Attention!!!", "There are several files in the log directory that are not generated by "
"OceanBase. Please confirm whether manual deletion is required",
"log directory", current_file_path);
} else {
has_allocated_block_cnt += functor.get_block_count();
CLOG_LOG(INFO, "get_has_allocated_blocks_cnt_in_ success", K(ret),
@ -1250,7 +1252,7 @@ int ObServerLogBlockMgr::get_has_allocated_blocks_cnt_in_(
}
} else if (OB_FAIL(get_has_allocated_blocks_cnt_in_(current_file_path,
has_allocated_block_cnt))) {
CLOG_LOG(ERROR, "get_has_allocated_blocks_cnt_in_ failed", K(ret),
CLOG_LOG(WARN, "get_has_allocated_blocks_cnt_in_ failed", K(ret),
K(current_file_path), K(has_allocated_block_cnt));
} else {
}

2
src/logservice/palf/log_define.cpp
View File

@ -141,7 +141,7 @@ int GetBlockCountFunctor::func(const dirent *entry)
// restart will be failed, the solution is that read block.
if (false == is_number(entry_name) && false == is_flashback_block(entry_name)) {
ret = OB_ERR_UNEXPECTED;
PALF_LOG(WARN, "this is block is not used for palf!!!", K(ret), K(entry_name));
LOG_DBA_ERROR(OB_ERR_UNEXPECTED, "Attention!!!", "This file is not used for palf", K(entry_name));
// do nothing, skip invalid block like tmp
} else {
count_ ++;