fix restore failed without key backup

2024-02-09 02:10:09 +00:00
parent f67db3c34f
commit 970ba22207
1 changed files with 30 additions and 30 deletions
--- a/src/rootserver/restore/ob_restore_scheduler.cpp
+++ b/src/rootserver/restore/ob_restore_scheduler.cpp
@ -515,8 +515,7 @@ int ObRestoreScheduler::convert_tde_parameters(
    } 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));
    }
-  }
-  if (OB_SUCC(ret)) {
+    if (OB_SUCC(ret) && ObTdeMethodUtil::is_valid(tde_method)) {
      const int64_t DEFAULT_TIMEOUT = GCONF.internal_sql_execute_timeout;
      obrpc::ObReloadMasterKeyArg arg;
      obrpc::ObReloadMasterKeyResult result;
@ -551,6 +550,7 @@ int ObRestoreScheduler::convert_tde_parameters(
        }
      }
    }
+  }
 #endif
  return ret;
 }