提交 e14104e3 编写于 作者: G godyangfight 提交者: LINGuanRen

Fix physical incremental backup reuse trans sstable error

上级 01724ead
...@@ -3394,7 +3394,7 @@ int ObBackupCopyPhysicalTask::fetch_backup_macro_block_arg(const share::ObPhysic ...@@ -3394,7 +3394,7 @@ int ObBackupCopyPhysicalTask::fetch_backup_macro_block_arg(const share::ObPhysic
macro_arg.fetch_arg_.macro_block_index_ = macro_idx; macro_arg.fetch_arg_.macro_block_index_ = macro_idx;
macro_arg.fetch_arg_.data_version_ = full_meta.meta_->data_version_; macro_arg.fetch_arg_.data_version_ = full_meta.meta_->data_version_;
macro_arg.fetch_arg_.data_seq_ = full_meta.meta_->data_seq_; macro_arg.fetch_arg_.data_seq_ = full_meta.meta_->data_seq_;
if (!table_key.is_major_sstable()) { if (!table_key.is_major_sstable() || table_key.is_trans_sstable()) {
macro_arg.need_copy_ = true; macro_arg.need_copy_ = true;
} else { } else {
switch (backup_arg.backup_type_) { switch (backup_arg.backup_type_) {
...@@ -3743,7 +3743,7 @@ int ObBackupCopyPhysicalTask::reuse_block_index( ...@@ -3743,7 +3743,7 @@ int ObBackupCopyPhysicalTask::reuse_block_index(
} else if (OB_UNLIKELY(cur_index.data_length_ > 0)) { } else if (OB_UNLIKELY(cur_index.data_length_ > 0)) {
ret = OB_INIT_TWICE; ret = OB_INIT_TWICE;
STORAGE_LOG(WARN, "macro index is already init before reuse.", K(ret), K(i), K(cur_index)); STORAGE_LOG(WARN, "macro index is already init before reuse.", K(ret), K(i), K(cur_index));
} else if (!cur_index.table_key_ptr_->is_major_sstable()) { } else if (!cur_index.table_key_ptr_->is_major_sstable() || cur_index.table_key_ptr_->is_trans_sstable()) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
STORAGE_LOG(WARN, "sstable is not major sstable, can not reuse block index", K(ret), K(cur_index)); STORAGE_LOG(WARN, "sstable is not major sstable, can not reuse block index", K(ret), K(cur_index));
} else if (OB_FAIL(backup_pg_ctx_->fetch_prev_macro_index(*macro_index, macro_arg, prev_index))) { } else if (OB_FAIL(backup_pg_ctx_->fetch_prev_macro_index(*macro_index, macro_arg, prev_index))) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册