[fix](thrift exception) do not log in thrift exception in asan mode

dataroaring · May 25, 2024 · c3f90d9 · c3f90d9
1 parent 5660825
commit c3f90d9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/be/src/agent/utils.cpp b/be/src/agent/utils.cpp
@@ -187,6 +187,10 @@ Status MasterServerClient::confirm_unused_remote_files(
         try {
             client->confirmUnusedRemoteFiles(*result, request);
         } catch (TTransportException& e) {
+#ifdef ADDRESS_SANITIZER
+            return Status::RpcError<false>("Master client confirm_unused_remote_files failed due to {}",
+                                           e.what());
+#else
             TTransportException::TTransportExceptionType type = e.getType();
             if (type != TTransportException::TTransportExceptionType::TIMED_OUT) {
                 // if not TIMED_OUT, retry
@@ -209,6 +213,7 @@ Status MasterServerClient::confirm_unused_remote_files(
                         _master_info.network_address.hostname, _master_info.network_address.port,
                         client_status.code(), e.what());
             }
+#endif
         }
     } catch (std::exception& e) {
         RETURN_IF_ERROR(client.reopen(config::thrift_rpc_timeout_ms));

diff --git a/be/src/runtime/fragment_mgr.cpp b/be/src/runtime/fragment_mgr.cpp
@@ -440,6 +440,13 @@ void FragmentMgr::coordinator_callback(const ReportStatusRequest& req) {
         try {
             coord->reportExecStatus(res, params);
         } catch (TTransportException& e) {
+#ifdef ADDRESS_SANITIZER
+            rpc_status =
+                    Status::RpcError<false>("Master client confirm_unused_remote_files failed due to {}",
+                                            e.what());
+            req.cancel_fn(rpc_status);
+            return;
+#else
             LOG(WARNING) << "Retrying ReportExecStatus. query id: " << print_id(req.query_id)
                          << ", instance id: " << print_id(req.fragment_instance_id) << " to "
                          << req.coord_addr << ", err: " << e.what();
@@ -451,6 +458,7 @@ void FragmentMgr::coordinator_callback(const ReportStatusRequest& req) {
                 return;
             }
             coord->reportExecStatus(res, params);
+#endif
         }
 
         rpc_status = Status::create<false>(res.status);