From 63841981368cd6d433c7d7b9ee18ac6f063a9bd7 Mon Sep 17 00:00:00 2001
From: Mingyu Chen <morningman@163.com>
Date: Mon, 11 Sep 2023 16:16:58 +0800
Subject: [PATCH] [minor](fe) optimize some log info and imports issue (#24138)

---
 fe/check/checkstyle/import-control.xml                        | 1 +
 fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java    | 3 ++-
 .../src/main/java/org/apache/doris/qe/ConnectProcessor.java   | 4 +++-
 .../java/org/apache/doris/analysis/S3TvfLoadStmtTest.java     | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/fe/check/checkstyle/import-control.xml b/fe/check/checkstyle/import-control.xml
index 9ff32f7d51..16371ce891 100644
--- a/fe/check/checkstyle/import-control.xml
+++ b/fe/check/checkstyle/import-control.xml
@@ -25,6 +25,7 @@ under the License.
 <import-control pkg="org.apache.doris" strategyOnMismatch="allowed">
     <disallow pkg="com.clearspring.analytics.util" />
     <disallow pkg="com.alibaba.google" />
+    <disallow pkg="org.apache.hadoop.util.Lists" />
     <disallow pkg="org.spark_project.guava" />
     <disallow pkg="org.glassfish.jersey.internal.guava" />
     <disallow pkg="io.fabric8.zjsonpatch.internal.guava" />
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
index 7f223775b6..8ba9335e28 100755
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
@@ -1184,7 +1184,8 @@ public class Env {
         }
 
         if (Config.cluster_id != -1 && clusterId != Config.cluster_id) {
-            throw new IOException("cluster id is not equal with config item cluster_id. will exit.");
+            throw new IOException("cluster id is not equal with config item cluster_id. will exit. "
+                    + "If you are in recovery mode, please also modify the cluster_id in 'doris-meta/image/VERSION'");
         }
 
         if (role.equals(FrontendNodeType.FOLLOWER)) {
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
index 80a4eb80e0..de3acfc8e8 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
@@ -280,7 +280,9 @@ public class ConnectProcessor {
     // Process COM_QUERY statement,
     // only throw an exception when there is a problem interacting with the requesting client
     private void handleQuery(MysqlCommand mysqlCommand) {
-        MetricRepo.COUNTER_REQUEST_ALL.increase(1L);
+        if (MetricRepo.isInit) {
+            MetricRepo.COUNTER_REQUEST_ALL.increase(1L);
+        }
         // convert statement to Java string
         byte[] bytes = packetBuf.array();
         int ending = packetBuf.limit() - 1;
diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/S3TvfLoadStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/S3TvfLoadStmtTest.java
index cc41e31e3c..6c847f2820 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/analysis/S3TvfLoadStmtTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/S3TvfLoadStmtTest.java
@@ -33,11 +33,11 @@ import org.apache.doris.datasource.property.constants.S3Properties.Env;
 import org.apache.doris.load.loadv2.LoadTask.MergeType;
 import org.apache.doris.tablefunction.S3TableValuedFunction;
 
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import mockit.Expectations;
 import mockit.Injectable;
-import org.apache.hadoop.util.Lists;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;