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

fix restore 4016

Browse Source
This commit is contained in:
z404289981
2023-11-16 11:49:24 +00:00
committed by ob-robot
parent 3900520895
commit 1530410c7c
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/storage/blocksstable/index_block/ob_index_block_builder.h
View File

@ -66,7 +66,7 @@ public:
// used for small sstable // used for small sstable
int change_macro_id(const MacroBlockId &macro_block_id); int change_macro_id(const MacroBlockId &macro_block_id);
TO_STRING_KV(KP(allocator_), K_(last_key), K_(data_column_cnt), K_(data_blocks_cnt), TO_STRING_KV(KP(allocator_), K_(last_key), K_(task_idx), K_(data_column_cnt), K_(data_blocks_cnt),
K_(use_old_macro_block_count), K_(meta_block_offset), K_(meta_block_size), K_(use_old_macro_block_count), K_(meta_block_offset), K_(meta_block_size),
K_(last_macro_size), KP(macro_metas_), K_(is_inited)); K_(last_macro_size), KP(macro_metas_), K_(is_inited));
common::ObIAllocator *allocator_; common::ObIAllocator *allocator_;

11
src/storage/high_availability/ob_physical_copy_task.cpp
View File

@ -325,13 +325,12 @@ int ObPhysicalCopyTask::fetch_macro_block_(
ret = OB_NOT_INIT; ret = OB_NOT_INIT;
LOG_WARN("physical copy physical task do not init", K(ret)); LOG_WARN("physical copy physical task do not init", K(ret));
} else { } else {
const int64_t *task_idx = nullptr;
LOG_INFO("init reader", K(copy_table_key_)); LOG_INFO("init reader", K(copy_table_key_));
if (!copy_ctx_->is_leader_restore_) { if (OB_UNLIKELY(task_idx_ < 0)) {
task_idx = &task_idx_; ret = OB_ERR_UNEXPECTED;
} LOG_WARN("unexpected task_idx_", K(ret), K(task_idx_));
if (OB_FAIL(index_block_rebuilder.init( } else if (OB_FAIL(index_block_rebuilder.init(
*copy_ctx_->sstable_index_builder_, copy_ctx_->need_sort_macro_meta_, task_idx))) { *copy_ctx_->sstable_index_builder_, copy_ctx_->need_sort_macro_meta_, &task_idx_))) {
LOG_WARN("failed to init index block rebuilder", K(ret), K(copy_table_key_)); LOG_WARN("failed to init index block rebuilder", K(ret), K(copy_table_key_));
} else if (OB_FAIL(get_macro_block_reader_(reader))) { } else if (OB_FAIL(get_macro_block_reader_(reader))) {
LOG_WARN("fail to get macro block reader", K(ret)); LOG_WARN("fail to get macro block reader", K(ret));