From e4b551e2ce119ea0bc8c932d4ee3a34787bbcb3b Mon Sep 17 00:00:00 2001 From: xu tao Date: Wed, 20 Sep 2023 18:11:56 +0800 Subject: [PATCH] [fix](Config): Remove unused config max_connection_scheduler_threads_num (#24597) --- docs/en/docs/admin-manual/config/fe-config.md | 8 -------- docs/zh-CN/docs/admin-manual/config/fe-config.md | 8 -------- .../src/main/java/org/apache/doris/common/Config.java | 4 ---- .../main/java/org/apache/doris/qe/ConnectScheduler.java | 4 ---- 4 files changed, 24 deletions(-) diff --git a/docs/en/docs/admin-manual/config/fe-config.md b/docs/en/docs/admin-manual/config/fe-config.md index 8fc84e6ef41f33..736404361935a2 100644 --- a/docs/en/docs/admin-manual/config/fe-config.md +++ b/docs/en/docs/admin-manual/config/fe-config.md @@ -437,14 +437,6 @@ Default：1024 Maximal number of connections per FE. -#### `max_connection_scheduler_threads_num` - -Default：4096 - -Maximal number of thread in connection-scheduler-pool. - -The current strategy is to apply for a separate thread for service when there is a request - #### `check_java_version` Default：true diff --git a/docs/zh-CN/docs/admin-manual/config/fe-config.md b/docs/zh-CN/docs/admin-manual/config/fe-config.md index e4c02ef8b468f8..0793c398102b4e 100644 --- a/docs/zh-CN/docs/admin-manual/config/fe-config.md +++ b/docs/zh-CN/docs/admin-manual/config/fe-config.md @@ -437,14 +437,6 @@ FE https 使能标志位，false 表示支持 http，true 表示同时支持 htt 每个 FE 的最大连接数 -#### `max_connection_scheduler_threads_num` - -默认值：4096 - -查询请求调度器中的最大线程数。 - -目前的策略是，有请求过来，就为其单独申请一个线程进行服务 - #### `check_java_version` 默认值：true diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java index a2aa07ba24b7fe..6e9eff59051431 100644 --- a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java +++ b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java @@ -702,10 +702,6 @@ public class Config extends ConfigBase { "Maximal number of connections of MySQL server per FE."}) public static int qe_max_connection = 1024; - @ConfField(description = {"MySQL 连接调度线程池的最大线程数。", - "Maximal number of thread in MySQL connection-scheduler-pool."}) - public static int max_connection_scheduler_threads_num = 4096; - @ConfField(mutable = true, description = {"Colocate join 每个 instance 的内存 penalty 系数。" + "计算方式：`exec_mem_limit / min (query_colocate_join_memory_limit_penalty_factor, instance_num)`", "Colocate join PlanFragment instance memory limit penalty factor.", diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectScheduler.java b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectScheduler.java index 8ce1615bb294fd..a89324de390ef6 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectScheduler.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectScheduler.java @@ -18,7 +18,6 @@ package org.apache.doris.qe; import org.apache.doris.catalog.Env; -import org.apache.doris.common.Config; import org.apache.doris.common.ThreadPoolManager; import org.apache.doris.common.util.DebugUtil; import org.apache.doris.mysql.privilege.PrivPredicate; @@ -32,7 +31,6 @@ import java.util.List; import java.util.Map; import java.util.TimerTask; -import java.util.concurrent.ExecutorService; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; @@ -47,8 +45,6 @@ public class ConnectScheduler { private final AtomicInteger nextConnectionId; private final Map connectionMap = Maps.newConcurrentMap(); private final Map connByUser = Maps.newConcurrentMap(); - private final ExecutorService executor = ThreadPoolManager.newDaemonCacheThreadPool( - Config.max_connection_scheduler_threads_num, "connect-scheduler-pool", true); // valid trace id -> query id private final Map traceId2QueryId = Maps.newConcurrentMap();