From cd098b930ae89936b002080c3fb3eb87d6043d96 Mon Sep 17 00:00:00 2001 From: LoLolobster <949673574@qq.com> Date: Tue, 19 Nov 2024 18:16:29 +0000 Subject: [PATCH] fix tenant restore data mode is not updated in SS restore --- src/rootserver/restore/ob_restore_scheduler.cpp | 6 +----- src/storage/restore/ob_tenant_restore_info_mgr.cpp | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/rootserver/restore/ob_restore_scheduler.cpp b/src/rootserver/restore/ob_restore_scheduler.cpp index 98db72841..5a515f43d 100644 --- a/src/rootserver/restore/ob_restore_scheduler.cpp +++ b/src/rootserver/restore/ob_restore_scheduler.cpp @@ -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(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(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_, diff --git a/src/storage/restore/ob_tenant_restore_info_mgr.cpp b/src/storage/restore/ob_tenant_restore_info_mgr.cpp index 4f8a436b8..9e79891db 100644 --- a/src/storage/restore/ob_tenant_restore_info_mgr.cpp +++ b/src/storage/restore/ob_tenant_restore_info_mgr.cpp @@ -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));