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

fix bug: overwrite error code unexpectedly

Browse Source
This commit is contained in:
obdev
2023-05-04 13:49:00 +00:00
committed by ob-robot
parent 852f728be0
commit c8f708f64d
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/sql/engine/px/ob_dfo_scheduler.cpp
View File

@ -1155,11 +1155,12 @@ int ObParallelDfoScheduler::dispatch_sqc(ObExecContext &exec_ctx,
OB_SUCCESS == cb->get_result().rc_) { OB_SUCCESS == cb->get_result().rc_) {
sqc.set_need_report(true); sqc.set_need_report(true);
ObPeerTaskState peer_state(sqc.get_sqc_addr()); ObPeerTaskState peer_state(sqc.get_sqc_addr());
if (OB_FAIL(peer_states.push_back(peer_state))) { int push_ret = OB_SUCCESS;
LOG_WARN("[DM] fail to push back", K(ret), K(sqc.get_sqc_addr()), if (OB_SUCCESS != (push_ret = peer_states.push_back(peer_state))) {
LOG_WARN("[DM] fail to push back", K(push_ret), K(sqc.get_sqc_addr()),
K(dfo.get_px_detectable_ids().sqc_detectable_id_)); K(dfo.get_px_detectable_ids().sqc_detectable_id_));
} else if (OB_FAIL(dtl_channels.push_back(sqc.get_qc_channel()))) { } else if (OB_SUCCESS != (push_ret = dtl_channels.push_back(sqc.get_qc_channel()))) {
LOG_WARN("[DM] fail to push back dtl channels", K(ret), K(sqc.get_sqc_addr()), LOG_WARN("[DM] fail to push back dtl channels", K(push_ret), K(sqc.get_sqc_addr()),
K(dfo.get_px_detectable_ids().sqc_detectable_id_)); K(dfo.get_px_detectable_ids().sqc_detectable_id_));
} }
} else if (!cb->is_processed()) { } else if (!cb->is_processed()) {
@ -1190,11 +1191,12 @@ int ObParallelDfoScheduler::dispatch_sqc(ObExecContext &exec_ctx,
ObPxSqcMeta &sqc = *sqcs.at(idx); ObPxSqcMeta &sqc = *sqcs.at(idx);
sqc.set_need_report(true); sqc.set_need_report(true);
ObPeerTaskState peer_state(sqc.get_sqc_addr()); ObPeerTaskState peer_state(sqc.get_sqc_addr());
if (OB_FAIL(peer_states.push_back(peer_state))) { int push_ret = OB_SUCCESS;
LOG_WARN("[DM] fail to push back", K(ret), K(sqc.get_sqc_addr()), if (OB_SUCCESS != (push_ret = peer_states.push_back(peer_state))) {
LOG_WARN("[DM] fail to push back", K(push_ret), K(sqc.get_sqc_addr()),
K(dfo.get_px_detectable_ids().sqc_detectable_id_)); K(dfo.get_px_detectable_ids().sqc_detectable_id_));
} else if (OB_FAIL(dtl_channels.push_back(sqc.get_qc_channel()))) { } else if (OB_SUCCESS != (push_ret = dtl_channels.push_back(sqc.get_qc_channel()))) {
LOG_WARN("[DM] fail to push back dtl channels", K(ret), K(sqc.get_sqc_addr()), LOG_WARN("[DM] fail to push back dtl channels", K(push_ret), K(sqc.get_sqc_addr()),
K(dfo.get_px_detectable_ids().sqc_detectable_id_)); K(dfo.get_px_detectable_ids().sqc_detectable_id_));
} }