[doris] branch branch-1.1-lts updated: [branch-1.1](fix) avoid fatal log (#13955)

[yiguolei]

This is an automated email from the ASF dual-hosted git repository.

yiguolei pushed a commit to branch branch-1.1-lts
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-1.1-lts by this push:
     new 113019999c [branch-1.1](fix) avoid fatal log (#13955)
113019999c is described below

commit 113019999c0056d1b95c777aa773fb0e355bcaef
Author: Mingyu Chen <morning...@163.com>
AuthorDate: Fri Nov 4 08:39:59 2022 +0800

    [branch-1.1](fix) avoid fatal log (#13955)
---
 be/src/exec/olap_scan_node.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/be/src/exec/olap_scan_node.cpp b/be/src/exec/olap_scan_node.cpp
index 7cf508f2f3..d9c0506ce5 100644
--- a/be/src/exec/olap_scan_node.cpp
+++ b/be/src/exec/olap_scan_node.cpp
@@ -1451,11 +1451,16 @@ void OlapScanNode::transfer_thread(RuntimeState* state) 
{
                     COUNTER_UPDATE(_scanner_sched_counter, 1);
                     olap_scanners.erase(iter++);
                 } else {
-                    LOG(FATAL) << "Failed to assign scanner task to thread 
pool! "
-                               << s.get_error_msg();
+                    status = Status::InternalError("Failed to assign scanner 
task to thread pool! " + s.get_error_msg());
+                    std::lock_guard<SpinLock> guard(_status_mutex);
+                    _status = status;
+                    break;
                 }
                 ++_total_assign_num;
             }
+            if (!status.ok()) {
+                break;
+            }
         } else {
             while (iter != olap_scanners.end()) {
                 PriorityThreadPool::Task task;
@@ -1467,10 +1472,16 @@ void OlapScanNode::transfer_thread(RuntimeState* state) 
{
                 if (thread_pool->offer(task)) {
                     olap_scanners.erase(iter++);
                 } else {
-                    LOG(FATAL) << "Failed to assign scanner task to thread 
pool!";
+                    status = Status::InternalError("Failed to assign scanner 
task to thread pool! ");
+                    std::lock_guard<SpinLock> guard(_status_mutex);
+                    _status = status;
+                    break;
                 }
                 ++_total_assign_num;
             }
+            if (!status.ok()) {
+                break;
+            }
         }
 
         RowBatch* scan_batch = nullptr;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org