From e14104e3ab6ea8d40d3be42c77ef414adf211e7b Mon Sep 17 00:00:00 2001 From: godyangfight Date: Fri, 14 Jan 2022 10:39:14 +0800 Subject: [PATCH] Fix physical incremental backup reuse trans sstable error --- src/storage/ob_partition_base_data_backup.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/storage/ob_partition_base_data_backup.cpp b/src/storage/ob_partition_base_data_backup.cpp index 43707813b4..6c77d65bdb 100644 --- a/src/storage/ob_partition_base_data_backup.cpp +++ b/src/storage/ob_partition_base_data_backup.cpp @@ -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_.data_version_ = full_meta.meta_->data_version_; 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; } else { switch (backup_arg.backup_type_) { @@ -3743,7 +3743,7 @@ int ObBackupCopyPhysicalTask::reuse_block_index( } else if (OB_UNLIKELY(cur_index.data_length_ > 0)) { ret = OB_INIT_TWICE; 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; 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))) { -- GitLab