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

[CP] fix 3 restore related bugs

Browse Source
This commit is contained in:
wxhwang
2024-02-06 21:14:11 +00:00
committed by ob-robot
parent 18221b406e
commit 8926d71ea1
11 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/storage/ls/ob_ls_tablet_service.cpp
View File

@ -1522,7 +1522,8 @@ int ObLSTabletService::update_tablet_snapshot_version(
int ObLSTabletService::update_tablet_restore_status(
const common::ObTabletID &tablet_id,
const ObTabletRestoreStatus::STATUS &restore_status)
const ObTabletRestoreStatus::STATUS &restore_status,
const bool need_reset_transfer_flag)
{
int ret = OB_SUCCESS;
ObTabletHandle tablet_handle;
@ -1559,7 +1560,7 @@ int ObLSTabletService::update_tablet_restore_status(
LOG_WARN("can not change restore status", K(ret), K(current_status), K(restore_status), KPC(tablet));
} else if (OB_FAIL(tablet->tablet_meta_.ha_status_.set_restore_status(restore_status))) {
LOG_WARN("failed to set restore status", K(ret), K(restore_status), KPC(tablet));
} else if (restore_status == ObTabletRestoreStatus::UNDEFINED
} else if (need_reset_transfer_flag
&& OB_FALSE_IT((void)tablet->tablet_meta_.reset_transfer_table())) {
} else {
// TODO(jiahua.cjh) move check valid to tablet init after generate new version tablet.
@ -1572,7 +1573,7 @@ int ObLSTabletService::update_tablet_restore_status(
} else if (OB_FAIL(safe_update_cas_tablet(key, disk_addr, tablet_handle, new_tablet_handle, time_guard))) {
LOG_WARN("fail to update tablet", K(ret), K(key), K(disk_addr));
} else {
LOG_INFO("succeeded to build new tablet", K(ret), K(key), K(disk_addr), K(restore_status), K(tablet_handle));
LOG_INFO("succeeded to build new tablet", K(ret), K(key), K(disk_addr), K(restore_status), K(need_reset_transfer_flag), K(tablet_handle));
}
if (OB_FAIL(ret)) {