[fix](pipeline) failure if memory is not enough

dataroaring · Jun 8, 2024 · 4164c18 · 4164c18
1 parent 1a2c4bc
commit 4164c18
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/be/src/pipeline/pipeline_fragment_context.cpp b/be/src/pipeline/pipeline_fragment_context.cpp
@@ -337,13 +337,13 @@ Status PipelineFragmentContext::prepare(const doris::TPipelineFragmentParams& re
     for (PipelinePtr& pipeline : _pipelines) {
         SCOPED_TIMER(_prepare_all_pipelines_timer);
         pipeline->children().clear();
-        RETURN_IF_ERROR(pipeline->prepare(_runtime_state.get()));
+        RETURN_IF_ERROR_OR_CATCH_EXCEPTION(pipeline->prepare(_runtime_state.get()));
     }
 
     {
         SCOPED_TIMER(_build_tasks_timer);
         // 5. Build pipeline tasks and initialize local state.
-        RETURN_IF_ERROR(_build_pipeline_tasks(request));
+        RETURN_IF_ERROR_OR_CATCH_EXCEPTION(_build_pipeline_tasks(request));
     }
 
     _init_next_report_time();

diff --git a/be/src/pipeline/pipeline_task.cpp b/be/src/pipeline/pipeline_task.cpp
@@ -302,7 +302,7 @@ Status PipelineTask::execute(bool* eos) {
     }
     // The status must be runnable
     if (!_opened && !_fragment_context->is_canceled()) {
-        RETURN_IF_ERROR(_open());
+        RETURN_IF_ERROR_OR_CATCH_EXCEPTION(_open());
     }
 
     while (!_fragment_context->is_canceled()) {

diff --git a/be/src/vec/exprs/vexpr.cpp b/be/src/vec/exprs/vexpr.cpp
@@ -343,7 +343,7 @@ Status VExpr::create_tree_from_thrift(const std::vector<TExprNode>& nodes, int*
     // create root expr
     int root_children = nodes[*node_idx].num_children;
     VExprSPtr root;
-    RETURN_IF_ERROR(create_expr(nodes[*node_idx], root));
+    RETURN_IF_ERROR_OR_CATCH_EXCEPTION(create_expr(nodes[*node_idx], root));
     DCHECK(root != nullptr);
     root_expr = root;
     ctx = std::make_shared<VExprContext>(root);
@@ -367,7 +367,7 @@ Status VExpr::create_tree_from_thrift(const std::vector<TExprNode>& nodes, int*
             return Status::InternalError("Failed to reconstruct expression tree from thrift.");
         }
         VExprSPtr expr;
-        RETURN_IF_ERROR(create_expr(nodes[*node_idx], expr));
+        RETURN_IF_ERROR_OR_CATCH_EXCEPTION(create_expr(nodes[*node_idx], expr));
         DCHECK(expr != nullptr);
         parent.first->add_child(expr);
         int num_children = nodes[*node_idx].num_children;