You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2022/03/20 07:12:20 UTC
[dubbo] branch 3.0 updated: [3.0] reuse some executor services in framework level (#9809)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0 by this push:
new 96bc6c3 [3.0] reuse some executor services in framework level (#9809)
96bc6c3 is described below
commit 96bc6c319ffda8be00afff206b5583d338efaad1
Author: Albumen Kevin <jh...@gmail.com>
AuthorDate: Sun Mar 20 15:11:35 2022 +0800
[3.0] reuse some executor services in framework level (#9809)
* [3.0] reuse some executor services in framework level
* fix ut
* add application name to thread name
* fix ut
* fix ut
---
.../rpc/cluster/directory/AbstractDirectory.java | 5 +-
.../loadbalance/ShortestResponseLoadBalance.java | 4 +-
.../rpc/cluster/support/ForkingClusterInvoker.java | 4 +-
.../dubbo/common/CommonScopeModelInitializer.java | 4 +-
.../manager/DefaultExecutorRepository.java | 236 +++++++--------------
.../threadpool/manager/ExecutorRepository.java | 77 +++++--
.../manager/FrameworkExecutorRepository.java | 217 +++++++++++++++++++
.../threadpool/manager/ExecutorRepositoryTest.java | 17 +-
...t.java => FrameworkExecutorRepositoryTest.java} | 67 ++----
.../config/deploy/DefaultApplicationDeployer.java | 5 +-
.../dubbo/config/deploy/DefaultModuleDeployer.java | 5 +-
.../dubbo/config/bootstrap/MultiInstanceTest.java | 2 +-
.../dubbo/metadata/AbstractServiceNameMapping.java | 9 +-
.../apache/dubbo/monitor/dubbo/DubboMonitor.java | 4 +-
.../dubbo/qos/command/impl/PublishMetadata.java | 6 +-
.../apache/dubbo/registry/RegistryNotifier.java | 6 +-
.../registry/client/AbstractServiceDiscovery.java | 6 +-
.../listener/ServiceInstancesChangedListener.java | 7 +-
.../client/migration/MigrationRuleListener.java | 4 +-
.../registry/integration/RegistryProtocol.java | 8 +-
.../dubbo/registry/support/AbstractRegistry.java | 5 +-
.../support/CacheableFailbackRegistry.java | 4 +-
.../ServiceInstancesChangedListenerTest.java | 2 +-
.../ZookeeperServiceDiscoveryChangeWatcher.java | 4 +-
.../apache/dubbo/rpc/filter/AccessLogFilter.java | 4 +-
25 files changed, 447 insertions(+), 265 deletions(-)
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java
index 26d1792..90a38ea 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java
@@ -22,7 +22,7 @@ import org.apache.dubbo.common.config.Configuration;
import org.apache.dubbo.common.config.ConfigurationUtils;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.threadpool.manager.ExecutorRepository;
+import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
import org.apache.dubbo.common.utils.ConcurrentHashSet;
import org.apache.dubbo.common.utils.NetUtils;
import org.apache.dubbo.common.utils.StringUtils;
@@ -169,7 +169,8 @@ public abstract class AbstractDirectory<T> implements Directory<T> {
this.consumerUrl = consumerUrlFrom.addParameters(queryMap);
}
- this.connectivityExecutor = applicationModel.getExtensionLoader(ExecutorRepository.class).getDefaultExtension().getConnectivityScheduledExecutor();
+ this.connectivityExecutor = applicationModel.getFrameworkModel().getBeanFactory()
+ .getBean(FrameworkExecutorRepository.class).getConnectivityScheduledExecutor();
Configuration configuration = ConfigurationUtils.getGlobalConfiguration(url.getOrDefaultModuleModel());
this.reconnectTaskTryCount = configuration.getInt(RECONNECT_TASK_TRY_COUNT, DEFAULT_RECONNECT_TASK_TRY_COUNT);
this.reconnectTaskPeriod = configuration.getInt(RECONNECT_TASK_PERIOD, DEFAULT_RECONNECT_TASK_PERIOD);
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalance.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalance.java
index 1f06079..37717da 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalance.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ShortestResponseLoadBalance.java
@@ -17,6 +17,7 @@
package org.apache.dubbo.rpc.cluster.loadbalance;
import org.apache.dubbo.common.URL;
+import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
import org.apache.dubbo.rpc.Invocation;
import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.RpcStatus;
@@ -57,7 +58,8 @@ public class ShortestResponseLoadBalance extends AbstractLoadBalance implements
@Override
public void setApplicationModel(ApplicationModel applicationModel) {
slidePeriod = applicationModel.getModelEnvironment().getConfiguration().getInt(Constants.SHORTEST_RESPONSE_SLIDE_PERIOD, 30_000);
- executorService = applicationModel.getApplicationExecutorRepository().getSharedExecutor();
+ executorService = applicationModel.getFrameworkModel().getBeanFactory()
+ .getBean(FrameworkExecutorRepository.class).getSharedExecutor();
}
protected static class SlideWindowData {
diff --git a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvoker.java
index 301cede..eaf8f69 100644
--- a/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvoker.java
+++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvoker.java
@@ -18,6 +18,7 @@ package org.apache.dubbo.rpc.cluster.support;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.threadlocal.NamedInternalThreadFactory;
+import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
import org.apache.dubbo.rpc.Invocation;
import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.Result;
@@ -56,7 +57,8 @@ public class ForkingClusterInvoker<T> extends AbstractClusterInvoker<T> {
public ForkingClusterInvoker(Directory<T> directory) {
super(directory);
- executor = directory.getUrl().getOrDefaultApplicationModel().getApplicationExecutorRepository().getSharedExecutor();
+ executor = directory.getUrl().getOrDefaultFrameworkModel().getBeanFactory()
+ .getBean(FrameworkExecutorRepository.class).getSharedExecutor();
}
@Override
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/CommonScopeModelInitializer.java b/dubbo-common/src/main/java/org/apache/dubbo/common/CommonScopeModelInitializer.java
index 34d6867..1831347 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/CommonScopeModelInitializer.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/CommonScopeModelInitializer.java
@@ -20,6 +20,7 @@ import org.apache.dubbo.common.beans.factory.ScopeBeanFactory;
import org.apache.dubbo.common.config.ConfigurationCache;
import org.apache.dubbo.common.lang.ShutdownHookCallbacks;
import org.apache.dubbo.common.status.reporter.FrameworkStatusReportService;
+import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.model.FrameworkModel;
import org.apache.dubbo.rpc.model.ModuleModel;
@@ -28,7 +29,8 @@ import org.apache.dubbo.rpc.model.ScopeModelInitializer;
public class CommonScopeModelInitializer implements ScopeModelInitializer {
@Override
public void initializeFrameworkModel(FrameworkModel frameworkModel) {
-
+ ScopeBeanFactory beanFactory = frameworkModel.getBeanFactory();
+ beanFactory.registerBean(FrameworkExecutorRepository.class);
}
@Override
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/DefaultExecutorRepository.java b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/DefaultExecutorRepository.java
index fbb50eb..78621c2 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/DefaultExecutorRepository.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/DefaultExecutorRepository.java
@@ -21,27 +21,23 @@ import org.apache.dubbo.common.extension.ExtensionAccessor;
import org.apache.dubbo.common.extension.ExtensionAccessorAware;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.threadlocal.NamedInternalThreadFactory;
import org.apache.dubbo.common.threadpool.ThreadPool;
import org.apache.dubbo.common.utils.ExecutorUtil;
import org.apache.dubbo.common.utils.NamedThreadFactory;
+import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.config.ConsumerConfig;
import org.apache.dubbo.config.ModuleConfig;
import org.apache.dubbo.config.ProviderConfig;
import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.model.ModuleModel;
-import org.apache.dubbo.rpc.model.ScopeModelAware;
-import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER_SIDE;
import static org.apache.dubbo.common.constants.CommonConstants.DEFAULT_EXPORT_THREAD_NUM;
@@ -54,75 +50,24 @@ import static org.apache.dubbo.common.constants.CommonConstants.THREAD_NAME_KEY;
/**
* Consider implementing {@code Licycle} to enable executors shutdown when the process stops.
*/
-public class DefaultExecutorRepository implements ExecutorRepository, ExtensionAccessorAware, ScopeModelAware {
+public class DefaultExecutorRepository implements ExecutorRepository, ExtensionAccessorAware {
private static final Logger logger = LoggerFactory.getLogger(DefaultExecutorRepository.class);
- private int DEFAULT_SCHEDULER_SIZE = Runtime.getRuntime().availableProcessors();
-
- private final ExecutorService sharedExecutor;
- private final ScheduledExecutorService sharedScheduledExecutor;
-
- private Ring<ScheduledExecutorService> scheduledExecutors = new Ring<>();
-
private volatile ScheduledExecutorService serviceExportExecutor;
private volatile ExecutorService serviceReferExecutor;
- private ScheduledExecutorService connectivityScheduledExecutor;
-
- private ScheduledExecutorService cacheRefreshingScheduledExecutor;
-
- private ExecutorService mappingRefreshingExecutor;
-
- public Ring<ScheduledExecutorService> registryNotificationExecutorRing = new Ring<>();
-
- private Ring<ScheduledExecutorService> serviceDiscoveryAddressNotificationExecutorRing = new Ring<>();
-
- private ScheduledExecutorService metadataRetryExecutor;
-
- private ConcurrentMap<String, ConcurrentMap<Integer, ExecutorService>> data = new ConcurrentHashMap<>();
-
- private ExecutorService poolRouterExecutor;
-
- private Ring<ExecutorService> executorServiceRing = new Ring<ExecutorService>();
+ private final ConcurrentMap<String, ConcurrentMap<Integer, ExecutorService>> data = new ConcurrentHashMap<>();
private final Object LOCK = new Object();
private ExtensionAccessor extensionAccessor;
- private ApplicationModel applicationModel;
-
- public DefaultExecutorRepository() {
- sharedExecutor = Executors.newCachedThreadPool(new NamedThreadFactory("Dubbo-shared-handler", true));
- sharedScheduledExecutor = Executors.newScheduledThreadPool(8, new NamedThreadFactory("Dubbo-shared-scheduler", true));
-
- for (int i = 0; i < DEFAULT_SCHEDULER_SIZE; i++) {
- ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(
- new NamedThreadFactory("Dubbo-framework-scheduler-" + i, true));
- scheduledExecutors.addItem(scheduler);
-
- executorServiceRing.addItem(new ThreadPoolExecutor(1, 1,
- 0L, TimeUnit.MILLISECONDS,
- new LinkedBlockingQueue<Runnable>(1024), new NamedInternalThreadFactory("Dubbo-state-router-loop-" + i, true)
- , new ThreadPoolExecutor.AbortPolicy()));
- }
-
- connectivityScheduledExecutor = Executors.newScheduledThreadPool(DEFAULT_SCHEDULER_SIZE, new NamedThreadFactory("Dubbo-connectivity-scheduler", true));
- cacheRefreshingScheduledExecutor = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("Dubbo-cache-refreshing-scheduler", true));
- mappingRefreshingExecutor = Executors.newFixedThreadPool(DEFAULT_SCHEDULER_SIZE, new NamedThreadFactory("Dubbo-mapping-refreshing-scheduler", true));
- poolRouterExecutor = new ThreadPoolExecutor(1, 10, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(1024),
- new NamedInternalThreadFactory("Dubbo-state-router-pool-router", true), new ThreadPoolExecutor.AbortPolicy());
+ private final ApplicationModel applicationModel;
+ private final FrameworkExecutorRepository frameworkExecutorRepository;
- for (int i = 0; i < DEFAULT_SCHEDULER_SIZE; i++) {
- ScheduledExecutorService serviceDiscoveryAddressNotificationExecutor =
- Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("Dubbo-SD-address-refresh-" + i));
- ScheduledExecutorService registryNotificationExecutor =
- Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("Dubbo-registry-notification-" + i));
-
- serviceDiscoveryAddressNotificationExecutorRing.addItem(serviceDiscoveryAddressNotificationExecutor);
- registryNotificationExecutorRing.addItem(registryNotificationExecutor);
- }
-
- metadataRetryExecutor = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("Dubbo-metadata-retry"));
+ public DefaultExecutorRepository(ApplicationModel applicationModel) {
+ this.applicationModel = applicationModel;
+ this.frameworkExecutorRepository = applicationModel.getFrameworkModel().getBeanFactory().getBean(FrameworkExecutorRepository.class);
}
/**
@@ -131,12 +76,13 @@ public class DefaultExecutorRepository implements ExecutorRepository, ExtensionA
* @param url
* @return
*/
+ @Override
public synchronized ExecutorService createExecutorIfAbsent(URL url) {
Map<Integer, ExecutorService> executors = data.computeIfAbsent(EXECUTOR_SERVICE_COMPONENT_KEY, k -> new ConcurrentHashMap<>());
// Consumer's executor is sharing globally, key=Integer.MAX_VALUE. Provider's executor is sharing by protocol.
Integer portKey = CONSUMER_SIDE.equalsIgnoreCase(url.getParameter(SIDE_KEY)) ? Integer.MAX_VALUE : url.getPort();
if (url.getParameter(THREAD_NAME_KEY) == null) {
- url = url.putAttribute(THREAD_NAME_KEY, "Dubbo-protocol-"+portKey);
+ url = url.putAttribute(THREAD_NAME_KEY, "Dubbo-protocol-" + portKey);
}
URL finalUrl = url;
ExecutorService executor = executors.computeIfAbsent(portKey, k -> createExecutor(finalUrl));
@@ -149,10 +95,15 @@ public class DefaultExecutorRepository implements ExecutorRepository, ExtensionA
return executor;
}
+ private ExecutorService createExecutor(URL url) {
+ return (ExecutorService) extensionAccessor.getExtensionLoader(ThreadPool.class).getAdaptiveExtension().getExecutor(url);
+ }
+
+ @Override
public ExecutorService getExecutor(URL url) {
Map<Integer, ExecutorService> executors = data.get(EXECUTOR_SERVICE_COMPONENT_KEY);
- /**
+ /*
* It's guaranteed that this method is called after {@link #createExecutorIfAbsent(URL)}, so data should already
* have Executor instances generated and stored.
*/
@@ -172,7 +123,7 @@ public class DefaultExecutorRepository implements ExecutorRepository, ExtensionA
logger.info("Executor for " + url + " is shutdown.");
}
if (executor == null) {
- return sharedExecutor;
+ return frameworkExecutorRepository.getSharedExecutor();
} else {
return executor;
}
@@ -207,22 +158,14 @@ public class DefaultExecutorRepository implements ExecutorRepository, ExtensionA
}
@Override
- public ScheduledExecutorService nextScheduledExecutor() {
- return scheduledExecutors.pollItem();
- }
-
- @Override
- public ExecutorService nextExecutorExecutor() {
- return executorServiceRing.pollItem();
- }
-
- @Override
public ScheduledExecutorService getServiceExportExecutor() {
synchronized (LOCK) {
if (serviceExportExecutor == null) {
int coreSize = getExportThreadNum();
+ String applicationName = applicationModel.tryGetApplicationName();
+ applicationName = StringUtils.isEmpty(applicationName) ? "app" : applicationName;
serviceExportExecutor = Executors.newScheduledThreadPool(coreSize,
- new NamedThreadFactory("Dubbo-service-export", true));
+ new NamedThreadFactory("Dubbo-" + applicationName + "-service-export", true));
}
}
return serviceExportExecutor;
@@ -248,8 +191,10 @@ public class DefaultExecutorRepository implements ExecutorRepository, ExtensionA
synchronized (LOCK) {
if (serviceReferExecutor == null) {
int coreSize = getReferThreadNum();
+ String applicationName = applicationModel.tryGetApplicationName();
+ applicationName = StringUtils.isEmpty(applicationName) ? "app" : applicationName;
serviceReferExecutor = Executors.newFixedThreadPool(coreSize,
- new NamedThreadFactory("Dubbo-service-refer", true));
+ new NamedThreadFactory("Dubbo-" + applicationName + "-service-refer", true));
}
}
return serviceReferExecutor;
@@ -334,58 +279,8 @@ public class DefaultExecutorRepository implements ExecutorRepository, ExtensionA
}
@Override
- public ScheduledExecutorService getRegistryNotificationExecutor() {
- return registryNotificationExecutorRing.pollItem();
- }
-
- public ScheduledExecutorService getServiceDiscoveryAddressNotificationExecutor() {
- return serviceDiscoveryAddressNotificationExecutorRing.pollItem();
- }
-
- @Override
- public ScheduledExecutorService getMetadataRetryExecutor() {
- return metadataRetryExecutor;
- }
-
- @Override
- public ExecutorService getSharedExecutor() {
- return sharedExecutor;
- }
-
- @Override
- public ScheduledExecutorService getSharedScheduledExecutor() {
- return sharedScheduledExecutor;
- }
-
- private ExecutorService createExecutor(URL url) {
- return (ExecutorService) extensionAccessor.getExtensionLoader(ThreadPool.class).getAdaptiveExtension().getExecutor(url);
- }
-
- @Override
- public ExecutorService getPoolRouterExecutor() {
- return poolRouterExecutor;
- }
-
- @Override
- public ScheduledExecutorService getConnectivityScheduledExecutor() {
- return connectivityScheduledExecutor;
- }
-
- @Override
- public ScheduledExecutorService getCacheRefreshingScheduledExecutor() {
- return cacheRefreshingScheduledExecutor;
- }
-
- public ExecutorService getMappingRefreshingExecutor() {
- return mappingRefreshingExecutor;
- }
-
- @Override
public void destroyAll() {
- logger.info("destroying executor repository ..");
- shutdownExecutorService(poolRouterExecutor, "poolRouterExecutor");
- shutdownExecutorService(metadataRetryExecutor, "metadataRetryExecutor");
-
+ logger.info("destroying application executor repository ..");
shutdownServiceExportExecutor();
shutdownServiceReferExecutor();
@@ -404,35 +299,6 @@ public class DefaultExecutorRepository implements ExecutorRepository, ExtensionA
}
});
data.clear();
-
- // scheduledExecutors
- shutdownExecutorServices(scheduledExecutors.listItems(), "scheduledExecutors");
-
- // executorServiceRing
- shutdownExecutorServices(executorServiceRing.listItems(), "executorServiceRing");
-
- // connectivityScheduledExecutor
- shutdownExecutorService(connectivityScheduledExecutor, "connectivityScheduledExecutor");
- shutdownExecutorService(cacheRefreshingScheduledExecutor, "cacheRefreshingScheduledExecutor");
-
- // shutdown share executor
- shutdownExecutorService(sharedExecutor, "sharedExecutor");
- shutdownExecutorService(sharedScheduledExecutor, "sharedScheduledExecutor");
-
- // serviceDiscoveryAddressNotificationExecutorRing
- shutdownExecutorServices(serviceDiscoveryAddressNotificationExecutorRing.listItems(),
- "serviceDiscoveryAddressNotificationExecutorRing");
-
- // registryNotificationExecutorRing
- shutdownExecutorServices(registryNotificationExecutorRing.listItems(),
- "registryNotificationExecutorRing");
-
- }
-
- private void shutdownExecutorServices(List<? extends ExecutorService> executorServices, String msg) {
- for (ExecutorService executorService : executorServices) {
- shutdownExecutorService(executorService, msg);
- }
}
private void shutdownExecutorService(ExecutorService executorService, String name) {
@@ -450,7 +316,57 @@ public class DefaultExecutorRepository implements ExecutorRepository, ExtensionA
}
@Override
- public void setApplicationModel(ApplicationModel applicationModel) {
- this.applicationModel = applicationModel;
+ public ScheduledExecutorService nextScheduledExecutor() {
+ return frameworkExecutorRepository.nextScheduledExecutor();
+ }
+
+ @Override
+ public ExecutorService nextExecutorExecutor() {
+ return frameworkExecutorRepository.nextExecutorExecutor();
+ }
+
+ @Override
+ public ScheduledExecutorService getServiceDiscoveryAddressNotificationExecutor() {
+ return frameworkExecutorRepository.getServiceDiscoveryAddressNotificationExecutor();
+ }
+
+ @Override
+ public ScheduledExecutorService getMetadataRetryExecutor() {
+ return frameworkExecutorRepository.getMetadataRetryExecutor();
+ }
+
+ @Override
+ public ScheduledExecutorService getRegistryNotificationExecutor() {
+ return frameworkExecutorRepository.getRegistryNotificationExecutor();
+ }
+
+ @Override
+ public ExecutorService getSharedExecutor() {
+ return frameworkExecutorRepository.getSharedExecutor();
+ }
+
+ @Override
+ public ScheduledExecutorService getSharedScheduledExecutor() {
+ return frameworkExecutorRepository.getSharedScheduledExecutor();
+ }
+
+ @Override
+ public ExecutorService getPoolRouterExecutor() {
+ return frameworkExecutorRepository.getPoolRouterExecutor();
+ }
+
+ @Override
+ public ScheduledExecutorService getConnectivityScheduledExecutor() {
+ return frameworkExecutorRepository.getConnectivityScheduledExecutor();
+ }
+
+ @Override
+ public ScheduledExecutorService getCacheRefreshingScheduledExecutor() {
+ return frameworkExecutorRepository.getCacheRefreshingScheduledExecutor();
+ }
+
+ @Override
+ public ExecutorService getMappingRefreshingExecutor() {
+ return frameworkExecutorRepository.getMappingRefreshingExecutor();
}
}
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/ExecutorRepository.java b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/ExecutorRepository.java
index cd2d9fe..3773982 100644
--- a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/ExecutorRepository.java
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/ExecutorRepository.java
@@ -48,16 +48,6 @@ public interface ExecutorRepository {
*/
void updateThreadpool(URL url, ExecutorService executor);
- /**
- * Returns a scheduler from the scheduler list, call this method whenever you need a scheduler for a cron job.
- * If your cron cannot burden the possible schedule delay caused by sharing the same scheduler, please consider define a dedicate one.
- *
- * @return
- */
- ScheduledExecutorService nextScheduledExecutor();
-
- ExecutorService nextExecutorExecutor();
-
ScheduledExecutorService getServiceExportExecutor();
/**
@@ -74,55 +64,100 @@ public interface ExecutorRepository {
*/
void shutdownServiceReferExecutor();
+ /**
+ * Destroy all executors that are not in shutdown state
+ */
+ void destroyAll();
+
+ /**
+ * Returns a scheduler from the scheduler list, call this method whenever you need a scheduler for a cron job.
+ * If your cron cannot burden the possible schedule delay caused by sharing the same scheduler, please consider define a dedicate one.
+ *
+ * @deprecated use {@link FrameworkExecutorRepository#nextScheduledExecutor()} instead
+ * @return ScheduledExecutorService
+ */
+ @Deprecated
+ ScheduledExecutorService nextScheduledExecutor();
+
+ /**
+ * @deprecated use {@link FrameworkExecutorRepository#nextExecutorExecutor()} instead
+ * @return ExecutorService
+ */
+ @Deprecated
+ ExecutorService nextExecutorExecutor();
+
+ /**
+ * @deprecated use {@link FrameworkExecutorRepository#getServiceDiscoveryAddressNotificationExecutor()} instead
+ * @return ScheduledExecutorService
+ */
+ @Deprecated
ScheduledExecutorService getServiceDiscoveryAddressNotificationExecutor();
+ /**
+ * @deprecated use {@link FrameworkExecutorRepository#getMetadataRetryExecutor()} instead
+ * @return ScheduledExecutorService
+ */
+ @Deprecated
ScheduledExecutorService getMetadataRetryExecutor();
/**
* Scheduled executor handle registry notification.
*
- * @return
+ * @deprecated use {@link FrameworkExecutorRepository#getRegistryNotificationExecutor()} instead
+ * @return ScheduledExecutorService
*/
+ @Deprecated
ScheduledExecutorService getRegistryNotificationExecutor();
/**
* Get the default shared threadpool.
*
- * @return
+ * @deprecated use {@link FrameworkExecutorRepository#getSharedExecutor()} instead
+ * @return ScheduledExecutorService
*/
+ @Deprecated
ExecutorService getSharedExecutor();
/**
* Get the shared schedule executor
- * @return
+ *
+ * @deprecated use {@link FrameworkExecutorRepository#getSharedScheduledExecutor()} instead
+ * @return ScheduledExecutorService
*/
+ @Deprecated
ScheduledExecutorService getSharedScheduledExecutor();
+ /**
+ * @deprecated use {@link FrameworkExecutorRepository#getPoolRouterExecutor()} instead
+ * @return ExecutorService
+ */
+ @Deprecated
ExecutorService getPoolRouterExecutor();
/**
* Scheduled executor handle connectivity check task
*
- * @return
+ * @deprecated use {@link FrameworkExecutorRepository#getConnectivityScheduledExecutor()} instead
+ * @return ScheduledExecutorService
*/
+ @Deprecated
ScheduledExecutorService getConnectivityScheduledExecutor();
/**
* Scheduler used to refresh file based caches from memory to disk.
*
- * @return
+ * @deprecated use {@link FrameworkExecutorRepository#getCacheRefreshingScheduledExecutor()} instead
+ * @return ScheduledExecutorService
*/
+ @Deprecated
ScheduledExecutorService getCacheRefreshingScheduledExecutor();
/**
* Executor used to run async mapping tasks
*
- * @return
+ * @deprecated use {@link FrameworkExecutorRepository#getMappingRefreshingExecutor()} instead
+ * @return ExecutorService
*/
+ @Deprecated
ExecutorService getMappingRefreshingExecutor();
-
- /**
- * Destroy all executors that are not in shutdown state
- */
- void destroyAll();
}
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/FrameworkExecutorRepository.java b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/FrameworkExecutorRepository.java
new file mode 100644
index 0000000..df4e10e
--- /dev/null
+++ b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/manager/FrameworkExecutorRepository.java
@@ -0,0 +1,217 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dubbo.common.threadpool.manager;
+
+import org.apache.dubbo.common.logger.Logger;
+import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.resource.Disposable;
+import org.apache.dubbo.common.threadlocal.NamedInternalThreadFactory;
+import org.apache.dubbo.common.utils.NamedThreadFactory;
+
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+public class FrameworkExecutorRepository implements Disposable {
+ private static final Logger logger = LoggerFactory.getLogger(FrameworkExecutorRepository.class);
+
+ private final ExecutorService sharedExecutor;
+ private final ScheduledExecutorService sharedScheduledExecutor;
+
+ private final Ring<ScheduledExecutorService> scheduledExecutors = new Ring<>();
+
+ private final ScheduledExecutorService connectivityScheduledExecutor;
+
+ private final ScheduledExecutorService cacheRefreshingScheduledExecutor;
+
+ private final ExecutorService mappingRefreshingExecutor;
+
+ public final Ring<ScheduledExecutorService> registryNotificationExecutorRing = new Ring<>();
+
+ private final Ring<ScheduledExecutorService> serviceDiscoveryAddressNotificationExecutorRing = new Ring<>();
+
+ private final ScheduledExecutorService metadataRetryExecutor;
+
+ private final ExecutorService poolRouterExecutor;
+
+ private final Ring<ExecutorService> executorServiceRing = new Ring<>();
+
+ public FrameworkExecutorRepository() {
+ sharedExecutor = Executors.newCachedThreadPool(new NamedThreadFactory("Dubbo-framework-shared-handler", true));
+ sharedScheduledExecutor = Executors.newScheduledThreadPool(8, new NamedThreadFactory("Dubbo-framework-shared-scheduler", true));
+
+ int availableProcessors = Runtime.getRuntime().availableProcessors();
+ for (int i = 0; i < availableProcessors; i++) {
+ ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(
+ new NamedThreadFactory("Dubbo-framework-scheduler-" + i, true));
+ scheduledExecutors.addItem(scheduler);
+
+ executorServiceRing.addItem(new ThreadPoolExecutor(1, 1,
+ 0L, TimeUnit.MILLISECONDS,
+ new LinkedBlockingQueue<>(1024), new NamedInternalThreadFactory("Dubbo-framework-state-router-loop-" + i, true)
+ , new ThreadPoolExecutor.AbortPolicy()));
+ }
+
+ connectivityScheduledExecutor = Executors.newScheduledThreadPool(availableProcessors, new NamedThreadFactory("Dubbo-framework-connectivity-scheduler", true));
+ cacheRefreshingScheduledExecutor = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("Dubbo-framework-cache-refreshing-scheduler", true));
+ mappingRefreshingExecutor = Executors.newFixedThreadPool(availableProcessors, new NamedThreadFactory("Dubbo-framework-mapping-refreshing-scheduler", true));
+ poolRouterExecutor = new ThreadPoolExecutor(1, 10, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(1024),
+ new NamedInternalThreadFactory("Dubbo-framework-state-router-pool-router", true), new ThreadPoolExecutor.AbortPolicy());
+
+ for (int i = 0; i < availableProcessors; i++) {
+ ScheduledExecutorService serviceDiscoveryAddressNotificationExecutor =
+ Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("Dubbo-framework-SD-address-refresh-" + i));
+ ScheduledExecutorService registryNotificationExecutor =
+ Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("Dubbo-framework-registry-notification-" + i));
+
+ serviceDiscoveryAddressNotificationExecutorRing.addItem(serviceDiscoveryAddressNotificationExecutor);
+ registryNotificationExecutorRing.addItem(registryNotificationExecutor);
+ }
+
+ metadataRetryExecutor = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("Dubbo-framework-metadata-retry"));
+ }
+
+ /**
+ * Returns a scheduler from the scheduler list, call this method whenever you need a scheduler for a cron job.
+ * If your cron cannot burden the possible schedule delay caused by sharing the same scheduler, please consider define a dedicate one.
+ *
+ * @return ScheduledExecutorService
+ */
+ public ScheduledExecutorService nextScheduledExecutor() {
+ return scheduledExecutors.pollItem();
+ }
+
+ public ExecutorService nextExecutorExecutor() {
+ return executorServiceRing.pollItem();
+ }
+
+ /**
+ * Scheduled executor handle registry notification.
+ *
+ * @return ScheduledExecutorService
+ */
+ public ScheduledExecutorService getRegistryNotificationExecutor() {
+ return registryNotificationExecutorRing.pollItem();
+ }
+
+ public ScheduledExecutorService getServiceDiscoveryAddressNotificationExecutor() {
+ return serviceDiscoveryAddressNotificationExecutorRing.pollItem();
+ }
+
+ public ScheduledExecutorService getMetadataRetryExecutor() {
+ return metadataRetryExecutor;
+ }
+
+ /**
+ * Get the default shared thread pool.
+ *
+ * @return ExecutorService
+ */
+ public ExecutorService getSharedExecutor() {
+ return sharedExecutor;
+ }
+
+ /**
+ * Get the shared schedule executor
+ *
+ * @return ScheduledExecutorService
+ */
+ public ScheduledExecutorService getSharedScheduledExecutor() {
+ return sharedScheduledExecutor;
+ }
+
+
+ public ExecutorService getPoolRouterExecutor() {
+ return poolRouterExecutor;
+ }
+
+ /**
+ * Scheduled executor handle connectivity check task
+ *
+ * @return ScheduledExecutorService
+ */
+ public ScheduledExecutorService getConnectivityScheduledExecutor() {
+ return connectivityScheduledExecutor;
+ }
+
+ /**
+ * Scheduler used to refresh file based caches from memory to disk.
+ *
+ * @return ScheduledExecutorService
+ */
+ public ScheduledExecutorService getCacheRefreshingScheduledExecutor() {
+ return cacheRefreshingScheduledExecutor;
+ }
+
+ /**
+ * Executor used to run async mapping tasks
+ *
+ * @return ExecutorService
+ */
+ public ExecutorService getMappingRefreshingExecutor() {
+ return mappingRefreshingExecutor;
+ }
+
+ @Override
+ public void destroy() {
+ logger.info("destroying framework executor repository ..");
+ shutdownExecutorService(poolRouterExecutor, "poolRouterExecutor");
+ shutdownExecutorService(metadataRetryExecutor, "metadataRetryExecutor");
+
+ // scheduledExecutors
+ shutdownExecutorServices(scheduledExecutors.listItems(), "scheduledExecutors");
+
+ // executorServiceRing
+ shutdownExecutorServices(executorServiceRing.listItems(), "executorServiceRing");
+
+ // connectivityScheduledExecutor
+ shutdownExecutorService(connectivityScheduledExecutor, "connectivityScheduledExecutor");
+ shutdownExecutorService(cacheRefreshingScheduledExecutor, "cacheRefreshingScheduledExecutor");
+
+ // shutdown share executor
+ shutdownExecutorService(sharedExecutor, "sharedExecutor");
+ shutdownExecutorService(sharedScheduledExecutor, "sharedScheduledExecutor");
+
+ // serviceDiscoveryAddressNotificationExecutorRing
+ shutdownExecutorServices(serviceDiscoveryAddressNotificationExecutorRing.listItems(),
+ "serviceDiscoveryAddressNotificationExecutorRing");
+
+ // registryNotificationExecutorRing
+ shutdownExecutorServices(registryNotificationExecutorRing.listItems(),
+ "registryNotificationExecutorRing");
+
+ }
+
+ private void shutdownExecutorServices(List<? extends ExecutorService> executorServices, String msg) {
+ for (ExecutorService executorService : executorServices) {
+ shutdownExecutorService(executorService, msg);
+ }
+ }
+
+ private void shutdownExecutorService(ExecutorService executorService, String name) {
+ try {
+ executorService.shutdownNow();
+ } catch (Exception e) {
+ String msg = "shutdown executor service [" + name + "] failed: ";
+ logger.warn(msg + e.getMessage(), e);
+ }
+ }
+}
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/manager/ExecutorRepositoryTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/manager/ExecutorRepositoryTest.java
index 98d6cea..ce81e11 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/manager/ExecutorRepositoryTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/manager/ExecutorRepositoryTest.java
@@ -18,8 +18,11 @@ package org.apache.dubbo.common.threadpool.manager;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.FrameworkModel;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.util.concurrent.ExecutorService;
@@ -27,7 +30,19 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.atomic.AtomicBoolean;
public class ExecutorRepositoryTest {
- private ExecutorRepository executorRepository = ApplicationModel.defaultModel().getExtensionLoader(ExecutorRepository.class).getDefaultExtension();
+ private ApplicationModel applicationModel;
+ private ExecutorRepository executorRepository;
+
+ @BeforeEach
+ public void setup() {
+ applicationModel = FrameworkModel.defaultModel().newApplication();
+ executorRepository = applicationModel.getExtensionLoader(ExecutorRepository.class).getDefaultExtension();
+ }
+
+ @AfterEach
+ public void teardown() {
+ applicationModel.destroy();
+ }
@Test
public void testGetExecutor() {
diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/manager/ExecutorRepositoryTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/manager/FrameworkExecutorRepositoryTest.java
similarity index 50%
copy from dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/manager/ExecutorRepositoryTest.java
copy to dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/manager/FrameworkExecutorRepositoryTest.java
index 98d6cea..a62abaa 100644
--- a/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/manager/ExecutorRepositoryTest.java
+++ b/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/manager/FrameworkExecutorRepositoryTest.java
@@ -16,71 +16,44 @@
*/
package org.apache.dubbo.common.threadpool.manager;
-import org.apache.dubbo.common.URL;
-import org.apache.dubbo.rpc.model.ApplicationModel;
+import org.apache.dubbo.rpc.model.FrameworkModel;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.util.concurrent.ExecutorService;
-import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.atomic.AtomicBoolean;
-public class ExecutorRepositoryTest {
- private ExecutorRepository executorRepository = ApplicationModel.defaultModel().getExtensionLoader(ExecutorRepository.class).getDefaultExtension();
+public class FrameworkExecutorRepositoryTest {
+ private FrameworkModel frameworkModel;
+ private FrameworkExecutorRepository frameworkExecutorRepository;
- @Test
- public void testGetExecutor() {
- testGet(URL.valueOf("dubbo://127.0.0.1:23456"));
- testGet(URL.valueOf("dubbo://127.0.0.1:23456?side=consumer"));
-
- Assertions.assertNotNull(executorRepository.getSharedExecutor());
- Assertions.assertNotNull(executorRepository.getServiceExportExecutor());
- Assertions.assertNotNull(executorRepository.getServiceReferExecutor());
- executorRepository.nextScheduledExecutor();
+ @BeforeEach
+ public void setup() {
+ frameworkModel = new FrameworkModel();
+ frameworkExecutorRepository = frameworkModel.getBeanFactory().getBean(FrameworkExecutorRepository.class);
}
- private void testGet(URL url) {
- ExecutorService executorService = executorRepository.createExecutorIfAbsent(url);
- executorService.shutdown();
- executorService = executorRepository.createExecutorIfAbsent(url);
- Assertions.assertFalse(executorService.isShutdown());
-
- Assertions.assertEquals(executorService, executorRepository.getExecutor(url));
- executorService.shutdown();
- Assertions.assertNotEquals(executorService, executorRepository.getExecutor(url));
+ @AfterEach
+ public void teardown() {
+ frameworkModel.destroy();
}
@Test
- public void testUpdateExecutor() {
- URL url = URL.valueOf("dubbo://127.0.0.1:23456?threads=5");
- ThreadPoolExecutor executorService = (ThreadPoolExecutor) executorRepository.createExecutorIfAbsent(url);
-
- executorService.setCorePoolSize(3);
- executorRepository.updateThreadpool(url, executorService);
-
- executorService.setCorePoolSize(3);
- executorService.setMaximumPoolSize(3);
- executorRepository.updateThreadpool(url, executorService);
-
- executorService.setMaximumPoolSize(20);
- executorService.setCorePoolSize(10);
- executorRepository.updateThreadpool(url, executorService);
-
- executorService.setCorePoolSize(10);
- executorService.setMaximumPoolSize(10);
- executorRepository.updateThreadpool(url, executorService);
+ public void testGetExecutor() {
- executorService.setCorePoolSize(5);
- executorRepository.updateThreadpool(url, executorService);
+ Assertions.assertNotNull(frameworkExecutorRepository.getSharedExecutor());
+ frameworkExecutorRepository.nextScheduledExecutor();
}
@Test
public void testSharedExecutor() throws Exception {
- ExecutorService sharedExecutor = executorRepository.getSharedExecutor();
- MockTask task1 = new MockTask(2000);
- MockTask task2 = new MockTask(100);
- MockTask task3 = new MockTask(200);
+ ExecutorService sharedExecutor = frameworkExecutorRepository.getSharedExecutor();
+ FrameworkExecutorRepositoryTest.MockTask task1 = new FrameworkExecutorRepositoryTest.MockTask(2000);
+ FrameworkExecutorRepositoryTest.MockTask task2 = new FrameworkExecutorRepositoryTest.MockTask(100);
+ FrameworkExecutorRepositoryTest.MockTask task3 = new FrameworkExecutorRepositoryTest.MockTask(200);
sharedExecutor.execute(task1);
sharedExecutor.execute(task2);
sharedExecutor.submit(task3);
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java
index ff60a59..b255f8d 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java
@@ -34,6 +34,7 @@ import org.apache.dubbo.common.lang.ShutdownHookCallbacks;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.threadpool.manager.ExecutorRepository;
+import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
import org.apache.dubbo.common.utils.ArrayUtils;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.StringUtils;
@@ -93,6 +94,7 @@ public class DefaultApplicationDeployer extends AbstractDeployer<ApplicationMode
private final ReferenceCache referenceCache;
+ private final FrameworkExecutorRepository frameworkExecutorRepository;
private final ExecutorRepository executorRepository;
private final AtomicBoolean hasPreparedApplicationInstance = new AtomicBoolean(false);
@@ -113,6 +115,7 @@ public class DefaultApplicationDeployer extends AbstractDeployer<ApplicationMode
environment = applicationModel.getModelEnvironment();
referenceCache = new CompositeReferenceCache(applicationModel);
+ frameworkExecutorRepository = applicationModel.getFrameworkModel().getBeanFactory().getBean(FrameworkExecutorRepository.class);
executorRepository = getExtensionLoader(ExecutorRepository.class).getDefaultExtension();
dubboShutdownHook = new DubboShutdownHook(applicationModel);
@@ -727,7 +730,7 @@ public class DefaultApplicationDeployer extends AbstractDeployer<ApplicationMode
}
if (registered) {
// scheduled task for updating Metadata and ServiceInstance
- asyncMetadataFuture = executorRepository.getSharedScheduledExecutor().scheduleWithFixedDelay(() -> {
+ asyncMetadataFuture = frameworkExecutorRepository.getSharedScheduledExecutor().scheduleWithFixedDelay(() -> {
// ignore refresh metadata on stopping
if (applicationModel.isDestroyed()) {
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultModuleDeployer.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultModuleDeployer.java
index 40af398..ec9c489 100644
--- a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultModuleDeployer.java
+++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultModuleDeployer.java
@@ -25,6 +25,7 @@ import org.apache.dubbo.common.deploy.ModuleDeployer;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
import org.apache.dubbo.common.threadpool.manager.ExecutorRepository;
+import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
import org.apache.dubbo.config.ConsumerConfig;
import org.apache.dubbo.config.ModuleConfig;
import org.apache.dubbo.config.ProviderConfig;
@@ -60,6 +61,7 @@ public class DefaultModuleDeployer extends AbstractDeployer<ModuleModel> impleme
private ModuleModel moduleModel;
+ private FrameworkExecutorRepository frameworkExecutorRepository;
private ExecutorRepository executorRepository;
private final ModuleConfigManager configManager;
@@ -79,6 +81,7 @@ public class DefaultModuleDeployer extends AbstractDeployer<ModuleModel> impleme
super(moduleModel);
this.moduleModel = moduleModel;
configManager = moduleModel.getConfigManager();
+ frameworkExecutorRepository = moduleModel.getApplicationModel().getFrameworkModel().getBeanFactory().getBean(FrameworkExecutorRepository.class);
executorRepository = moduleModel.getExtensionLoader(ExecutorRepository.class).getDefaultExtension();
referenceCache = SimpleReferenceCache.newCache();
applicationDeployer = DefaultApplicationDeployer.get(moduleModel);
@@ -154,7 +157,7 @@ public class DefaultModuleDeployer extends AbstractDeployer<ModuleModel> impleme
if (asyncExportingFutures.isEmpty() && asyncReferringFutures.isEmpty()) {
onModuleStarted();
} else {
- executorRepository.getSharedExecutor().submit(() -> {
+ frameworkExecutorRepository.getSharedExecutor().submit(() -> {
try {
// wait for export finish
waitExportFinish();
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/MultiInstanceTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/MultiInstanceTest.java
index 1db7599..ef1fa5d 100644
--- a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/MultiInstanceTest.java
+++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/bootstrap/MultiInstanceTest.java
@@ -368,7 +368,7 @@ public class MultiInstanceTest {
// TODO Remove ignore thread prefix of NettyServerBoss if supporting close protocol server only used by one application
// see org.apache.dubbo.config.deploy.DefaultApplicationDeployer.postDestroy
// NettyServer will close when all applications are shutdown, but not close if any application of the framework is alive, just ignore it currently
- checkUnclosedThreadsOfApp(stackTraces1, "Found unclosed threads of app 1: ", new String[]{EVENT_LOOP_BOSS_POOL_NAME, "Dubbo-global-shared-handler"});
+ checkUnclosedThreadsOfApp(stackTraces1, "Found unclosed threads of app 1: ", new String[]{EVENT_LOOP_BOSS_POOL_NAME, "Dubbo-global-shared-handler", "Dubbo-framework"});
// stop provider app 2 and check threads
diff --git a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/AbstractServiceNameMapping.java b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/AbstractServiceNameMapping.java
index 71afff5..9ef1fbb 100644
--- a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/AbstractServiceNameMapping.java
+++ b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/AbstractServiceNameMapping.java
@@ -19,7 +19,7 @@ package org.apache.dubbo.metadata;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.threadpool.manager.ExecutorRepository;
+import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.StringUtils;
import org.apache.dubbo.rpc.model.ApplicationModel;
@@ -58,7 +58,9 @@ public abstract class AbstractServiceNameMapping implements ServiceNameMapping,
public AbstractServiceNameMapping(ApplicationModel applicationModel) {
this.applicationModel = applicationModel;
- this.mappingCacheManager = new MappingCacheManager("", applicationModel.getExtensionLoader(ExecutorRepository.class).getDefaultExtension().getCacheRefreshingScheduledExecutor());
+ this.mappingCacheManager = new MappingCacheManager("",
+ applicationModel.getFrameworkModel().getBeanFactory()
+ .getBean(FrameworkExecutorRepository.class).getCacheRefreshingScheduledExecutor());
}
@Override
@@ -133,7 +135,8 @@ public abstract class AbstractServiceNameMapping implements ServiceNameMapping,
this.putCachedMapping(key, mappingServices);
}
} else {
- ExecutorService executorService = applicationModel.getApplicationExecutorRepository().getMappingRefreshingExecutor();
+ ExecutorService executorService = applicationModel.getFrameworkModel().getBeanFactory()
+ .getBean(FrameworkExecutorRepository.class).getMappingRefreshingExecutor();
executorService.submit(new AsyncMappingTask(listener, subscribedURL, true));
}
diff --git a/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitor.java b/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitor.java
index a8464fe..fb09d4e 100644
--- a/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitor.java
+++ b/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitor.java
@@ -19,6 +19,7 @@ package org.apache.dubbo.monitor.dubbo;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
import org.apache.dubbo.common.utils.ExecutorUtil;
import org.apache.dubbo.monitor.Monitor;
import org.apache.dubbo.monitor.MonitorService;
@@ -74,7 +75,8 @@ public class DubboMonitor implements Monitor {
public DubboMonitor(Invoker<MonitorService> monitorInvoker, MonitorService monitorService) {
this.monitorInvoker = monitorInvoker;
this.monitorService = monitorService;
- scheduledExecutorService = monitorInvoker.getUrl().getOrDefaultApplicationModel().getApplicationExecutorRepository().getSharedScheduledExecutor();
+ scheduledExecutorService = monitorInvoker.getUrl().getOrDefaultFrameworkModel().getBeanFactory()
+ .getBean(FrameworkExecutorRepository.class).getSharedScheduledExecutor();
// The time interval for timer <b>scheduledExecutorService</b> to send data
final long monitorInterval = monitorInvoker.getUrl().getPositiveParameter(MONITOR_SEND_DATA_INTERVAL_KEY, DEFAULT_MONITOR_SEND_DATA_INTERVAL);
// collect timer for collecting statistics data
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/PublishMetadata.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/PublishMetadata.java
index 8cf435a..7d43688 100644
--- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/PublishMetadata.java
+++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/PublishMetadata.java
@@ -18,7 +18,7 @@ package org.apache.dubbo.qos.command.impl;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.threadpool.manager.ExecutorRepository;
+import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
import org.apache.dubbo.common.utils.ArrayUtils;
import org.apache.dubbo.qos.command.BaseCommand;
import org.apache.dubbo.qos.command.CommandContext;
@@ -56,8 +56,8 @@ public class PublishMetadata implements BaseCommand {
} else {
try {
int delay = Integer.parseInt(args[0]);
- ExecutorRepository executorRepository = applicationModel.getExtensionLoader(ExecutorRepository.class).getDefaultExtension();
- executorRepository.nextScheduledExecutor()
+ FrameworkExecutorRepository frameworkExecutorRepository = applicationModel.getFrameworkModel().getBeanFactory().getBean(FrameworkExecutorRepository.class);
+ frameworkExecutorRepository.nextScheduledExecutor()
.schedule(() -> ServiceInstanceMetadataUtils.refreshMetadataAndInstance(applicationModel), delay, TimeUnit.SECONDS);
} catch (NumberFormatException e) {
logger.error("Wrong delay param", e);
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/RegistryNotifier.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/RegistryNotifier.java
index c4967b7..55515d3 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/RegistryNotifier.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/RegistryNotifier.java
@@ -19,7 +19,7 @@ package org.apache.dubbo.registry;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.threadpool.manager.ExecutorRepository;
+import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@@ -51,8 +51,8 @@ public abstract class RegistryNotifier {
public RegistryNotifier(URL registryUrl, long delayTime, ScheduledExecutorService scheduler) {
this.delayTime = delayTime;
if (scheduler == null) {
- this.scheduler = registryUrl.getOrDefaultApplicationModel().getExtensionLoader(ExecutorRepository.class)
- .getDefaultExtension().getRegistryNotificationExecutor();
+ this.scheduler = registryUrl.getOrDefaultFrameworkModel().getBeanFactory()
+ .getBean(FrameworkExecutorRepository.class).getRegistryNotificationExecutor();
} else {
this.scheduler = scheduler;
}
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscovery.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscovery.java
index 5ce2e64..6eabe18 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscovery.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/AbstractServiceDiscovery.java
@@ -19,7 +19,7 @@ package org.apache.dubbo.registry.client;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.threadpool.manager.ExecutorRepository;
+import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
import org.apache.dubbo.common.utils.ConcurrentHashSet;
import org.apache.dubbo.metadata.MetadataInfo;
import org.apache.dubbo.metadata.report.MetadataReport;
@@ -80,7 +80,9 @@ public abstract class AbstractServiceDiscovery implements ServiceDiscovery {
this.registryURL = registryURL;
this.serviceName = serviceName;
this.metadataInfo = new MetadataInfo(serviceName);
- this.metaCacheManager = new MetaCacheManager(getCacheNameSuffix(), applicationModel.getExtensionLoader(ExecutorRepository.class).getDefaultExtension().getCacheRefreshingScheduledExecutor());
+ this.metaCacheManager = new MetaCacheManager(getCacheNameSuffix(),
+ applicationModel.getFrameworkModel().getBeanFactory()
+ .getBean(FrameworkExecutorRepository.class).getCacheRefreshingScheduledExecutor());
}
public synchronized void register() throws RuntimeException {
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
index 41fea77..9b36e6d 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
@@ -20,7 +20,7 @@ import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.URLBuilder;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.threadpool.manager.ExecutorRepository;
+import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.ConcurrentHashSet;
import org.apache.dubbo.common.utils.StringUtils;
@@ -62,7 +62,7 @@ import static org.apache.dubbo.registry.client.metadata.ServiceInstanceMetadataU
/**
* TODO, refactor to move revision-metadata mapping to ServiceDiscovery. Instances should have already been mapped with metadata when reached here.
- *
+ * <p>
* The operations of ServiceInstancesChangedListener should be synchronized.
*/
public class ServiceInstancesChangedListener {
@@ -97,7 +97,7 @@ public class ServiceInstancesChangedListener {
this.serviceUrls = new HashMap<>();
retryPermission = new Semaphore(1);
this.scheduler = ScopeModelUtil.getApplicationModel(serviceDiscovery == null || serviceDiscovery.getUrl() == null ? null : serviceDiscovery.getUrl().getScopeModel())
- .getExtensionLoader(ExecutorRepository.class).getDefaultExtension().getMetadataRetryExecutor();
+ .getBeanFactory().getBean(FrameworkExecutorRepository.class).getMetadataRetryExecutor();
}
/**
@@ -113,7 +113,6 @@ public class ServiceInstancesChangedListener {
}
/**
- *
* @param event
*/
private synchronized void doOnEvent(ServiceInstancesChangedEvent event) {
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleListener.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleListener.java
index 4623000..25dd4ad 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleListener.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/migration/MigrationRuleListener.java
@@ -24,6 +24,7 @@ import org.apache.dubbo.common.config.configcenter.DynamicConfiguration;
import org.apache.dubbo.common.extension.Activate;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.NamedThreadFactory;
import org.apache.dubbo.common.utils.StringUtils;
@@ -110,7 +111,8 @@ public class MigrationRuleListener implements RegistryProtocolListener, Configur
String localRawRule = moduleModel.getModelEnvironment().getLocalMigrationRule();
if (!StringUtils.isEmpty(localRawRule)) {
- localRuleMigrationFuture = moduleModel.getApplicationModel().getApplicationExecutorRepository().getSharedScheduledExecutor()
+ localRuleMigrationFuture = moduleModel.getApplicationModel().getFrameworkModel().getBeanFactory()
+ .getBean(FrameworkExecutorRepository.class).getSharedScheduledExecutor()
.schedule(() -> {
if (this.rawRule.equals(INIT)) {
this.process(new ConfigChangedEvent(null, null, localRawRule));
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
index b8b905d..85db0e7 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
@@ -21,7 +21,7 @@ import org.apache.dubbo.common.config.ConfigurationUtils;
import org.apache.dubbo.common.config.configcenter.DynamicConfiguration;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.threadpool.manager.ExecutorRepository;
+import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
import org.apache.dubbo.common.timer.HashedWheelTimer;
import org.apache.dubbo.common.url.component.ServiceConfigURL;
import org.apache.dubbo.common.utils.CollectionUtils;
@@ -867,9 +867,9 @@ public class RegistryProtocol implements Protocol, ScopeModelAware {
public ExporterChangeableWrapper(Exporter<T> exporter, Invoker<T> originInvoker) {
this.exporter = exporter;
this.originInvoker = originInvoker;
- ExecutorRepository executorRepository = originInvoker.getUrl().getOrDefaultApplicationModel()
- .getDefaultExtension(ExecutorRepository.class);
- this.executor = executorRepository.getSharedScheduledExecutor();
+ FrameworkExecutorRepository frameworkExecutorRepository = originInvoker.getUrl().getOrDefaultFrameworkModel().getBeanFactory()
+ .getBean(FrameworkExecutorRepository.class);
+ this.executor = frameworkExecutorRepository.getSharedScheduledExecutor();
}
public Invoker<T> getOriginInvoker() {
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistry.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistry.java
index bc5a9a3..75758ae 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistry.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistry.java
@@ -19,7 +19,7 @@ package org.apache.dubbo.registry.support;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.threadpool.manager.ExecutorRepository;
+import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
import org.apache.dubbo.common.utils.CollectionUtils;
import org.apache.dubbo.common.utils.ConcurrentHashSet;
import org.apache.dubbo.common.utils.ConfigUtils;
@@ -103,7 +103,8 @@ public abstract class AbstractRegistry implements Registry {
setUrl(url);
registryManager = url.getOrDefaultApplicationModel().getBeanFactory().getBean(RegistryManager.class);
localCacheEnabled = url.getParameter(REGISTRY_LOCAL_FILE_CACHE_ENABLED, true);
- registryCacheExecutor = url.getOrDefaultApplicationModel().getDefaultExtension(ExecutorRepository.class).getSharedExecutor();
+ registryCacheExecutor = url.getOrDefaultFrameworkModel().getBeanFactory()
+ .getBean(FrameworkExecutorRepository.class).getSharedExecutor();
if (localCacheEnabled) {
// Start file save timer
syncSaveFile = url.getParameter(REGISTRY_FILESAVE_SYNC_KEY, false);
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/CacheableFailbackRegistry.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/CacheableFailbackRegistry.java
index 936e804..75a13ca 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/CacheableFailbackRegistry.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/CacheableFailbackRegistry.java
@@ -22,7 +22,7 @@ import org.apache.dubbo.common.URLStrParser;
import org.apache.dubbo.common.config.ConfigurationUtils;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.threadpool.manager.ExecutorRepository;
+import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
import org.apache.dubbo.common.url.component.DubboServiceAddressURL;
import org.apache.dubbo.common.url.component.ServiceAddressURL;
import org.apache.dubbo.common.url.component.URLAddress;
@@ -84,7 +84,7 @@ public abstract class CacheableFailbackRegistry extends FailbackRegistry {
extraParameters = new HashMap<>(8);
extraParameters.put(CHECK_KEY, String.valueOf(false));
- cacheRemovalScheduler = url.getOrDefaultApplicationModel().getExtensionLoader(ExecutorRepository.class).getDefaultExtension().nextScheduledExecutor();
+ cacheRemovalScheduler = url.getOrDefaultFrameworkModel().getBeanFactory().getBean(FrameworkExecutorRepository.class).nextScheduledExecutor();
cacheRemovalTaskIntervalInMillis = getIntConfig(url.getScopeModel(), CACHE_CLEAR_TASK_INTERVAL, 2 * 60 * 1000);
cacheClearWaitingThresholdInMillis = getIntConfig(url.getScopeModel(), CACHE_CLEAR_WAITING_THRESHOLD, 5 * 60 * 1000);
}
diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListenerTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListenerTest.java
index b446813..3c07342 100644
--- a/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListenerTest.java
+++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListenerTest.java
@@ -401,7 +401,7 @@ public class ServiceInstancesChangedListenerTest {
when(serviceDiscovery.getRemoteMetadata(eq("222"), anyList())).thenAnswer(new Answer<MetadataInfo>() {
@Override
public MetadataInfo answer(InvocationOnMock invocationOnMock) throws Throwable {
- if (Thread.currentThread().getName().contains("Dubbo-metadata-retry")) {
+ if (Thread.currentThread().getName().contains("Dubbo-framework-metadata-retry")) {
return metadataInfo_222;
}
return MetadataInfo.EMPTY;
diff --git a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscoveryChangeWatcher.java b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscoveryChangeWatcher.java
index c28d35f..79fdd79 100644
--- a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscoveryChangeWatcher.java
+++ b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperServiceDiscoveryChangeWatcher.java
@@ -16,6 +16,7 @@
*/
package org.apache.dubbo.registry.zookeeper;
+import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
import org.apache.dubbo.common.utils.ConcurrentHashSet;
import org.apache.dubbo.registry.RegistryNotifier;
import org.apache.dubbo.registry.client.ServiceDiscovery;
@@ -66,7 +67,8 @@ public class ZookeeperServiceDiscoveryChangeWatcher implements CuratorWatcher {
this.path = path;
this.latch = latch;
this.notifier = new RegistryNotifier(zookeeperServiceDiscovery.getUrl(), zookeeperServiceDiscovery.getDelay(),
- ScopeModelUtil.getApplicationModel(zookeeperServiceDiscovery.getUrl().getScopeModel()).getApplicationExecutorRepository().getServiceDiscoveryAddressNotificationExecutor()) {
+ ScopeModelUtil.getFrameworkModel(zookeeperServiceDiscovery.getUrl().getScopeModel()).getBeanFactory()
+ .getBean(FrameworkExecutorRepository.class).getServiceDiscoveryAddressNotificationExecutor()) {
@Override
protected void doNotify(Object rawAddresses) {
listeners.forEach(listener -> listener.onEvent((ServiceInstancesChangedEvent) rawAddresses));
diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AccessLogFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AccessLogFilter.java
index 6c9aa26..7ab0188 100644
--- a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AccessLogFilter.java
+++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AccessLogFilter.java
@@ -19,6 +19,7 @@ package org.apache.dubbo.rpc.filter;
import org.apache.dubbo.common.extension.Activate;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
import org.apache.dubbo.common.utils.ConcurrentHashSet;
import org.apache.dubbo.common.utils.ConfigUtils;
import org.apache.dubbo.rpc.Filter;
@@ -96,7 +97,8 @@ public class AccessLogFilter implements Filter {
@Override
public Result invoke(Invoker<?> invoker, Invocation inv) throws RpcException {
if (scheduled.compareAndSet(false, true)) {
- inv.getModuleModel().getApplicationModel().getApplicationExecutorRepository().getSharedScheduledExecutor()
+ inv.getModuleModel().getApplicationModel().getFrameworkModel().getBeanFactory()
+ .getBean(FrameworkExecutorRepository.class).getSharedScheduledExecutor()
.scheduleWithFixedDelay(this::writeLogToFile, LOG_OUTPUT_INTERVAL, LOG_OUTPUT_INTERVAL, TimeUnit.MILLISECONDS);
}
try {