This is an automated email from the ASF dual-hosted git repository. stigahuang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/impala.git
commit b4045297820813bee9fa5e55da5a90eb098b6dc2 Author: Joe McDonnell <[email protected]> AuthorDate: Tue Jan 31 00:10:32 2023 +0000 Revert "IMPALA-11865: Set thread names for Java thread pools" This reverts commit 41117e649049b3490639851c611d9d6a044c64c2. Change-Id: Ic84c6ed85b3b2fd06f65453025801cabbe8bc124 Reviewed-on: http://gerrit.cloudera.org:8080/19462 Reviewed-by: Michael Smith <[email protected]> Reviewed-by: Joe McDonnell <[email protected]> Tested-by: Joe McDonnell <[email protected]> --- .../org/apache/impala/catalog/CatalogServiceCatalog.java | 5 +---- .../java/org/apache/impala/catalog/TableLoadingMgr.java | 13 +++---------- .../impala/catalog/metastore/CatalogMetastoreServer.java | 5 +---- .../java/org/apache/impala/hooks/QueryEventHookManager.java | 6 +----- fe/src/main/java/org/apache/impala/service/Frontend.java | 7 +++---- 5 files changed, 9 insertions(+), 27 deletions(-) diff --git a/fe/src/main/java/org/apache/impala/catalog/CatalogServiceCatalog.java b/fe/src/main/java/org/apache/impala/catalog/CatalogServiceCatalog.java index 6297b8d86..0a8e70c4c 100644 --- a/fe/src/main/java/org/apache/impala/catalog/CatalogServiceCatalog.java +++ b/fe/src/main/java/org/apache/impala/catalog/CatalogServiceCatalog.java @@ -138,7 +138,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.base.Stopwatch; import com.google.common.collect.Maps; -import com.google.common.util.concurrent.ThreadFactoryBuilder; /** * Specialized Catalog that implements the CatalogService specific Catalog @@ -266,9 +265,7 @@ public class CatalogServiceCatalog extends Catalog { // Periodically polls HDFS to get the latest set of known cache pools. private final ScheduledExecutorService cachePoolReader_ = - Executors.newScheduledThreadPool(1, - new ThreadFactoryBuilder().setDaemon(true) - .setNameFormat("HDFSCachePoolReader").build()); + Executors.newScheduledThreadPool(1); // Log of deleted catalog objects. private final CatalogDeltaLog deleteLog_; diff --git a/fe/src/main/java/org/apache/impala/catalog/TableLoadingMgr.java b/fe/src/main/java/org/apache/impala/catalog/TableLoadingMgr.java index 53df82dc4..37685c6ff 100644 --- a/fe/src/main/java/org/apache/impala/catalog/TableLoadingMgr.java +++ b/fe/src/main/java/org/apache/impala/catalog/TableLoadingMgr.java @@ -36,7 +36,6 @@ import org.apache.impala.util.HdfsCachingUtil; import org.apache.log4j.Logger; import com.google.common.base.Preconditions; -import com.google.common.util.concurrent.ThreadFactoryBuilder; /** * Class that manages scheduling the loading of table metadata from the Hive Metastore and @@ -149,9 +148,7 @@ public class TableLoadingMgr { // (no work will be rejected, but memory consumption is unbounded). If this thread // dies it will be automatically restarted. // The tables to process are read from the resfreshThreadWork_ queue. - ExecutorService asyncRefreshThread_ = Executors.newSingleThreadExecutor( - new ThreadFactoryBuilder().setDaemon(true) - .setNameFormat("TableAsyncRefreshThread").build()); + ExecutorService asyncRefreshThread_ = Executors.newSingleThreadExecutor(); // Tables for the async refresh thread to process. Synchronization must be handled // externally. @@ -165,9 +162,7 @@ public class TableLoadingMgr { catalog_ = catalog; tblLoader_ = new TableLoader(catalog_); numLoadingThreads_ = numLoadingThreads; - tblLoadingPool_ = Executors.newFixedThreadPool(numLoadingThreads_, - new ThreadFactoryBuilder().setDaemon(true) - .setNameFormat("TableLoadingThread-%d").build()); + tblLoadingPool_ = Executors.newFixedThreadPool(numLoadingThreads_); // Start the background table loading submitter threads. startTableLoadingSubmitterThreads(); @@ -270,9 +265,7 @@ public class TableLoadingMgr { */ private void startTableLoadingSubmitterThreads() { ExecutorService submitterLoadingPool = - Executors.newFixedThreadPool(numLoadingThreads_, - new ThreadFactoryBuilder().setDaemon(true) - .setNameFormat("TableLoadingSubmitterThread-%d").build()); + Executors.newFixedThreadPool(numLoadingThreads_); try { for (int i = 0; i < numLoadingThreads_; ++i) { submitterLoadingPool.execute(new Runnable() { diff --git a/fe/src/main/java/org/apache/impala/catalog/metastore/CatalogMetastoreServer.java b/fe/src/main/java/org/apache/impala/catalog/metastore/CatalogMetastoreServer.java index 4affa9c84..14a0f6076 100644 --- a/fe/src/main/java/org/apache/impala/catalog/metastore/CatalogMetastoreServer.java +++ b/fe/src/main/java/org/apache/impala/catalog/metastore/CatalogMetastoreServer.java @@ -28,7 +28,6 @@ import java.util.Set; import com.codahale.metrics.Timer; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; -import com.google.common.util.concurrent.ThreadFactoryBuilder; import java.lang.reflect.InvocationHandler; import java.lang.reflect.InvocationTargetException; @@ -110,9 +109,7 @@ public class CatalogMetastoreServer extends ThriftHiveMetastore implements // Logs Catalogd HMS cache metrics at a fixed frequency. private final ScheduledExecutorService metricsLoggerService_ = - Executors.newScheduledThreadPool(1, - new ThreadFactoryBuilder().setDaemon(true) - .setNameFormat("MetricsLoggerService").build()); + Executors.newScheduledThreadPool(1); // the server is started in a daemon thread so that instantiating this is not // a blocking call. diff --git a/fe/src/main/java/org/apache/impala/hooks/QueryEventHookManager.java b/fe/src/main/java/org/apache/impala/hooks/QueryEventHookManager.java index 1f78597dd..eef24673b 100644 --- a/fe/src/main/java/org/apache/impala/hooks/QueryEventHookManager.java +++ b/fe/src/main/java/org/apache/impala/hooks/QueryEventHookManager.java @@ -31,8 +31,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.stream.Collectors; -import com.google.common.util.concurrent.ThreadFactoryBuilder; - /** * {@link QueryEventHookManager} manages the registration and execution of * {@link QueryEventHook}s. Each manager instance may manage its own hooks, @@ -119,9 +117,7 @@ public class QueryEventHookManager { private QueryEventHookManager(int nHookExecutorThreads, String[] hookClasses) throws InternalException { - this.hookExecutor_ = Executors.newFixedThreadPool(nHookExecutorThreads, - new ThreadFactoryBuilder().setDaemon(true) - .setNameFormat("QueryEventHookExecutor-%d").build()); + this.hookExecutor_ = Executors.newFixedThreadPool(nHookExecutorThreads); Runtime.getRuntime().addShutdownHook(new Thread(() -> this.cleanUp())); final List<QueryEventHook> hooks = new ArrayList<>(hookClasses.length); diff --git a/fe/src/main/java/org/apache/impala/service/Frontend.java b/fe/src/main/java/org/apache/impala/service/Frontend.java index 9c20f0084..a261f87ef 100644 --- a/fe/src/main/java/org/apache/impala/service/Frontend.java +++ b/fe/src/main/java/org/apache/impala/service/Frontend.java @@ -27,7 +27,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.Uninterruptibles; -import com.google.common.util.concurrent.ThreadFactoryBuilder; import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -395,6 +394,8 @@ public class Frontend { */ private final AtomicReference<AuthorizationChecker> authzChecker_ = new AtomicReference<>(); + private final ScheduledExecutorService policyReader_ = + Executors.newScheduledThreadPool(1); private final ImpaladTableUsageTracker impaladTableUsageTracker_; @@ -443,9 +444,7 @@ public class Frontend { checkAuthorizationPool_ = MoreExecutors.newDirectExecutorService(); } else { LOG.info("Using a thread pool of size {} for authorization", numThreads); - checkAuthorizationPool_ = Executors.newFixedThreadPool(numThreads, - new ThreadFactoryBuilder().setDaemon(true) - .setNameFormat("AuthorizationCheckerThread-%d").build()); + checkAuthorizationPool_ = Executors.newFixedThreadPool(numThreads); } } else { authzChecker_.set(authzFactory.newAuthorizationChecker());
