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

Handling the issue of 4662 masking the real error code.

Browse Source
This commit is contained in:
qingsuijiu 2024-03-13 14:20:17 +00:00 committed by ob-robot
parent b48a55c631
commit cbe814d99d
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/sql/engine/px/exchange/ob_px_fifo_coord_op.cpp
View File

@ -245,7 +245,8 @@ int ObPxFifoCoordOp::fetch_rows(const int64_t row_cnt)
} else if (OB_UNLIKELY(OB_SUCCESS != ret)) {
int ret_terminate = terminate_running_dfos(coord_info_.dfo_mgr_);
LOG_WARN("QC get error code", K(ret), K(ret_terminate));
if (OB_ERR_SIGNALED_IN_PARALLEL_QUERY_SERVER == ret
if ((OB_ERR_SIGNALED_IN_PARALLEL_QUERY_SERVER == ret
|| OB_GOT_SIGNAL_ABORTING == ret)
&& OB_SUCCESS != ret_terminate) {
ret = ret_terminate;
}

3
src/sql/engine/px/exchange/ob_px_ms_coord_op.cpp
View File

@ -441,7 +441,8 @@ int ObPxMSCoordOp::inner_get_next_row()
} else if (OB_UNLIKELY(OB_SUCCESS != ret)) {
int ret_terminate = terminate_running_dfos(coord_info_.dfo_mgr_);
LOG_WARN("QC get error code", K(ret), K(ret_terminate));
if (OB_ERR_SIGNALED_IN_PARALLEL_QUERY_SERVER == ret
if ((OB_ERR_SIGNALED_IN_PARALLEL_QUERY_SERVER == ret
|| OB_GOT_SIGNAL_ABORTING == ret)
&& OB_SUCCESS != ret_terminate) {
ret = ret_terminate;
}

3
src/sql/engine/px/exchange/ob_px_ms_coord_vec_op.cpp
View File

@ -490,7 +490,8 @@ int ObPxMSCoordVecOp::next_row(const bool need_store_output)
} else if (OB_UNLIKELY(OB_SUCCESS != ret)) {
int ret_terminate = terminate_running_dfos(coord_info_.dfo_mgr_);
LOG_WARN("QC get error code", K(ret), K(ret_terminate));
if (OB_ERR_SIGNALED_IN_PARALLEL_QUERY_SERVER == ret
if ((OB_ERR_SIGNALED_IN_PARALLEL_QUERY_SERVER == ret
|| OB_GOT_SIGNAL_ABORTING == ret)
&& OB_SUCCESS != ret_terminate) {
ret = ret_terminate;
}

6
src/sql/engine/px/exchange/ob_px_ordered_coord_op.cpp
View File

@ -258,7 +258,8 @@ int ObPxOrderedCoordOp::inner_get_next_row()
} else if (OB_UNLIKELY(OB_SUCCESS != ret)) {
int ret_terminate = terminate_running_dfos(coord_info_.dfo_mgr_);
LOG_WARN("QC get error code", K(ret), K(ret_terminate));
if (OB_ERR_SIGNALED_IN_PARALLEL_QUERY_SERVER == ret
if ((OB_ERR_SIGNALED_IN_PARALLEL_QUERY_SERVER == ret
|| OB_GOT_SIGNAL_ABORTING == ret)
&& OB_SUCCESS != ret_terminate) {
ret = ret_terminate;
}
@ -420,7 +421,8 @@ int ObPxOrderedCoordOp::inner_get_next_batch(const int64_t max_row_cnt)
if (OB_UNLIKELY(OB_SUCCESS != ret)) {
int ret_terminate = terminate_running_dfos(coord_info_.dfo_mgr_);
LOG_WARN("QC get error code", K(ret), K(ret_terminate));
if (OB_ERR_SIGNALED_IN_PARALLEL_QUERY_SERVER == ret
if ((OB_ERR_SIGNALED_IN_PARALLEL_QUERY_SERVER == ret
|| OB_GOT_SIGNAL_ABORTING == ret)
&& OB_SUCCESS != ret_terminate) {
ret = ret_terminate;
}