From 26f91fcb00a0153be1f12bcae9984ef5f0cc8cd1 Mon Sep 17 00:00:00 2001 From: "ken.lj" Date: Thu, 27 Jan 2022 17:27:45 +0800 Subject: [PATCH 1/2] fix probes --- .../probe/impl/DeployerReadinessProbe.java | 19 +++++++++---------- .../qos/probe/impl/DeployerStartupProbe.java | 18 +++++++++--------- .../dubbo/qos/command/impl/ReadyTest.java | 2 +- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/probe/impl/DeployerReadinessProbe.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/probe/impl/DeployerReadinessProbe.java index c2bfadf692a..7c826bbef55 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/probe/impl/DeployerReadinessProbe.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/probe/impl/DeployerReadinessProbe.java @@ -19,23 +19,22 @@ import org.apache.dubbo.common.extension.Activate; import org.apache.dubbo.qos.probe.ReadinessProbe; import org.apache.dubbo.rpc.model.ApplicationModel; +import org.apache.dubbo.rpc.model.FrameworkModel; import org.apache.dubbo.rpc.model.ModuleModel; +import java.util.List; + @Activate public class DeployerReadinessProbe implements ReadinessProbe { - - private ApplicationModel applicationModel; - - public DeployerReadinessProbe(ApplicationModel applicationModel) { - this.applicationModel = applicationModel; - } - @Override public boolean check() { - for (ModuleModel moduleModel : applicationModel.getModuleModels()) { - if (!moduleModel.getDeployer().isStarted()) { - return false; + List applicationModels = FrameworkModel.defaultModel().getAllApplicationModels(); + for (ApplicationModel applicationModel : applicationModels) { + for (ModuleModel moduleModel : applicationModel.getModuleModels()) { + if (!moduleModel.getDeployer().isStarted()) { + return false; + } } } return true; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/probe/impl/DeployerStartupProbe.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/probe/impl/DeployerStartupProbe.java index 532b9bad495..15997573950 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/probe/impl/DeployerStartupProbe.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/probe/impl/DeployerStartupProbe.java @@ -19,22 +19,22 @@ import org.apache.dubbo.common.extension.Activate; import org.apache.dubbo.qos.probe.StartupProbe; import org.apache.dubbo.rpc.model.ApplicationModel; +import org.apache.dubbo.rpc.model.FrameworkModel; import org.apache.dubbo.rpc.model.ModuleModel; +import java.util.List; + @Activate public class DeployerStartupProbe implements StartupProbe { - private ApplicationModel applicationModel; - - public DeployerStartupProbe(ApplicationModel applicationModel) { - this.applicationModel = applicationModel; - } - @Override public boolean check() { - for (ModuleModel moduleModel : applicationModel.getModuleModels()) { - if (moduleModel.getDeployer().isRunning()) { - return true; + List applicationModels = FrameworkModel.defaultModel().getAllApplicationModels(); + for (ApplicationModel applicationModel : applicationModels) { + for (ModuleModel moduleModel : applicationModel.getModuleModels()) { + if (moduleModel.getDeployer().isRunning()) { + return true; + } } } return false; diff --git a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/ReadyTest.java b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/ReadyTest.java index 08b7a88f05e..d13ff2ef12d 100644 --- a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/ReadyTest.java +++ b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/ReadyTest.java @@ -56,7 +56,7 @@ public void setUp() { Mockito.when(frameworkModel.getExtensionLoader(ReadinessProbe.class)).thenReturn(loader); URL url = URL.valueOf("application://").addParameter(CommonConstants.QOS_READY_PROBE_EXTENSION, ""); List readinessProbes = Arrays.asList( - new DeployerReadinessProbe(frameworkModel.newApplication()), + new DeployerReadinessProbe(), new ProviderReadinessProbe() ); Mockito.when(loader.getActivateExtension(url, CommonConstants.QOS_READY_PROBE_EXTENSION)).thenReturn(readinessProbes); From 7ae2db750a5d2e45b66dfc8422079f3339e657cb Mon Sep 17 00:00:00 2001 From: "ken.lj" Date: Fri, 28 Jan 2022 09:54:46 +0800 Subject: [PATCH 2/2] fix ut --- .../java/org/apache/dubbo/qos/command/impl/StartupTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/StartupTest.java b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/StartupTest.java index f1d6ab5166b..2be4a9681dd 100644 --- a/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/StartupTest.java +++ b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/command/impl/StartupTest.java @@ -54,7 +54,7 @@ public void setUp() { Mockito.when(frameworkModel.getExtensionLoader(StartupProbe.class)).thenReturn(loader); URL url = URL.valueOf("application://").addParameter(CommonConstants.QOS_STARTUP_PROBE_EXTENSION, ""); List readinessProbes = Arrays.asList( - new DeployerStartupProbe(frameworkModel.newApplication()) + new DeployerStartupProbe() ); Mockito.when(loader.getActivateExtension(url, CommonConstants.QOS_STARTUP_PROBE_EXTENSION)).thenReturn(readinessProbes); }