[FEAT MERGE] Fix the error code loss and overwriting issues on the master branch

Co-authored-by: jingtaoye35 <1255153887@qq.com>
Co-authored-by: fkuner <784819644@qq.com>
Co-authored-by: lucky-sinx <2549261744@qq.com>
This commit is contained in:
hwx65
2024-06-17 13:46:15 +00:00
committed by ob-robot
parent 020eae1d2b
commit da5aece3e1
266 changed files with 661 additions and 347 deletions

View File

@ -1006,6 +1006,7 @@ int ObOperator::try_deregister_rt_monitor_node()
&& ctx_.is_rt_monitor_node_registered()) {
ObPlanMonitorNodeList *list = MTL(ObPlanMonitorNodeList*);
if (OB_ISNULL(list)) {
// ignore ret
LOG_WARN("fail to revert monitor node", K(list));
} else if (OB_FAIL(list->revert_monitor_node(op_monitor_info_))) {
LOG_ERROR("fail to revert monitor node", K(ret), K(op_monitor_info_));