This is an automated email from the ASF dual-hosted git repository.
jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new e6efb9c504 [Multi-stage] Minor fix on executor service (#11416)
e6efb9c504 is described below
commit e6efb9c504cd87519b26f12f0344128bc76ac280
Author: Xiaotian (Jackie) Jiang <[email protected]>
AuthorDate: Wed Aug 23 10:47:56 2023 -0700
[Multi-stage] Minor fix on executor service (#11416)
---
.../java/org/apache/pinot/query/service/server/QueryServer.java | 1 +
.../java/org/apache/pinot/server/worker/WorkerQueryServer.java | 9 ---------
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git
a/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/server/QueryServer.java
b/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/server/QueryServer.java
index cce6f2870d..893e0afc5e 100644
---
a/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/server/QueryServer.java
+++
b/pinot-query-runtime/src/main/java/org/apache/pinot/query/service/server/QueryServer.java
@@ -88,6 +88,7 @@ public class QueryServer extends
PinotQueryWorkerGrpc.PinotQueryWorkerImplBase {
_server.shutdown();
_server.awaitTermination();
}
+ _querySubmissionExecutorService.shutdown();
} catch (Exception e) {
throw new RuntimeException(e);
}
diff --git
a/pinot-server/src/main/java/org/apache/pinot/server/worker/WorkerQueryServer.java
b/pinot-server/src/main/java/org/apache/pinot/server/worker/WorkerQueryServer.java
index 44b34d8ec5..45db3208ec 100644
---
a/pinot-server/src/main/java/org/apache/pinot/server/worker/WorkerQueryServer.java
+++
b/pinot-server/src/main/java/org/apache/pinot/server/worker/WorkerQueryServer.java
@@ -18,11 +18,8 @@
*/
package org.apache.pinot.server.worker;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import org.apache.helix.HelixManager;
import org.apache.pinot.common.metrics.ServerMetrics;
-import org.apache.pinot.common.utils.NamedThreadFactory;
import org.apache.pinot.core.data.manager.InstanceDataManager;
import org.apache.pinot.query.runtime.QueryRunner;
import org.apache.pinot.query.service.server.QueryServer;
@@ -32,9 +29,6 @@ import org.apache.pinot.spi.utils.NetUtils;
public class WorkerQueryServer {
- private static final int DEFAULT_EXECUTOR_THREAD_NUM = 5;
-
- private final ExecutorService _executor;
private final int _queryServicePort;
private final PinotConfiguration _configuration;
private final HelixManager _helixManager;
@@ -56,8 +50,6 @@ public class WorkerQueryServer {
_queryRunner = new QueryRunner();
_queryRunner.init(_configuration, _instanceDataManager, _helixManager,
_serverMetrics);
_queryWorkerService = new QueryServer(_queryServicePort, _queryRunner);
- _executor = Executors.newFixedThreadPool(DEFAULT_EXECUTOR_THREAD_NUM,
- new NamedThreadFactory("worker_query_server_enclosure_on_" +
_queryServicePort + "_port"));
}
private static PinotConfiguration toWorkerQueryConfig(PinotConfiguration
configuration) {
@@ -103,6 +95,5 @@ public class WorkerQueryServer {
public void shutDown() {
_queryWorkerService.shutdown();
- _executor.shutdown();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
