[feature](merge-cloud) Optimize TabletStatMgr initialization

SWJTU-ZhangLei · Mar 21, 2024 · 56f39f1 · 56f39f1
1 parent ac2bd43
commit 56f39f1
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/CloudTabletStatMgr.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/CloudTabletStatMgr.java
@@ -35,9 +35,10 @@
 import org.apache.logging.log4j.Logger;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ForkJoinPool;
+import java.util.Map;
+
 
 /*
  * CloudTabletStatMgr is for collecting tablet(replica) statistics from backends.
@@ -46,10 +47,8 @@
 public class CloudTabletStatMgr extends MasterDaemon {
     private static final Logger LOG = LogManager.getLogger(CloudTabletStatMgr.class);
 
-    private ForkJoinPool taskPool = new ForkJoinPool(Runtime.getRuntime().availableProcessors());
-
     // <(dbId, tableId) -> CloudTableStats>
-    private ConcurrentHashMap<Pair<Long, Long>, CloudTableStats> cloudTableStatsMap = new ConcurrentHashMap<>();
+    private volatile Map<Pair<Long, Long>, CloudTableStats> cloudTableStatsMap = new HashMap<>();
 
     public CloudTabletStatMgr() {
         super("cloud tablet stat mgr", Config.tablet_stat_update_interval_second * 1000);
@@ -136,7 +135,7 @@ protected void runAfterCatalogReady() {
 
         // after update replica in all backends, update index row num
         start = System.currentTimeMillis();
-        ConcurrentHashMap<Pair<Long, Long>, CloudTableStats> newCloudTableStatsMap = new ConcurrentHashMap<>();
+        Map<Pair<Long, Long>, CloudTableStats> newCloudTableStatsMap = new HashMap<>();
         for (Long dbId : dbIds) {
             Database db = Env.getCurrentInternalCatalog().getDbNullable(dbId);
             if (db == null) {
@@ -241,7 +240,7 @@ private GetTabletStatsResponse getTabletStats(GetTabletStatsRequest request)
         return response;
     }
 
-    public ConcurrentHashMap<Pair<Long, Long>, CloudTableStats> getCloudTableStatsMap() {
+    public Map<Pair<Long, Long>, CloudTableStats> getCloudTableStatsMap() {
         return this.cloudTableStatsMap;
     }
 

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
@@ -446,9 +446,7 @@ public class Env {
 
     private DeployManager deployManager;
 
-    private TabletStatMgr tabletStatMgr;
-
-    private CloudTabletStatMgr cloudTabletStatMgr;
+    private MasterDaemon tabletStatMgr;
 
     private Auth auth;
     private AccessControllerManager accessManager;
@@ -694,8 +692,7 @@ public Env(boolean isCheckpointCatalog) {
 
         this.globalTransactionMgr = EnvFactory.getInstance().createGlobalTransactionMgr(this);
 
-        this.tabletStatMgr = new TabletStatMgr();
-        this.cloudTabletStatMgr = new CloudTabletStatMgr();
+        this.tabletStatMgr = EnvFactory.getInstance().createTabletStatMgr();
 
         this.auth = new Auth();
         this.accessManager = new AccessControllerManager(auth);
@@ -1678,11 +1675,8 @@ protected void startMasterOnlyDaemonThreads() {
     private void startNonMasterDaemonThreads() {
         // start load manager thread
         loadManager.start();
-        if (Config.isNotCloudMode()) {
-            tabletStatMgr.start();
-        } else {
-            cloudTabletStatMgr.start();
-        }
+        tabletStatMgr.start();
+
         // load and export job label cleaner thread
         labelCleaner.start();
         // es repository

diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/EnvFactory.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/EnvFactory.java
@@ -25,6 +25,7 @@
 import org.apache.doris.common.Config;
 import org.apache.doris.common.MetaNotFoundException;
 import org.apache.doris.common.UserException;
+import org.apache.doris.common.util.MasterDaemon;
 import org.apache.doris.common.util.PropertyAnalyzer;
 import org.apache.doris.datasource.InternalCatalog;
 import org.apache.doris.load.loadv2.BrokerLoadJob;
@@ -154,4 +155,8 @@ public RoutineLoadManager createRoutineLoadManager() {
     public LoadManager createLoadManager(LoadJobScheduler loadJobScheduler) {
         return new LoadManager(loadJobScheduler);
     }
+
+    public MasterDaemon createTabletStatMgr() {
+        return new TabletStatMgr();
+    }
 }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudEnvFactory.java b/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudEnvFactory.java
@@ -21,6 +21,7 @@
 import org.apache.doris.analysis.BrokerDesc;
 import org.apache.doris.analysis.DescriptorTable;
 import org.apache.doris.analysis.UserIdentity;
+import org.apache.doris.catalog.CloudTabletStatMgr;
 import org.apache.doris.catalog.Database;
 import org.apache.doris.catalog.DynamicPartitionProperty;
 import org.apache.doris.catalog.Env;
@@ -41,6 +42,7 @@
 import org.apache.doris.cloud.transaction.CloudGlobalTransactionMgr;
 import org.apache.doris.common.MetaNotFoundException;
 import org.apache.doris.common.UserException;
+import org.apache.doris.common.util.MasterDaemon;
 import org.apache.doris.common.util.PropertyAnalyzer;
 import org.apache.doris.datasource.InternalCatalog;
 import org.apache.doris.load.loadv2.BrokerLoadJob;
@@ -179,4 +181,8 @@ public RoutineLoadManager createRoutineLoadManager() {
     public LoadManager createLoadManager(LoadJobScheduler loadJobScheduler) {
         return new CloudLoadManager(loadJobScheduler);
     }
+
+    public MasterDaemon createTabletStatMgr() {
+        return new CloudTabletStatMgr();
+    }
 }