hcq/oceanbase
1
0
Fork 0
Code Issues Pull Requests Actions 2 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

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

@ -515,38 +515,38 @@ 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; arg.tenant_id_ = tenant_id;
arg.tenant_id_ = tenant_id; if (OB_FAIL(rpc_proxy_->timeout(DEFAULT_TIMEOUT).reload_master_key(arg, result))) {
if (OB_FAIL(rpc_proxy_->timeout(DEFAULT_TIMEOUT).reload_master_key(arg, result))) { LOG_WARN("fail to reload master key", K(ret), K(arg), K(DEFAULT_TIMEOUT));
LOG_WARN("fail to reload master key", K(ret), K(arg), K(DEFAULT_TIMEOUT)); } else if (result.master_key_id_ > 0 ) {
} else if (result.master_key_id_ > 0 ) { bool is_active = false;
bool is_active = false; const int64_t SLEEP_US = 5 * 1000 * 1000L; // 5s
const int64_t SLEEP_US = 5 * 1000 * 1000L; // 5s const int64_t MAX_WAIT_US = 60 * 1000 * 1000L; // 60s
const int64_t MAX_WAIT_US = 60 * 1000 * 1000L; // 60s const int64_t start = ObTimeUtility::current_time();
const int64_t start = ObTimeUtility::current_time(); char master_key[OB_MAX_MASTER_KEY_LENGTH];
char master_key[OB_MAX_MASTER_KEY_LENGTH]; int64_t master_key_len = 0;
int64_t master_key_len = 0; uint64_t master_key_id = 0;
uint64_t master_key_id = 0; while (OB_SUCC(ret) && !is_active) {
while (OB_SUCC(ret) && !is_active) { if (ObTimeUtility::current_time() - start > MAX_WAIT_US) {
if (ObTimeUtility::current_time() - start > MAX_WAIT_US) { ret = OB_TIMEOUT;
ret = OB_TIMEOUT; LOG_WARN("use too much time", K(ret), "cost_us", ObTimeUtility::current_time() - start);
LOG_WARN("use too much time", K(ret), "cost_us", ObTimeUtility::current_time() - start); } else if (OB_FAIL(ObMasterKeyGetter::get_active_master_key(tenant_id, master_key,
} else if (OB_FAIL(ObMasterKeyGetter::get_active_master_key(tenant_id, master_key, OB_MAX_MASTER_KEY_LENGTH,
OB_MAX_MASTER_KEY_LENGTH, master_key_len, master_key_id))) {
master_key_len, master_key_id))) { if (OB_KEYSTORE_OPEN_NO_MASTER_KEY == ret) {
if (OB_KEYSTORE_OPEN_NO_MASTER_KEY == ret) { ret = OB_SUCCESS;
ret = OB_SUCCESS; LOG_INFO("master key is not active, need wait", K(tenant_id));
LOG_INFO("master key is not active, need wait", K(tenant_id)); usleep(SLEEP_US);
usleep(SLEEP_US); } else {
LOG_WARN("fail to get active master key", K(tenant_id));
}
} else { } else {
LOG_WARN("fail to get active master key", K(tenant_id)); is_active = true;
} }
} else {
is_active = true;
} }
} }
} }