pr + 1

Author: wangbo

fe/fe-core/src/main/java/org/apache/doris/cloud/load/CloudBrokerLoadJob.java

@@ -95,19 +95,19 @@ private void setCloudClusterId() throws MetaNotFoundException {
             try {
                 clusterName = context.getCloudCluster();
             } catch (ComputeGroupException e) {
-                LOG.warn("error happens when get cloud cluster", e);
-                throw new MetaNotFoundException("error happens when get cloud cluster " + e);
+                LOG.warn("failed to get compute group name", e);
+                throw new MetaNotFoundException("failed to get compute group name " + e);
             }
             if (Strings.isNullOrEmpty(clusterName)) {
-                LOG.warn("can not find a valid compute group");
-                throw new MetaNotFoundException("can not find a valid compute group");
+                LOG.warn("compute group name is empty");
+                throw new MetaNotFoundException("compute group name is empty");
             }
 
             this.cloudClusterId = ((CloudSystemInfoService) Env.getCurrentSystemInfo())
                     .getCloudClusterIdByName(clusterName);
             if (Strings.isNullOrEmpty(this.cloudClusterId)) {
-                LOG.warn("can not find cluster: {}", clusterName);
-                throw new MetaNotFoundException("can not find cluster: " + clusterName);
+                LOG.warn("can not find compute group: {}", clusterName);
+                throw new MetaNotFoundException("can not find compute group: " + clusterName);
             }
             sessionVariables.put(CLOUD_CLUSTER_ID, this.cloudClusterId);
         }
@@ -122,6 +122,7 @@ private AutoCloseConnectContext buildConnectContext() throws UserException {
             throw new UserException("cluster name is empty, cluster id is: " + cloudClusterId);
         }
 
+        // NOTE: set user info in context in for auth check in CloudReplica
         if (ConnectContext.get() == null) {
             ConnectContext connectContext = new ConnectContext();
             connectContext.setCloudCluster(clusterName);

fe/fe-core/src/main/java/org/apache/doris/cloud/load/CloudLoadLoadingTask.java

@@ -25,15 +25,13 @@
 import org.apache.doris.cloud.system.CloudSystemInfoService;
 import org.apache.doris.common.UserException;
 import org.apache.doris.common.profile.Profile;
-import org.apache.doris.common.util.DebugUtil;
 import org.apache.doris.load.BrokerFileGroup;
 import org.apache.doris.load.loadv2.LoadLoadingTask;
 import org.apache.doris.load.loadv2.LoadTaskCallback;
 import org.apache.doris.qe.AutoCloseConnectContext;
 import org.apache.doris.qe.ConnectContext;
 
 import com.google.common.base.Strings;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -66,6 +64,7 @@ private AutoCloseConnectContext buildConnectContext() throws UserException {
             throw new UserException("cluster name is empty, cluster id is: " + this.cloudClusterId);
         }
 
+        // NOTE: set user info here for the following text auth check.
         if (ConnectContext.get() == null) {
             ConnectContext connectContext = new ConnectContext();
             connectContext.setCloudCluster(clusterName);
@@ -83,11 +82,6 @@ private AutoCloseConnectContext buildConnectContext() throws UserException {
     @Override
     protected void executeOnce() throws Exception {
         try (AutoCloseConnectContext r = buildConnectContext()) {
-            if (ConnectContext.get().getCurrentUserIdentity() == null || StringUtils.isEmpty(
-                    ConnectContext.get().getCurrentUserIdentity().getQualifiedUser())) {
-                LOG.warn("user is empty for cloud load job {}, job user is {} ", DebugUtil.printId(this.getLoadId()),
-                        this.userInfo.getQualifiedUser());
-            }
             super.executeOnce();
         }
     }

fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java

@@ -1408,26 +1408,32 @@ public String getCloudCluster(boolean updateErr) throws ComputeGroupException {
         String sessionCluster = getSessionVariable().getCloudCluster();
         if (!Strings.isNullOrEmpty(sessionCluster)) {
             choseWay = "use session";
-            LOG.debug("finally set context compute group name {} for user {} with chose way '{}'",
-                    sessionCluster, getCurrentUserIdentity(), choseWay);
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("finally set context compute group name {} for user {} with chose way '{}'",
+                        sessionCluster, getCurrentUserIdentity(), choseWay);
+            }
             return sessionCluster;
         }
 
         // 2 get cluster from user
         String userPropCluster = getDefaultCloudClusterFromUser();
         if (!StringUtils.isEmpty(userPropCluster)) {
             choseWay = "user property";
-            LOG.debug("finally set context compute group name {} for user {} with chose way '{}'", userPropCluster,
-                    getCurrentUserIdentity(), choseWay);
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("finally set context compute group name {} for user {} with chose way '{}'", userPropCluster,
+                        getCurrentUserIdentity(), choseWay);
+            }
             return userPropCluster;
         }
 
         // 3 get cluster from a cached variable in connect context
         // this value comes from a cluster selection policy
         if (!Strings.isNullOrEmpty(this.cloudCluster)) {
             choseWay = "user selection policy";
-            LOG.debug("finally set context compute group name {} for user {} with chose way '{}'",
-                    cloudCluster, getCurrentUserIdentity(), choseWay);
+            if (LOG.isDebugEnabled()) {
+                LOG.debug("finally set context compute group name {} for user {} with chose way '{}'",
+                        cloudCluster, getCurrentUserIdentity(), choseWay);
+            }
             return cloudCluster;
         }
 
@@ -1455,8 +1461,10 @@ public String getCloudCluster(boolean updateErr) throws ComputeGroupException {
             this.cloudCluster = policyCluster;
         }
 
-        LOG.debug("finally set context compute group name {} for user {} with chose way '{}'", this.cloudCluster,
-                getCurrentUserIdentity(), choseWay);
+        if (LOG.isDebugEnabled()) {
+            LOG.debug("finally set context compute group name {} for user {} with chose way '{}'", this.cloudCluster,
+                    getCurrentUserIdentity(), choseWay);
+        }
 
         return this.cloudCluster;
     }