You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2023/05/02 16:19:22 UTC
[shardingsphere] branch master updated: Rename StandaloneProcessListSubscriber and ClusterProcessListSubscriber (#25431)
This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new a34ecab611b Rename StandaloneProcessListSubscriber and ClusterProcessListSubscriber (#25431)
a34ecab611b is described below
commit a34ecab611baf9eb002184959c44ba2389695006
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Wed May 3 00:19:11 2023 +0800
Rename StandaloneProcessListSubscriber and ClusterProcessListSubscriber (#25431)
* Refactor ShowProcessListRequestEvent
* Refactor ProcessStandaloneSubscriber
* Rename StandaloneProcessListSubscriber
* Rename ClusterProcessListSubscriber
* Rename ClusterProcessListSubscriber
---
.../mode/event/process/ShowProcessListRequestEvent.java | 5 -----
.../mode/manager/cluster/coordinator/RegistryCenter.java | 4 ++--
...strySubscriber.java => ClusterProcessListSubscriber.java} | 12 ++++++------
.../coordinator/subscriber/ProcessListChangedSubscriber.java | 2 +-
...criberTest.java => ClusterProcessListSubscriberTest.java} | 8 ++++----
.../manager/standalone/StandaloneContextManagerBuilder.java | 4 ++--
...eSubscriber.java => StandaloneProcessListSubscriber.java} | 12 ++++++------
...berTest.java => StandaloneProcessListSubscriberTest.java} | 6 +++---
8 files changed, 24 insertions(+), 29 deletions(-)
diff --git a/mode/core/src/main/java/org/apache/shardingsphere/mode/event/process/ShowProcessListRequestEvent.java b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/process/ShowProcessListRequestEvent.java
index b47e9b73a21..7597631c8ee 100644
--- a/mode/core/src/main/java/org/apache/shardingsphere/mode/event/process/ShowProcessListRequestEvent.java
+++ b/mode/core/src/main/java/org/apache/shardingsphere/mode/event/process/ShowProcessListRequestEvent.java
@@ -17,13 +17,8 @@
package org.apache.shardingsphere.mode.event.process;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
/**
* Show process list request event.
*/
-@RequiredArgsConstructor
-@Getter
public final class ShowProcessListRequestEvent {
}
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/RegistryCenter.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/RegistryCenter.java
index d3cb59eca66..d30d55b6b94 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/RegistryCenter.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/RegistryCenter.java
@@ -35,7 +35,7 @@ import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.statu
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.compute.subscriber.ComputeNodeStatusSubscriber;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.storage.service.StorageNodeStatusService;
import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.status.storage.subscriber.StorageNodeStatusSubscriber;
-import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.process.subscriber.ProcessRegistrySubscriber;
+import org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.process.subscriber.ClusterProcessListSubscriber;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.lock.holder.DistributedLockHolder;
import org.apache.shardingsphere.mode.repository.cluster.lock.impl.props.DefaultLockTypedProperties;
@@ -99,7 +99,7 @@ public final class RegistryCenter {
new ComputeNodeStatusSubscriber(this, repository);
new ClusterStatusSubscriber(repository, eventBusContext);
new StorageNodeStatusSubscriber(repository, eventBusContext);
- new ProcessRegistrySubscriber(repository, eventBusContext);
+ new ClusterProcessListSubscriber(repository, eventBusContext);
new ShardingSphereSchemaDataRegistrySubscriber(repository, globalLockPersistService, eventBusContext);
}
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessRegistrySubscriber.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ClusterProcessListSubscriber.java
similarity index 94%
rename from mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessRegistrySubscriber.java
rename to mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ClusterProcessListSubscriber.java
index 9aaea20e152..50ffc0ef5f2 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessRegistrySubscriber.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ClusterProcessListSubscriber.java
@@ -38,16 +38,16 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
- * Process registry subscriber.
+ * Cluster processlist subscriber.
*/
@SuppressWarnings("UnstableApiUsage")
-public final class ProcessRegistrySubscriber {
+public final class ClusterProcessListSubscriber {
private final PersistRepository repository;
private final EventBusContext eventBusContext;
- public ProcessRegistrySubscriber(final PersistRepository repository, final EventBusContext eventBusContext) {
+ public ClusterProcessListSubscriber(final PersistRepository repository, final EventBusContext eventBusContext) {
this.repository = repository;
this.eventBusContext = eventBusContext;
eventBusContext.register(this);
@@ -91,12 +91,12 @@ public final class ProcessRegistrySubscriber {
}
/**
- * Kill process id.
+ * Kill process.
*
- * @param event get children request event.
+ * @param event kill process request event
*/
@Subscribe
- public void killProcessId(final KillProcessRequestEvent event) {
+ public void killProcess(final KillProcessRequestEvent event) {
String processId = event.getId();
boolean killProcessIdIsComplete = false;
Collection<String> processKillPaths = getProcessKillPaths(processId);
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriber.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriber.java
index 249f554057a..2db936cb11c 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriber.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/subscriber/ProcessListChangedSubscriber.java
@@ -60,7 +60,7 @@ public final class ProcessListChangedSubscriber {
* @param event show process list trigger event
*/
@Subscribe
- public synchronized void reportLocalProcesses(final ShowProcessListTriggerEvent event) {
+ public void reportLocalProcesses(final ShowProcessListTriggerEvent event) {
if (!event.getInstanceId().equals(contextManager.getInstanceContext().getInstance().getMetaData().getId())) {
return;
}
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessRegistrySubscriberTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ClusterProcessListSubscriberTest.java
similarity index 88%
rename from mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessRegistrySubscriberTest.java
rename to mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ClusterProcessListSubscriberTest.java
index cbc99cf1e58..fcd59e1ba50 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessRegistrySubscriberTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ClusterProcessListSubscriberTest.java
@@ -36,18 +36,18 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
-class ProcessRegistrySubscriberTest {
+class ClusterProcessListSubscriberTest {
@Mock
private ClusterPersistRepository repository;
private final EventBusContext eventBusContext = new EventBusContext();
- private ProcessRegistrySubscriber processRegistrySubscriber;
+ private ClusterProcessListSubscriber clusterProcessListSubscriber;
@BeforeEach
void setUp() {
- processRegistrySubscriber = new ProcessRegistrySubscriber(repository, eventBusContext);
+ clusterProcessListSubscriber = new ClusterProcessListSubscriber(repository, eventBusContext);
}
@Test
@@ -56,7 +56,7 @@ class ProcessRegistrySubscriberTest {
when(repository.getChildrenKeys(ComputeNode.getOnlineNodePath(InstanceType.PROXY))).thenReturn(Collections.singletonList("abc"));
when(repository.getDirectly(any())).thenReturn(null);
ShowProcessListRequestEvent showProcessListRequestEvent = mock(ShowProcessListRequestEvent.class);
- processRegistrySubscriber.loadShowProcessListData(showProcessListRequestEvent);
+ clusterProcessListSubscriber.loadShowProcessListData(showProcessListRequestEvent);
verify(repository).persist(any(), any());
}
}
diff --git a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
index 96761e02828..060fb8e7c58 100644
--- a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
+++ b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/StandaloneContextManagerBuilder.java
@@ -26,7 +26,7 @@ import org.apache.shardingsphere.mode.lock.GlobalLockContext;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.ContextManagerBuilder;
import org.apache.shardingsphere.mode.manager.ContextManagerBuilderParameter;
-import org.apache.shardingsphere.mode.manager.standalone.subscriber.ProcessStandaloneSubscriber;
+import org.apache.shardingsphere.mode.manager.standalone.subscriber.StandaloneProcessListSubscriber;
import org.apache.shardingsphere.mode.manager.standalone.workerid.generator.StandaloneWorkerIdGenerator;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory;
@@ -48,7 +48,7 @@ public final class StandaloneContextManagerBuilder implements ContextManagerBuil
StandalonePersistRepository.class, null == repositoryConfig ? null : repositoryConfig.getType(), null == repositoryConfig ? new Properties() : repositoryConfig.getProps());
MetaDataPersistService persistService = new MetaDataPersistService(repository);
InstanceContext instanceContext = buildInstanceContext(param);
- new ProcessStandaloneSubscriber(instanceContext.getEventBusContext());
+ new StandaloneProcessListSubscriber(instanceContext.getEventBusContext());
MetaDataContexts metaDataContexts = MetaDataContextsFactory.create(persistService, param, instanceContext);
ContextManager result = new ContextManager(metaDataContexts, instanceContext);
setContextManagerAware(result);
diff --git a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/ProcessStandaloneSubscriber.java b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/StandaloneProcessListSubscriber.java
similarity index 89%
rename from mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/ProcessStandaloneSubscriber.java
rename to mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/StandaloneProcessListSubscriber.java
index ef96271dbb6..bf67b24a22a 100644
--- a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/ProcessStandaloneSubscriber.java
+++ b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/StandaloneProcessListSubscriber.java
@@ -33,27 +33,27 @@ import java.sql.Statement;
import java.util.Collections;
/**
- * Process standalone subscriber.
+ * Standalone processlist subscriber.
*/
@SuppressWarnings("UnstableApiUsage")
-public final class ProcessStandaloneSubscriber {
+public final class StandaloneProcessListSubscriber {
private final EventBusContext eventBusContext;
private final YamlProcessListContextsSwapper swapper = new YamlProcessListContextsSwapper();
- public ProcessStandaloneSubscriber(final EventBusContext eventBusContext) {
+ public StandaloneProcessListSubscriber(final EventBusContext eventBusContext) {
this.eventBusContext = eventBusContext;
eventBusContext.register(this);
}
/**
- * Load show process list data.
+ * Post show process list data.
*
- * @param event get children request event
+ * @param event show process list request event
*/
@Subscribe
- public void loadShowProcessListData(final ShowProcessListRequestEvent event) {
+ public void postShowProcessListData(final ShowProcessListRequestEvent event) {
YamlProcessListContexts yamlContexts = swapper.swapToYamlConfiguration(ProcessRegistry.getInstance().getAllProcessContexts());
eventBusContext.post(new ShowProcessListResponseEvent(Collections.singleton(YamlEngine.marshal(yamlContexts))));
}
diff --git a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/ProcessStandaloneSubscriberTest.java b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/StandaloneProcessListSubscriberTest.java
similarity index 88%
rename from mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/ProcessStandaloneSubscriberTest.java
rename to mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/StandaloneProcessListSubscriberTest.java
index d5502b2c38f..98299a5d054 100644
--- a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/ProcessStandaloneSubscriberTest.java
+++ b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/StandaloneProcessListSubscriberTest.java
@@ -31,13 +31,13 @@ import static org.mockito.Mockito.when;
@ExtendWith(AutoMockExtension.class)
@StaticMockSettings(ProcessRegistry.class)
-class ProcessStandaloneSubscriberTest {
+class StandaloneProcessListSubscriberTest {
@Test
- void assertLoadShowProcessListData() {
+ void assertPostShowProcessListData() {
ProcessRegistry processRegistry = mock(ProcessRegistry.class);
when(ProcessRegistry.getInstance()).thenReturn(processRegistry);
- new ProcessStandaloneSubscriber(new EventBusContext()).loadShowProcessListData(mock(ShowProcessListRequestEvent.class));
+ new StandaloneProcessListSubscriber(new EventBusContext()).postShowProcessListData(mock(ShowProcessListRequestEvent.class));
verify(processRegistry).getAllProcessContexts();
}
}