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

fix truncate_table retry error code and fix farm case

Browse Source
This commit is contained in:
obdev
2023-02-24 15:30:56 +00:00
committed by ob-robot
parent 52c378f215
commit 80ac15ef69
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/objit/include/objit/common/ob_item_type.h
View File

@ -1650,6 +1650,7 @@ typedef enum ObItemType
T_RANDOM,
T_TABLEGROUP_ID,
T_TABLEGROUP_BINDING,
T_TABLEGROUP_SHARDING,
T_MAX_USED_PART_ID,
T_TENANT_ID,

2
src/sql/engine/cmd/ob_table_executor.cpp
View File

@ -1720,7 +1720,7 @@ int ObTruncateTableExecutor::execute(ObExecContext &ctx, ObTruncateTableStmt &st
while (OB_SUCC(ret)) {
if (OB_FAIL(common_rpc_proxy->truncate_table_v2(truncate_table_arg, res))) {
LOG_WARN("rpc proxy truncate table failed", K(ret));
if ((OB_TRY_LOCK_ROW_CONFLICT == ret || OB_TIMEOUT == ret) && ctx.get_timeout() > 0) {
if ((OB_TRY_LOCK_ROW_CONFLICT == ret || OB_TIMEOUT == ret || OB_NOT_MASTER == ret || OB_RS_NOT_MASTER == ret) && ctx.get_timeout() > 0) {
ob_usleep(1 * 1000 * 1000);
// retry
ret = OB_SUCCESS;