fix conflict

Signed-off-by: Kevin Xiaohua Cai <[email protected]>
StarRocks · Sep 20, 2024 · dae8683 · dae8683
1 parent b523da0
commit dae8683
Showing 1 changed file with 0 additions and 14 deletions.
diff --git a/fe/fe-core/src/main/java/com/starrocks/task/PriorityLeaderTaskExecutor.java b/fe/fe-core/src/main/java/com/starrocks/task/PriorityLeaderTaskExecutor.java
@@ -111,21 +111,7 @@ public int getCorePoolSize() {
     }
 
     public void setPoolSize(int poolSize) {
-<<<<<<< HEAD
-        // When the previous poolSize is larger than the poolSize to be set,
-        // you need to setCorePoolSize first and then setMaximumPoolSize, and vice versa.
-        // Otherwise, it will throw IllegalArgumentException
-        int prePoolSize = executor.getCorePoolSize();
-        if (poolSize < prePoolSize) {
-            executor.setCorePoolSize(poolSize);
-            executor.setMaximumPoolSize(poolSize);
-        } else {
-            executor.setMaximumPoolSize(poolSize);
-            executor.setCorePoolSize(poolSize);
-        }
-=======
         ThreadPoolManager.setFixedThreadPoolSize(executor, poolSize);
->>>>>>> 5f3814317e ([BugFix] fix thread pool size adjustment exception (#51191))
     }
 
     private class TaskChecker implements Runnable {