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

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


The following commit(s) were added to refs/heads/master by this push:
     new 1d594368014 [fix](feservice) remove connect context (#33583)
1d594368014 is described below

commit 1d59436801483e06fdd537064aeaedc29a423549
Author: meiyi <[email protected]>
AuthorDate: Fri Apr 12 23:16:33 2024 +0800

    [fix](feservice) remove connect context (#33583)
---
 fe/fe-core/src/main/java/org/apache/doris/service/FeServer.java         | 2 ++
 .../src/main/java/org/apache/doris/service/FrontendServiceImpl.java     | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/service/FeServer.java 
b/fe/fe-core/src/main/java/org/apache/doris/service/FeServer.java
index 32d055069a2..6c61c9cdd48 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/service/FeServer.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/service/FeServer.java
@@ -19,6 +19,7 @@ package org.apache.doris.service;
 
 import org.apache.doris.common.ThriftServer;
 import org.apache.doris.metric.MetricRepo;
+import org.apache.doris.qe.ConnectContext;
 import org.apache.doris.thrift.FrontendService;
 
 import org.apache.logging.log4j.LogManager;
@@ -62,6 +63,7 @@ public class FeServer {
                         // If exception occurs, do not deal it, just keep as 
the previous
                         throw t;
                     } finally {
+                        ConnectContext.remove();
                         feServiceLogger.debug("finish process request for {}", 
name);
                         if (MetricRepo.isInit) {
                             long end = System.currentTimeMillis();
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java 
b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
index 683ad847872..fb659f8d712 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java
@@ -1911,8 +1911,6 @@ public class FrontendServiceImpl implements 
FrontendService.Iface {
         StreamLoadHandler streamLoadHandler = new StreamLoadHandler(request, 
null, result, clientAddr);
 
         try {
-            // Some requests forget to remove the ConnectContext, so remove it 
firstly
-            ConnectContext.remove();
             streamLoadHandler.setCloudCluster();
 
             List<TPipelineWorkloadGroup> tWorkloadGroupList = null;


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to