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

purge timeout is not suitable

Browse Source
This commit is contained in:
obdev 2023-01-02 12:38:27 +00:00 committed by ob-robot
parent 2c8c28887f
commit 4bd0c6351a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/rootserver/ob_root_service.cpp
View File

@ -9545,7 +9545,8 @@ int ObRootService::purge_recyclebin_objects(int64_t purge_each_time)
while (OB_SUCC(ret) && in_service() && purge_sum > 0) {
int64_t start_time = ObTimeUtility::current_time();
arg.purge_num_ = purge_sum > PURGE_EACH_RPC ? PURGE_EACH_RPC : purge_sum;
if (OB_FAIL(common_proxy_.purge_expire_recycle_objects(arg, affected_rows))) {
// replcace timeout from hardcode 9s to 10 * GCONF.rpc_timeout
if (OB_FAIL(common_proxy_.timeout(10 * GCONF.rpc_timeout).purge_expire_recycle_objects(arg, affected_rows))) {
LOG_WARN("purge reyclebin objects failed", KR(ret),
K(current_time), K(expire_time), K(affected_rows), K(arg));
} else {

3
src/sql/engine/cmd/ob_tenant_executor.cpp
View File

@ -832,7 +832,8 @@ int ObPurgeRecycleBinExecutor::execute(ObExecContext &ctx, ObPurgeRecycleBinStmt
//一个租户只purge 10个回收站的对象，防止卡住RS的ddl线程
//每次返回purge的行数，只有purge数目少于affected_rows
int64_t start_time = ObTimeUtility::current_time();
if (OB_FAIL(common_rpc_proxy->purge_expire_recycle_objects(purge_recyclebin_arg, affected_rows))) {
// replcace timeout from hardcode 9s to 10 * GCONF.rpc_timeout
if (OB_FAIL(common_rpc_proxy->timeout(10 * GCONF.rpc_timeout).purge_expire_recycle_objects(purge_recyclebin_arg, affected_rows))) {
LOG_WARN("purge reyclebin objects failed", K(ret), K(affected_rows), K(purge_recyclebin_arg));
//如果失败情况下，不需要继续
is_tenant_finish = false;