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

Fix restore deleted tablet return 4002

Browse Source
This commit is contained in:
obdev
2022-10-31 04:07:35 +00:00
committed by wangzelin.wzl
parent aa849cc001
commit be4a3a5809
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/storage/high_availability/ob_tablet_group_restore.cpp
View File

@ -116,8 +116,11 @@ ObTabletRestoreCtx::~ObTabletRestoreCtx()
bool ObTabletRestoreCtx::is_valid() const bool ObTabletRestoreCtx::is_valid() const
{ {
return tenant_id_ != OB_INVALID_ID && ls_id_.is_valid() && tablet_id_.is_valid() && tablet_handle_.is_valid() return tenant_id_ != OB_INVALID_ID && ls_id_.is_valid() && tablet_id_.is_valid()
&& ObCopyTabletStatus::is_valid(status_) && OB_NOT_NULL(restore_base_info_) && ObCopyTabletStatus::is_valid(status_)
&& ((ObCopyTabletStatus::TABLET_EXIST == status_ && tablet_handle_.is_valid())
|| ObCopyTabletStatus::TABLET_NOT_EXIST == status_)
&& OB_NOT_NULL(restore_base_info_)
&& ObTabletRestoreAction::is_valid(action_) && ObTabletRestoreAction::is_valid(action_)
&& (!is_leader_ || OB_NOT_NULL(second_meta_index_store_)) && (!is_leader_ || OB_NOT_NULL(second_meta_index_store_))
&& ObReplicaTypeCheck::is_replica_type_valid(replica_type_) && ObReplicaTypeCheck::is_replica_type_valid(replica_type_)
@ -1863,7 +1866,7 @@ int ObTabletRestoreDag::inner_reset_status_for_retry()
} else { } else {
LOG_INFO("start retry", KPC(this)); LOG_INFO("start retry", KPC(this));
result_mgr_.reuse(); result_mgr_.reuse();
if (OB_SSTABLE_NOT_EXIST == result && !tablet_restore_ctx_.is_leader_) { if (!tablet_restore_ctx_.is_leader_) {
if (OB_FAIL(tablet_restore_ctx_.ha_table_info_mgr_->remove_tablet_table_info(tablet_restore_ctx_.tablet_id_))) { if (OB_FAIL(tablet_restore_ctx_.ha_table_info_mgr_->remove_tablet_table_info(tablet_restore_ctx_.tablet_id_))) {
LOG_WARN("failed to remove tablet info", K(ret), K(tablet_restore_ctx_)); LOG_WARN("failed to remove tablet info", K(ret), K(tablet_restore_ctx_));
} }