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

fix restore failed without key backup

Browse Source
This commit is contained in:
yinyj17
2024-02-09 02:10:09 +00:00
committed by ob-robot
parent f67db3c34f
commit 970ba22207
1 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -515,8 +515,7 @@ int ObRestoreScheduler::convert_tde_parameters(
} else if (OB_FAIL(sql_proxy_->write(tenant_id, sql.ptr(), affected_row))) { } else if (OB_FAIL(sql_proxy_->write(tenant_id, sql.ptr(), affected_row))) {
LOG_WARN("failed to execute", K(ret), K(affected_row), K(sql)); LOG_WARN("failed to execute", K(ret), K(affected_row), K(sql));
} }
} if (OB_SUCC(ret) && ObTdeMethodUtil::is_valid(tde_method)) {
if (OB_SUCC(ret)) {
const int64_t DEFAULT_TIMEOUT = GCONF.internal_sql_execute_timeout; const int64_t DEFAULT_TIMEOUT = GCONF.internal_sql_execute_timeout;
obrpc::ObReloadMasterKeyArg arg; obrpc::ObReloadMasterKeyArg arg;
obrpc::ObReloadMasterKeyResult result; obrpc::ObReloadMasterKeyResult result;
@ -551,6 +550,7 @@ int ObRestoreScheduler::convert_tde_parameters(
} }
} }
} }
}
#endif #endif
return ret; return ret;
} }