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

Merge branch 'pr_1719'

Browse Source
This commit is contained in:
ob-robot
2023-12-06 04:09:16 +00:00
parent f88042bfd9 4c15ec86c4
commit d64ed4aaed
11 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/backup/ob_backup_iterator.cpp
View File

@ -570,7 +570,7 @@ int ObBackupMacroBlockIndexIterator::inner_do_fetch_new_(const int64_t file_id)
LOG_WARN("file id invalid", K(ret), K(file_id));
} else if (!cur_index_list_.empty() && cur_idx_ < cur_index_list_.count()) {
ret = OB_NOT_SUPPORTED;
LOG_WARN("do not support prepare when prev iteartor not end", K(ret), K(cur_idx_), K(cur_index_list_.count()));
LOG_WARN("do not support prepare when prev iterator not end", K(ret), K(cur_idx_), K(cur_index_list_.count()));
} else if (FALSE_IT(cur_index_list_.reset())) {
} else if (FALSE_IT(block_desc_list_.reset())) {
} else if (OB_FAIL(fetch_macro_index_list_(file_id, index_list, block_desc_list))) {

2
src/storage/backup/ob_ls_backup_clean_mgr.cpp
View File

@ -174,7 +174,7 @@ int ObLSBackupCleanDagNet::start_running()
int tmp_ret = OB_SUCCESS;
ObLSBackupCleanDag *clean_dag = nullptr;
ObTenantDagScheduler *scheduler = nullptr;
FLOG_INFO("[BACKUP_CLEAN]satrt running ls backup clean dagnet");
FLOG_INFO("[BACKUP_CLEAN]start running ls backup clean dagnet");
if (!is_inited_) {
ret = OB_NOT_INIT;
LOG_WARN("backup clean dag net do not init", K(ret));