Remove ClusterStatusService (#31274)

apache · May 17, 2024 · 7a6cd19 · 7a6cd19
1 parent c2514a5
commit 7a6cd19
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 120 deletions.
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/state/StateContext.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/state/StateContext.java
@@ -17,6 +17,7 @@
 
 package org.apache.shardingsphere.mode.state;
 
+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import org.apache.shardingsphere.infra.state.cluster.ClusterState;
 import java.util.concurrent.atomic.AtomicReference;
@@ -29,6 +30,7 @@ public final class StateContext {
 
     private final AtomicReference<ClusterState> currentState = new AtomicReference<>(ClusterState.OK);
 
+    @Getter
     private final StateService stateService;
 
     /**

diff --git a/...ain/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java b/...ain/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -35,7 +35,6 @@
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.GovernanceWatcherFactory;
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.metadata.subscriber.ShardingSphereSchemaDataRegistrySubscriber;
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.process.subscriber.ClusterProcessSubscriber;
-import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.cluster.service.ClusterStatusService;
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.cluster.subscriber.ClusterStatusSubscriber;
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.service.ComputeNodeStatusService;
 import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.subscriber.ComputeNodeStatusSubscriber;
@@ -49,6 +48,7 @@
 import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
 import org.apache.shardingsphere.mode.repository.cluster.lock.holder.DistributedLockHolder;
 import org.apache.shardingsphere.mode.repository.cluster.lock.impl.props.DefaultLockTypedProperties;
+import org.apache.shardingsphere.mode.state.StateService;
 import org.apache.shardingsphere.mode.storage.service.QualifiedDataSourceStatusService;
 
 import java.sql.SQLException;
@@ -74,7 +74,7 @@ public ContextManager build(final ContextManagerBuilderParameter param, final Ev
         setContextManagerAware(result);
         createSubscribers(eventBusContext, repository);
         registerOnline(eventBusContext, instanceContext, repository, param, result);
-        setClusterState(repository, result);
+        setClusterState(result);
         return result;
     }
 
@@ -121,13 +121,13 @@ private void registerOnline(final EventBusContext eventBusContext, final Instanc
         new ClusterEventSubscriberRegistry(contextManager, repository).register();
     }
 
-    private void setClusterState(final ClusterPersistRepository repository, final ContextManager contextManager) {
-        ClusterStatusService clusterStatusService = new ClusterStatusService(repository);
-        Optional<ClusterState> clusterState = clusterStatusService.load();
+    private void setClusterState(final ContextManager contextManager) {
+        StateService stateService = contextManager.getStateContext().getStateService();
+        Optional<ClusterState> clusterState = stateService.load();
         if (clusterState.isPresent()) {
             contextManager.updateClusterState(clusterState.get());
         } else {
-            clusterStatusService.persist(ClusterState.OK);
+            stateService.persist(ClusterState.OK);
         }
     }
 

diff --git a/...ode/manager/cluster/coordinator/registry/status/cluster/service/ClusterStatusService.java b/...ode/manager/cluster/coordinator/registry/status/cluster/service/ClusterStatusService.java
diff --git a/...manager/cluster/coordinator/registry/status/cluster/service/ClusterStatusServiceTest.java b/...manager/cluster/coordinator/registry/status/cluster/service/ClusterStatusServiceTest.java