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

fix tenant restore data mode is not updated in SS restore

Browse Source
This commit is contained in:
LoLolobster 2024-11-19 18:16:29 +00:00 committed by ob-robot
parent a0fad7ed1a
commit cd098b930a
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/rootserver/restore/ob_restore_scheduler.cpp
View File

@ -427,9 +427,7 @@ int ObRestoreScheduler::restore_pre(const ObPhysicalRestoreJob &job_info)
}
} else if (!is_sys_ready) { // sys job not in WAIT_RETSTORE_TENANT_FINISH state
ret = OB_EAGAIN;
} else if (share::ObBackupSetFileDesc::is_allow_quick_restore(
static_cast<share::ObBackupSetFileDesc::Compatible>(job_info.get_backup_compatible()))
&& OB_FAIL(update_tenant_restore_data_mode_to_remote_(tenant_id_))) {
} else if (OB_FAIL(update_tenant_restore_data_mode_to_remote_(tenant_id_))) {
LOG_WARN("fail to update tenant restore data mode to REMOTE", K(ret), K_(tenant_id));
} else if (OB_FAIL(restore_root_key(job_info))) {
LOG_WARN("fail to restore root key", K(ret));
@ -668,8 +666,6 @@ int ObRestoreScheduler::post_check(const ObPhysicalRestoreJob &job_info)
} else if (OB_FAIL(restore_service_->check_stop())) {
LOG_WARN("restore scheduler stopped", K(ret));
} else if (job_info.get_restore_type().is_full_restore()
&& share::ObBackupSetFileDesc::is_allow_quick_restore(
static_cast<share::ObBackupSetFileDesc::Compatible>(job_info.get_backup_compatible()))
&& OB_FAIL(update_tenant_restore_data_mode_to_normal_(tenant_id_))) {
LOG_WARN("fail to update tenant restore data mode to NORMAL", K(ret), K_(tenant_id));
} else if (OB_FAIL(ObRestoreCommonUtil::try_update_tenant_role(sql_proxy_, tenant_id_,

4
src/storage/restore/ob_tenant_restore_info_mgr.cpp
View File

@ -208,8 +208,8 @@ int ObTenantRestoreInfoMgr::get_backup_dest(const int64_t backup_set_id, share::
} else if (OB_FAIL(tenant_info_loader->get_restore_data_mode(restore_data_mode))) {
LOG_WARN("fail to get restore data mode", K(ret), K_(tenant_id));
} else if (!restore_data_mode.is_remote_mode()) {
ret = OB_ERR_UNEXPECTED;
LOG_WARN("restore data mode is not REMOTE, tenant should not have any backup data", K(ret), K_(tenant_id));
ret = OB_BACKUP_IO_PROHIBITED;
LOG_WARN("restore data mode is not REMOTE, tenant should not have any backup IO", K(ret), K_(tenant_id));
} else if (!is_refreshed_) {
ret = OB_EAGAIN;
LOG_WARN("restore info has not been refreshed", K(ret), K(backup_set_id));