This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 85d347ca701 Add test cases on ClusterProcessPersistServiceTest (#32852)
85d347ca701 is described below
commit 85d347ca701a84f6536004360d05ff7fd6b825e5
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Sep 13 18:02:37 2024 +0800
Add test cases on ClusterProcessPersistServiceTest (#32852)
---
.../persist/ClusterProcessPersistService.java | 8 +--
.../persist/ClusterProcessPersistServiceTest.java | 66 +++++++++++++++++++---
2 files changed, 62 insertions(+), 12 deletions(-)
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/ClusterProcessPersistService.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/ClusterProcessPersistService.java
index 1d6169d7502..e318f8103b1 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/ClusterProcessPersistService.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/persist/ClusterProcessPersistService.java
@@ -75,10 +75,6 @@ public final class ClusterProcessPersistService implements
ProcessPersistService
.collect(Collectors.toList());
}
- private boolean isReady(final Collection<String> paths) {
- return paths.stream().noneMatch(each -> null !=
repository.query(each));
- }
-
@Override
public void killProcess(final String processId) {
Collection<String> triggerPaths =
getKillProcessTriggerPaths(processId);
@@ -98,4 +94,8 @@ public final class ClusterProcessPersistService implements
ProcessPersistService
.flatMap(each ->
repository.getChildrenKeys(ComputeNode.getOnlineNodePath(each)).stream().map(onlinePath
-> ComputeNode.getProcessKillInstanceIdNodePath(onlinePath, processId)))
.collect(Collectors.toList());
}
+
+ private boolean isReady(final Collection<String> paths) {
+ return paths.stream().noneMatch(each -> null !=
repository.query(each));
+ }
}
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/ClusterProcessPersistServiceTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/ClusterProcessPersistServiceTest.java
index a9768b78e53..e69461d3a74 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/ClusterProcessPersistServiceTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/ClusterProcessPersistServiceTest.java
@@ -17,22 +17,35 @@
package org.apache.shardingsphere.mode.manager.cluster.persist;
+import org.apache.shardingsphere.infra.executor.sql.process.Process;
+import
org.apache.shardingsphere.infra.executor.sql.process.lock.ProcessOperationLockRegistry;
+import org.apache.shardingsphere.infra.executor.sql.process.yaml.YamlProcess;
+import
org.apache.shardingsphere.infra.executor.sql.process.yaml.YamlProcessList;
import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
+import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.metadata.persist.node.ComputeNode;
import
org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
+import org.apache.shardingsphere.test.mock.AutoMockExtension;
+import org.apache.shardingsphere.test.mock.StaticMockSettings;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
+import java.util.Collection;
import java.util.Collections;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.contains;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
-@ExtendWith(MockitoExtension.class)
+@ExtendWith(AutoMockExtension.class)
+@StaticMockSettings(ProcessOperationLockRegistry.class)
class ClusterProcessPersistServiceTest {
@Mock
@@ -46,19 +59,56 @@ class ClusterProcessPersistServiceTest {
}
@Test
- void assertGetProcessList() {
+ void assertGetCompletedProcessList() {
+
when(ProcessOperationLockRegistry.getInstance().waitUntilReleaseReady(any(),
any())).thenReturn(true);
+ assertGetProcessList();
+ verify(repository,
times(0)).delete(contains("/nodes/compute_nodes/show_process_list_trigger/abc:"));
+ }
+
+ @Test
+ void assertGetUncompletedProcessList() {
+ assertGetProcessList();
+
verify(repository).delete(contains("/nodes/compute_nodes/show_process_list_trigger/abc:"));
+ }
+
+ private void assertGetProcessList() {
when(repository.getChildrenKeys(ComputeNode.getOnlineNodePath(InstanceType.JDBC))).thenReturn(Collections.emptyList());
when(repository.getChildrenKeys(ComputeNode.getOnlineNodePath(InstanceType.PROXY))).thenReturn(Collections.singletonList("abc"));
- when(repository.query(any())).thenReturn(null);
- processPersistService.getProcessList();
- verify(repository).persist(any(), any());
+
when(repository.getChildrenKeys(contains("/execution_nodes/"))).thenReturn(Collections.singletonList("abc"));
+
when(repository.query(contains("/execution_nodes/"))).thenReturn(YamlEngine.marshal(createYamlProcessList()));
+ Collection<Process> actual = processPersistService.getProcessList();
+ assertThat(actual.size(), is(1));
+ assertThat(actual.iterator().next().getId(), is("foo_process_id"));
+
verify(repository).persist(contains("/nodes/compute_nodes/show_process_list_trigger/abc:"),
eq(""));
+ verify(repository).delete(contains("/execution_nodes/"));
+ }
+
+ private static YamlProcessList createYamlProcessList() {
+ YamlProcessList result = new YamlProcessList();
+ YamlProcess yamlProcess = new YamlProcess();
+ yamlProcess.setId("foo_process_id");
+ yamlProcess.setStartMillis(100L);
+ result.getProcesses().add(yamlProcess);
+ return result;
+ }
+
+ @Test
+ void assertKillCompletedProcess() {
+
when(ProcessOperationLockRegistry.getInstance().waitUntilReleaseReady(any(),
any())).thenReturn(true);
+ assertKillProcess();
+ verify(repository,
times(0)).delete("/nodes/compute_nodes/kill_process_trigger/abc:foo_process_id");
}
@Test
- void assertKillProcess() {
+ void assertKillUncompletedProcess() {
+ assertKillProcess();
+
verify(repository).delete("/nodes/compute_nodes/kill_process_trigger/abc:foo_process_id");
+ }
+
+ private void assertKillProcess() {
when(repository.getChildrenKeys(ComputeNode.getOnlineNodePath(InstanceType.JDBC))).thenReturn(Collections.emptyList());
when(repository.getChildrenKeys(ComputeNode.getOnlineNodePath(InstanceType.PROXY))).thenReturn(Collections.singletonList("abc"));
processPersistService.killProcess("foo_process_id");
- verify(repository).persist(any(), any());
+
verify(repository).persist("/nodes/compute_nodes/kill_process_trigger/abc:foo_process_id",
"");
}
}
