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

[CP] [4.1] fix remote plan execute timeout serval bugs

Browse Source
This commit is contained in:
chinaxing
2023-06-16 07:42:18 +00:00
committed by ob-robot
parent ab5a6d490b
commit 98078bdc41
15 changed files with 111 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/sql/executor/ob_remote_scheduler.cpp
View File

@ -253,7 +253,8 @@ int ObRemoteScheduler::execute_with_sql(ObExecContext &ctx, ObPhysicalPlan *phy_
session,
has_sent_task,
has_transfer_err,
phy_plan);
phy_plan,
ctx);
NG_TRACE_EXT(remote_task_completed, OB_ID(ret), ret,
OB_ID(runner_svr), task.get_runner_svr(), OB_ID(task), task);
// 说明：本函数返回后，最终控制权会进入到ObDirectReceive中,

37
src/sql/executor/ob_remote_task_executor.cpp
View File

@ -102,7 +102,8 @@ int ObRemoteTaskExecutor::execute(ObExecContext &query_ctx, ObJob *job, ObTaskIn
session,
has_sent_task,
has_transfer_err,
plan_ctx->get_phy_plan());
plan_ctx->get_phy_plan(),
query_ctx);
ret = COVER_SUCC(tmp_ret);
if (OB_SUCC(ret)) {
@ -177,7 +178,8 @@ int ObRemoteTaskExecutor::handle_tx_after_rpc(ObScanner *scanner,
ObSQLSessionInfo *session,
const bool has_sent_task,
const bool has_transfer_err,
const ObPhysicalPlan *phy_plan)
const ObPhysicalPlan *phy_plan,
ObExecContext &exec_ctx)
{
int ret = OB_SUCCESS;
auto tx_desc = session->get_tx_desc();
@ -204,17 +206,26 @@ int ObRemoteTaskExecutor::handle_tx_after_rpc(ObScanner *scanner,
K(tx_desc));
}
if (has_transfer_err || OB_FAIL(ret)) {
// report Unknown of tx participant involved
LOG_WARN("remote execute fail with transfer_error, tx will rollback");
session->get_trans_result().set_incomplete();
// TODO: yunxing.cyx
// get the remote LSID and report to transaction let tx continue
/* share::ObLSID ls_id = xxx;
if (OB_FAIL(MTL(transaction::ObTransService*)
->add_unknown_tx_exec_part(*tx_desc,
ls_id))) {
LOG_WARN("report tx unknown part fail", K(ret), K(ls_id));
} */
if (exec_ctx.use_remote_sql()) {
LOG_WARN("remote execute use sql fail with transfer_error, tx will rollback", K(ret));
session->get_trans_result().set_incomplete();
} else {
ObDASCtx &das_ctx = DAS_CTX(exec_ctx);
share::ObLSArray ls_ids;
int tmp_ret = OB_SUCCESS;
if (OB_TMP_FAIL(das_ctx.get_all_lsid(ls_ids))) {
LOG_WARN("get all ls_ids failed", K(tmp_ret));
} else if (OB_TMP_FAIL(session->get_trans_result().add_touched_ls(ls_ids))) {
LOG_WARN("add touched ls to txn failed", K(tmp_ret));
} else {
LOG_INFO("add touched ls succ", K(ls_ids));
}
if (OB_TMP_FAIL(tmp_ret)) {
LOG_WARN("remote execute use plan fail with transfer_error and try add touched ls failed, tx will rollback", K(tmp_ret));
session->get_trans_result().set_incomplete();
ret = COVER_SUCC(tmp_ret);
}
}
}
}
return ret;

3
src/sql/executor/ob_remote_task_executor.h
View File

@ -34,7 +34,8 @@ public:
ObSQLSessionInfo *session,
const bool has_sent_task,
const bool has_transfer_err,
const ObPhysicalPlan *phy_plan);
const ObPhysicalPlan *phy_plan,
ObExecContext &exec_ctx);
private:
int build_task(ObExecContext &query_ctx,
ObJob &job,