From 18d899bf372a2fa5c8ec273b9b18dc3fc5b13c00 Mon Sep 17 00:00:00 2001 From: kamtohung Date: Sun, 12 Feb 2023 16:42:49 +0800 Subject: [PATCH 1/2] Fix hasPreparedInternalModule is always false. (#11535) --- .../apache/dubbo/config/deploy/DefaultApplicationDeployer.java | 1 + 1 file changed, 1 insertion(+) 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 21613c019e0..021ebb1793d 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 @@ -720,6 +720,7 @@ public void prepareInternalModule() { logger.warn(CONFIG_FAILED_START_MODEL, "", "", "wait for internal module startup failed: " + e.getMessage(), e); } } + hasPreparedInternalModule = true; } } From 872532393ceb5b9fb59a5baa209d04fa23e5f78a Mon Sep 17 00:00:00 2001 From: kamtohung Date: Sun, 12 Feb 2023 18:44:10 +0800 Subject: [PATCH 2/2] Fix hasPreparedInternalModule is always false. (#11535) --- .../dubbo/config/deploy/DefaultApplicationDeployer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 021ebb1793d..c7fee0c2175 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 @@ -716,11 +716,11 @@ public void prepareInternalModule() { // wait for internal module startup try { future.get(5, TimeUnit.SECONDS); + hasPreparedInternalModule = true; } catch (Exception e) { logger.warn(CONFIG_FAILED_START_MODEL, "", "", "wait for internal module startup failed: " + e.getMessage(), e); } } - hasPreparedInternalModule = true; } } @@ -773,7 +773,7 @@ private DynamicConfiguration prepareEnvironment(ConfigCenterConfig configCenter) dynamicConfiguration = getDynamicConfiguration(configCenter.toUrl()); } catch (Exception e) { if (!configCenter.isCheck()) { - logger.warn(CONFIG_FAILED_INIT_CONFIG_CENTER, "", "","The configuration center failed to initialize", e); + logger.warn(CONFIG_FAILED_INIT_CONFIG_CENTER, "", "", "The configuration center failed to initialize", e); configCenter.setInitialized(false); return null; } else {