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

fix backup defend issue

Browse Source
This commit is contained in:
obdev
2022-10-30 14:05:08 +00:00
committed by wangzelin.wzl
parent c70b8a05df
commit ae138ca6d8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/storage/backup/ob_backup_task.cpp
View File

@ -3993,7 +3993,6 @@ int ObLSBackupPrepareTask::get_tablet_min_filled_tx_log_ts_(
} else if (tablet->get_tablet_meta().tablet_id_.is_ls_inner_tablet()) { } else if (tablet->get_tablet_meta().tablet_id_.is_ls_inner_tablet()) {
// skip inner tablet // skip inner tablet
} else { } else {
min_filled_tx_log_ts = tablet->get_tablet_meta().clog_checkpoint_ts_;
ObTabletTableStore &table_store = tablet->get_table_store(); ObTabletTableStore &table_store = tablet->get_table_store();
const ObSSTableArray &sstable_array = table_store.get_minor_sstables(); const ObSSTableArray &sstable_array = table_store.get_minor_sstables();
has_minor_sstable = !sstable_array.empty(); has_minor_sstable = !sstable_array.empty();
@ -4008,7 +4007,8 @@ int ObLSBackupPrepareTask::get_tablet_min_filled_tx_log_ts_(
LOG_WARN("table ptr type not expectedd", K(ret)); LOG_WARN("table ptr type not expectedd", K(ret));
} else if (FALSE_IT(sstable = static_cast<ObSSTable *>(table_ptr))) { } else if (FALSE_IT(sstable = static_cast<ObSSTable *>(table_ptr))) {
} else { } else {
min_filled_tx_log_ts = std::min(sstable->get_meta().get_basic_meta().filled_tx_log_ts_, min_filled_tx_log_ts); min_filled_tx_log_ts = std::min(
std::max(sstable->get_meta().get_basic_meta().filled_tx_log_ts_, sstable->get_end_log_ts()), min_filled_tx_log_ts);
} }
} }
} }

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

@ -252,7 +252,7 @@ int ObBackupUtils::check_tablet_minor_sstable_validity_(const storage::ObTabletH
LOG_WARN("table ptr not correct", K(ret), KPC(last_table_ptr)); LOG_WARN("table ptr not correct", K(ret), KPC(last_table_ptr));
} else { } else {
const ObITable::TableKey &table_key = last_table_ptr->get_key(); const ObITable::TableKey &table_key = last_table_ptr->get_key();
if (table_key.get_end_log_ts() != clog_checkpoint_ts) { if (table_key.get_end_log_ts() < clog_checkpoint_ts) {
ret = OB_ERR_UNEXPECTED; ret = OB_ERR_UNEXPECTED;
LOG_ERROR("tablet meta is not valid", K(ret), K(table_key), K(clog_checkpoint_ts)); LOG_ERROR("tablet meta is not valid", K(ret), K(table_key), K(clog_checkpoint_ts));
} }