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

fix drop index task continually reports 4007 when cancelling it.

Browse Source
This commit is contained in:
obdev
2022-11-08 07:35:36 +00:00
committed by wangzelin.wzl
parent 5a7d53fa60
commit e7d1b14fca
9 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/sql/engine/cmd/ob_ddl_executor_util.cpp
View File

@ -48,7 +48,8 @@ int ObDDLExecutorUtil::wait_ddl_finish(
const uint64_t tenant_id,
const int64_t task_id,
ObSQLSessionInfo &session,
obrpc::ObCommonRpcProxy *common_rpc_proxy)
obrpc::ObCommonRpcProxy *common_rpc_proxy,
const bool is_support_cancel)
{
int ret = OB_SUCCESS;
const int64_t retry_interval = 100 * 1000;
@ -70,8 +71,8 @@ int ObDDLExecutorUtil::wait_ddl_finish(
}
break;
} else if (OB_FAIL(handle_session_exception(session))) {
LOG_WARN("session exeception happened", K(ret));
if (OB_FAIL(cancel_ddl_task(tenant_id, common_rpc_proxy))) {
LOG_WARN("session exeception happened", K(ret), K(is_support_cancel));
if (is_support_cancel && OB_FAIL(cancel_ddl_task(tenant_id, common_rpc_proxy))) {
LOG_WARN("cancel ddl task failed", K(ret));
} else {
break;