Refactor usage of ContextManagerLifecycleListener.onInitialized (#35014)

terrymanu · web-flow · commit 59c0a7709f89 · 2025-03-16T23:19:15.000+08:00
* Refactor usage of ContextManagerLifecycleListener.onInitialized

* Refactor usage of ContextManagerLifecycleListener.onInitialized

* Refactor usage of ContextManagerLifecycleListener.onInitialized

* Refactor usage of ContextManagerLifecycleListener.onInitialized
diff --git a/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/listener/ReadwriteSplittingContextManagerLifecycleListener.java b/features/readwrite-splitting/core/src/main/java/org/apache/shardingsphere/readwritesplitting/listener/ReadwriteSplittingContextManagerLifecycleListener.java
@@ -33,16 +33,6 @@ public class ReadwriteSplittingContextManagerLifecycleListener implements Contex
     
     @Override
     public void onInitialized(final ContextManager contextManager) {
-        if (contextManager.getComputeNodeInstanceContext().getModeConfiguration().isCluster()) {
-            updateQualifiedDataSourceState(contextManager);
-        }
-    }
-    
-    @Override
-    public void onDestroyed(final ContextManager contextManager) {
-    }
-    
-    private void updateQualifiedDataSourceState(final ContextManager contextManager) {
         Map<String, QualifiedDataSourceState> qualifiedDataSourceStateMap = contextManager.getPersistServiceFacade().getQualifiedDataSourceStateService().load();
         qualifiedDataSourceStateMap.forEach((key, value) -> updateQualifiedDataSourceState(contextManager.getMetaDataContexts().getMetaData(), new QualifiedDataSource(key), value));
     }
@@ -54,4 +44,8 @@ private void updateQualifiedDataSourceState(final ShardingSphereMetaData metaDat
             }
         });
     }
+    
+    @Override
+    public void onDestroyed(final ContextManager contextManager) {
+    }
 }
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/listener/PipelineContextManagerLifecycleListener.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/listener/PipelineContextManagerLifecycleListener.java
@@ -32,7 +32,6 @@
 import org.apache.shardingsphere.elasticjob.infra.spi.ElasticJobServiceLoader;
 import org.apache.shardingsphere.elasticjob.lite.lifecycle.api.JobConfigurationAPI;
 import org.apache.shardingsphere.elasticjob.lite.lifecycle.domain.JobBriefInfo;
-import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
 import org.apache.shardingsphere.infra.database.core.DefaultDatabase;
 import org.apache.shardingsphere.mode.manager.ContextManager;
 import org.apache.shardingsphere.mode.manager.listener.ContextManagerLifecycleListener;
@@ -48,17 +47,12 @@ public final class PipelineContextManagerLifecycleListener implements ContextMan
     
     @Override
     public void onInitialized(final ContextManager contextManager) {
-        ModeConfiguration modeConfig = contextManager.getComputeNodeInstanceContext().getModeConfiguration();
-        if (!contextManager.getComputeNodeInstanceContext().getModeConfiguration().isCluster()) {
-            log.info("mode type is not Cluster, mode type='{}', ignore", modeConfig.getType());
-            return;
-        }
         String preSelectedDatabaseName = contextManager.getPreSelectedDatabaseName();
         if (DefaultDatabase.LOGIC_NAME.equals(preSelectedDatabaseName)) {
             return;
         }
         PipelineContextKey contextKey = new PipelineContextKey(preSelectedDatabaseName, contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getType());
-        PipelineContextManager.putContext(contextKey, new PipelineContext(modeConfig, contextManager));
+        PipelineContextManager.putContext(contextKey, new PipelineContext(contextManager.getComputeNodeInstanceContext().getModeConfiguration(), contextManager));
         PipelineMetaDataNodeWatcher.getInstance(contextKey);
         ElasticJobServiceLoader.registerTypedService(ElasticJobListener.class);
         try {
diff --git a/kernel/schedule/core/src/main/java/org/apache/shardingsphere/schedule/core/job/statistics/collect/StatisticsCollectContextManagerLifecycleListener.java b/kernel/schedule/core/src/main/java/org/apache/shardingsphere/schedule/core/job/statistics/collect/StatisticsCollectContextManagerLifecycleListener.java
@@ -28,8 +28,7 @@ public final class StatisticsCollectContextManagerLifecycleListener implements C
     
     @Override
     public void onInitialized(final ContextManager contextManager) {
-        if (contextManager.getComputeNodeInstanceContext().getModeConfiguration().isCluster()
-                && InstanceType.PROXY == contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getType()) {
+        if (InstanceType.PROXY == contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getType()) {
             new StatisticsCollectJobWorker(contextManager).initialize();
         }
     }
diff --git a/kernel/schedule/core/src/test/java/org/apache/shardingsphere/schedule/core/job/statistics/collect/StatisticsCollectContextManagerLifecycleListenerTest.java b/kernel/schedule/core/src/test/java/org/apache/shardingsphere/schedule/core/job/statistics/collect/StatisticsCollectContextManagerLifecycleListenerTest.java
@@ -30,19 +30,12 @@
 
 class StatisticsCollectContextManagerLifecycleListenerTest {
     
-    @Test
-    void assertOnInitializedWithNotClusterMode() {
-        ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
-        new StatisticsCollectContextManagerLifecycleListener().onInitialized(contextManager);
-        verify(contextManager.getComputeNodeInstanceContext()).getModeConfiguration();
-    }
-    
     @Test
     void assertOnInitializedWithNotProxy() {
         ContextManager contextManager = mock(ContextManager.class, RETURNS_DEEP_STUBS);
         when(contextManager.getComputeNodeInstanceContext().getModeConfiguration().isCluster()).thenReturn(true);
         new StatisticsCollectContextManagerLifecycleListener().onInitialized(contextManager);
-        verify(contextManager.getComputeNodeInstanceContext(), times(2)).getModeConfiguration();
+        verify(contextManager.getComputeNodeInstanceContext()).getModeConfiguration();
     }
     
     @Test
@@ -51,7 +44,7 @@ void assertOnInitializedWithProxy() {
         when(contextManager.getComputeNodeInstanceContext().getModeConfiguration().isCluster()).thenReturn(true);
         when(contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getType()).thenReturn(InstanceType.PROXY);
         new StatisticsCollectContextManagerLifecycleListener().onInitialized(contextManager);
-        verify(contextManager.getComputeNodeInstanceContext(), times(3)).getModeConfiguration();
+        verify(contextManager.getComputeNodeInstanceContext(), times(2)).getModeConfiguration();
     }
     
     @Test
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
@@ -81,7 +81,9 @@ public ContextManager(final MetaDataContexts metaDataContexts, final ComputeNode
         stateContext = new StateContext(persistServiceFacade.getStateService().load());
         executorEngine = ExecutorEngine.createExecutorEngineWithSize(metaDataContexts.getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE));
         for (ContextManagerLifecycleListener each : ShardingSphereServiceLoader.getServiceInstances(ContextManagerLifecycleListener.class)) {
-            each.onInitialized(this);
+            if (computeNodeInstanceContext.getModeConfiguration().isCluster()) {
+                each.onInitialized(this);
+            }
         }
     }
     

Original file line number	Diff line number	Diff line change
`@@ -33,16 +33,6 @@ public class ReadwriteSplittingContextManagerLifecycleListener implements Contex`
`33`	`33`
`34`	`34`	`@Override`
`35`	`35`	`public void onInitialized(final ContextManager contextManager) {`
`36`		`- if (contextManager.getComputeNodeInstanceContext().getModeConfiguration().isCluster()) {`
`37`		`- updateQualifiedDataSourceState(contextManager);`
`38`		`- }`
`39`		`- }`
`40`		`-`
`41`		`- @Override`
`42`		`- public void onDestroyed(final ContextManager contextManager) {`
`43`		`- }`
`44`		`-`
`45`		`- private void updateQualifiedDataSourceState(final ContextManager contextManager) {`
`46`	`36`	`Map<String, QualifiedDataSourceState> qualifiedDataSourceStateMap = contextManager.getPersistServiceFacade().getQualifiedDataSourceStateService().load();`
`47`	`37`	`qualifiedDataSourceStateMap.forEach((key, value) -> updateQualifiedDataSourceState(contextManager.getMetaDataContexts().getMetaData(), new QualifiedDataSource(key), value));`
`48`	`38`	`}`
`@@ -54,4 +44,8 @@ private void updateQualifiedDataSourceState(final ShardingSphereMetaData metaDat`
`54`	`44`	`}`
`55`	`45`	`});`
`56`	`46`	`}`
	`47`	`+`
	`48`	`+ @Override`
	`49`	`+ public void onDestroyed(final ContextManager contextManager) {`
	`50`	`+ }`
`57`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,7 @@ public final class StatisticsCollectContextManagerLifecycleListener implements C`
`28`	`28`
`29`	`29`	`@Override`
`30`	`30`	`public void onInitialized(final ContextManager contextManager) {`
`31`		`- if (contextManager.getComputeNodeInstanceContext().getModeConfiguration().isCluster()`
`32`		`- && InstanceType.PROXY == contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getType()) {`
	`31`	`+ if (InstanceType.PROXY == contextManager.getComputeNodeInstanceContext().getInstance().getMetaData().getType()) {`
`33`	`32`	`new StatisticsCollectJobWorker(contextManager).initialize();`
`34`	`33`	`}`
`35`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,9 @@ public ContextManager(final MetaDataContexts metaDataContexts, final ComputeNode`
`81`	`81`	`stateContext = new StateContext(persistServiceFacade.getStateService().load());`
`82`	`82`	`executorEngine = ExecutorEngine.createExecutorEngineWithSize(metaDataContexts.getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE));`
`83`	`83`	`for (ContextManagerLifecycleListener each : ShardingSphereServiceLoader.getServiceInstances(ContextManagerLifecycleListener.class)) {`
`84`		`- each.onInitialized(this);`
	`84`	`+ if (computeNodeInstanceContext.getModeConfiguration().isCluster()) {`
	`85`	`+ each.onInitialized(this);`
	`86`	`+ }`
`85`	`87`	`}`
`86`	`88`	`}`
`87`	`89`