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 0c49d456e3d Add ProcessOperationLockRegistry (#25449)
0c49d456e3d is described below
commit 0c49d456e3d102088f9d2640d10a2fce4e365645
Author: Liang Zhang <[email protected]>
AuthorDate: Thu May 4 18:45:23 2023 +0800
Add ProcessOperationLockRegistry (#25449)
* Revise javadoc
* Rename ProcessLock
* Rename ProcessOperationLock
* Add ProcessOperationLockRegistry
---
.../infra/executor/sql/process/ProcessEngine.java | 12 +++---
.../executor/sql/process/ProcessRegistry.java | 27 ++++++-------
...cessListLock.java => ProcessOperationLock.java} | 4 +-
.../process/lock/ProcessOperationLockRegistry.java | 46 ++++++++++++++++++++++
.../executor/sql/process/ProcessEngineTest.java | 6 +--
.../subscriber/ClusterProcessListSubscriber.java | 36 ++++++++---------
.../subscriber/ProcessListChangedSubscriber.java | 11 +++---
.../ProcessListChangedSubscriberTest.java | 19 ++++-----
.../StandaloneProcessListSubscriber.java | 4 +-
.../StandaloneProcessListSubscriberTest.java | 2 +-
10 files changed, 105 insertions(+), 62 deletions(-)
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessEngine.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessEngine.java
index fcfcf68415f..f65eb178851 100644
---
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessEngine.java
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessEngine.java
@@ -44,7 +44,7 @@ public final class ProcessEngine {
public String connect(final Grantee grantee, final String databaseName) {
ExecutionGroupContext<? extends SQLExecutionUnit>
executionGroupContext = new ExecutionGroupContext<>(Collections.emptyList(),
new ExecutionGroupReportContext(databaseName, grantee));
Process process = new Process(executionGroupContext);
- ProcessRegistry.getInstance().addProcess(process);
+ ProcessRegistry.getInstance().add(process);
return executionGroupContext.getReportContext().getProcessId();
}
@@ -54,7 +54,7 @@ public final class ProcessEngine {
* @param processId process ID
*/
public void disconnect(final String processId) {
- ProcessRegistry.getInstance().removeProcess(processId);
+ ProcessRegistry.getInstance().remove(processId);
}
@@ -68,7 +68,7 @@ public final class ProcessEngine {
if
(isMySQLDDLOrDMLStatement(queryContext.getSqlStatementContext().getSqlStatement()))
{
ProcessIdContext.set(executionGroupContext.getReportContext().getProcessId());
Process process = new Process(queryContext.getSql(),
executionGroupContext);
- ProcessRegistry.getInstance().addProcess(process);
+ ProcessRegistry.getInstance().add(process);
}
}
@@ -79,7 +79,7 @@ public final class ProcessEngine {
if (ProcessIdContext.isEmpty()) {
return;
}
-
ProcessRegistry.getInstance().getProcess(ProcessIdContext.get()).completeExecutionUnit();
+
ProcessRegistry.getInstance().get(ProcessIdContext.get()).completeExecutionUnit();
}
/**
@@ -89,13 +89,13 @@ public final class ProcessEngine {
if (ProcessIdContext.isEmpty()) {
return;
}
- Process process =
ProcessRegistry.getInstance().getProcess(ProcessIdContext.get());
+ Process process =
ProcessRegistry.getInstance().get(ProcessIdContext.get());
if (null == process) {
return;
}
ExecutionGroupContext<? extends SQLExecutionUnit>
executionGroupContext = new ExecutionGroupContext<>(
Collections.emptyList(), new
ExecutionGroupReportContext(ProcessIdContext.get(), process.getDatabaseName(),
new Grantee(process.getUsername(), process.getHostname())));
- ProcessRegistry.getInstance().addProcess(new
Process(executionGroupContext));
+ ProcessRegistry.getInstance().add(new Process(executionGroupContext));
ProcessIdContext.remove();
}
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessRegistry.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessRegistry.java
index 3899ea2c0e5..0e569e24753 100644
---
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessRegistry.java
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessRegistry.java
@@ -18,9 +18,7 @@
package org.apache.shardingsphere.infra.executor.sql.process;
import lombok.AccessLevel;
-import lombok.Getter;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.infra.executor.sql.process.lock.ShowProcessListLock;
import java.util.Collection;
import java.util.Map;
@@ -36,13 +34,10 @@ public final class ProcessRegistry {
private final Map<String, Process> processes = new ConcurrentHashMap<>();
- @Getter
- private final Map<String, ShowProcessListLock> locks = new
ConcurrentHashMap<>();
-
/**
- * Get show process list manager.
+ * Get process registry.
*
- * @return show process list manager
+ * @return got instance
*/
public static ProcessRegistry getInstance() {
return INSTANCE;
@@ -53,35 +48,35 @@ public final class ProcessRegistry {
*
* @param process process
*/
- public void addProcess(final Process process) {
+ public void add(final Process process) {
processes.put(process.getId(), process);
}
/**
* Get process.
*
- * @param processId process ID
+ * @param id process ID
* @return process
*/
- public Process getProcess(final String processId) {
- return processes.get(processId);
+ public Process get(final String id) {
+ return processes.get(id);
}
/**
* Remove process.
*
- * @param processId process ID
+ * @param id process ID
*/
- public void removeProcess(final String processId) {
- processes.remove(processId);
+ public void remove(final String id) {
+ processes.remove(id);
}
/**
- * Get all process.
+ * List all process.
*
* @return all processes
*/
- public Collection<Process> getAllProcesses() {
+ public Collection<Process> listAll() {
return processes.values();
}
}
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/lock/ShowProcessListLock.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/lock/ProcessOperationLock.java
similarity index 96%
rename from
infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/lock/ShowProcessListLock.java
rename to
infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/lock/ProcessOperationLock.java
index 6c43799c530..f8d8455f2c9 100644
---
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/lock/ShowProcessListLock.java
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/lock/ProcessOperationLock.java
@@ -25,9 +25,9 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
/**
- * Show process list lock.
+ * Process operation lock.
*/
-public final class ShowProcessListLock {
+public final class ProcessOperationLock {
private static final long TIMEOUT_MILLS = 5000L;
diff --git
a/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/lock/ProcessOperationLockRegistry.java
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/lock/ProcessOperationLockRegistry.java
new file mode 100644
index 00000000000..32cd0e54963
--- /dev/null
+++
b/infra/executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/process/lock/ProcessOperationLockRegistry.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.shardingsphere.infra.executor.sql.process.lock;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * Process operation lock registry.
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@Getter
+public final class ProcessOperationLockRegistry {
+
+ private static final ProcessOperationLockRegistry INSTANCE = new
ProcessOperationLockRegistry();
+
+ private final Map<String, ProcessOperationLock> locks = new
ConcurrentHashMap<>();
+
+ /**
+ * Get process registry.
+ *
+ * @return got instance
+ */
+ public static ProcessOperationLockRegistry getInstance() {
+ return INSTANCE;
+ }
+}
diff --git
a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessEngineTest.java
b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessEngineTest.java
index 267b4cffdf5..adc61270f67 100644
---
a/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessEngineTest.java
+++
b/infra/executor/src/test/java/org/apache/shardingsphere/infra/executor/sql/process/ProcessEngineTest.java
@@ -58,7 +58,7 @@ class ProcessEngineTest {
void assertExecuteSQL() {
ExecutionGroupContext<? extends SQLExecutionUnit>
executionGroupContext = mockExecutionGroupContext();
new ProcessEngine().executeSQL(executionGroupContext, new
QueryContext(new UpdateStatementContext(getSQLStatement()), null, null));
- verify(processRegistry).addProcess(any());
+ verify(processRegistry).add(any());
}
@SuppressWarnings("unchecked")
@@ -80,9 +80,9 @@ class ProcessEngineTest {
@Test
void assertCompleteSQLUnitExecution() {
ProcessIdContext.set("foo_id");
-
when(processRegistry.getProcess("foo_id")).thenReturn(mock(Process.class));
+ when(processRegistry.get("foo_id")).thenReturn(mock(Process.class));
new ProcessEngine().completeSQLUnitExecution();
- verify(processRegistry).getProcess("foo_id");
+ verify(processRegistry).get("foo_id");
ProcessIdContext.remove();
}
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ClusterProcessListSubscriber.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ClusterProcessListSubscriber.java
index 5062c63a68c..7d031976c14 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ClusterProcessListSubscriber.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ClusterProcessListSubscriber.java
@@ -18,8 +18,8 @@
package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.process.subscriber;
import com.google.common.eventbus.Subscribe;
-import org.apache.shardingsphere.infra.executor.sql.process.ProcessRegistry;
-import
org.apache.shardingsphere.infra.executor.sql.process.lock.ShowProcessListLock;
+import
org.apache.shardingsphere.infra.executor.sql.process.lock.ProcessOperationLock;
+import
org.apache.shardingsphere.infra.executor.sql.process.lock.ProcessOperationLockRegistry;
import org.apache.shardingsphere.infra.instance.metadata.InstanceType;
import org.apache.shardingsphere.infra.util.eventbus.EventBusContext;
import org.apache.shardingsphere.metadata.persist.node.ComputeNode;
@@ -56,15 +56,15 @@ public final class ClusterProcessListSubscriber implements
ProcessListSubscriber
@Subscribe
public void postShowProcessListData(final ShowProcessListRequestEvent
event) {
String taskId = new UUID(ThreadLocalRandom.current().nextLong(),
ThreadLocalRandom.current().nextLong()).toString().replace("-", "");
- boolean isTriggerCompleted = false;
- Collection<String> triggerPaths = getTriggerPaths(taskId);
+ Collection<String> triggerPaths =
getShowProcessListTriggerPaths(taskId);
+ boolean isCompleted = false;
try {
triggerPaths.forEach(each -> repository.persist(each, ""));
- isTriggerCompleted = waitAllNodeDataReady(taskId, triggerPaths);
+ isCompleted = waitAllInstancesReady(taskId, triggerPaths);
postShowProcessListData(taskId);
} finally {
repository.delete(ProcessNode.getProcessIdPath(taskId));
- if (!isTriggerCompleted) {
+ if (!isCompleted) {
triggerPaths.forEach(repository::delete);
}
}
@@ -76,7 +76,7 @@ public final class ClusterProcessListSubscriber implements
ProcessListSubscriber
eventBusContext.post(new
ShowProcessListResponseEvent(yamlProcessListContexts));
}
- private Collection<String> getTriggerPaths(final String taskId) {
+ private Collection<String> getShowProcessListTriggerPaths(final String
taskId) {
return Stream.of(InstanceType.values())
.flatMap(each ->
repository.getChildrenKeys(ComputeNode.getOnlineNodePath(each)).stream().map(onlinePath
-> ComputeNode.getProcessTriggerInstanceNodePath(onlinePath, taskId)))
.collect(Collectors.toList());
@@ -86,27 +86,27 @@ public final class ClusterProcessListSubscriber implements
ProcessListSubscriber
@Subscribe
public void killProcess(final KillProcessRequestEvent event) {
String processId = event.getId();
- boolean killProcessIdIsComplete = false;
- Collection<String> processKillPaths = getProcessKillPaths(processId);
+ Collection<String> triggerPaths =
getKillProcessTriggerPaths(processId);
+ boolean isCompleted = false;
try {
- processKillPaths.forEach(each -> repository.persist(each, ""));
- killProcessIdIsComplete = waitAllNodeDataReady(processId,
processKillPaths);
+ triggerPaths.forEach(each -> repository.persist(each, ""));
+ isCompleted = waitAllInstancesReady(processId, triggerPaths);
} finally {
- if (!killProcessIdIsComplete) {
- processKillPaths.forEach(repository::delete);
+ if (!isCompleted) {
+ triggerPaths.forEach(repository::delete);
}
}
}
- private Collection<String> getProcessKillPaths(final String processId) {
+ private Collection<String> getKillProcessTriggerPaths(final String
processId) {
return Stream.of(InstanceType.values())
.flatMap(each ->
repository.getChildrenKeys(ComputeNode.getOnlineNodePath(each)).stream().map(onlinePath
-> ComputeNode.getProcessKillInstanceIdNodePath(onlinePath, processId)))
.collect(Collectors.toList());
}
- private boolean waitAllNodeDataReady(final String processId, final
Collection<String> paths) {
- ShowProcessListLock lock = new ShowProcessListLock();
- ProcessRegistry.getInstance().getLocks().put(processId, lock);
+ private boolean waitAllInstancesReady(final String lockId, final
Collection<String> paths) {
+ ProcessOperationLock lock = new ProcessOperationLock();
+ ProcessOperationLockRegistry.getInstance().getLocks().put(lockId,
lock);
lock.lock();
try {
while (!isReady(paths)) {
@@ -117,7 +117,7 @@ public final class ClusterProcessListSubscriber implements
ProcessListSubscriber
return true;
} finally {
lock.unlock();
- ProcessRegistry.getInstance().getLocks().remove(processId);
+
ProcessOperationLockRegistry.getInstance().getLocks().remove(lockId);
}
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriber.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriber.java
index 397d9b76cc9..4f9d34742d6 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriber.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriber.java
@@ -20,7 +20,8 @@ package
org.apache.shardingsphere.mode.manager.cluster.coordinator.registry.proc
import com.google.common.eventbus.Subscribe;
import org.apache.shardingsphere.infra.executor.sql.process.Process;
import org.apache.shardingsphere.infra.executor.sql.process.ProcessRegistry;
-import
org.apache.shardingsphere.infra.executor.sql.process.lock.ShowProcessListLock;
+import
org.apache.shardingsphere.infra.executor.sql.process.lock.ProcessOperationLock;
+import
org.apache.shardingsphere.infra.executor.sql.process.lock.ProcessOperationLockRegistry;
import
org.apache.shardingsphere.infra.executor.sql.process.yaml.swapper.YamlProcessListSwapper;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.metadata.persist.node.ComputeNode;
@@ -64,7 +65,7 @@ public final class ProcessListChangedSubscriber {
if
(!event.getInstanceId().equals(contextManager.getInstanceContext().getInstance().getMetaData().getId()))
{
return;
}
- Collection<Process> processes =
ProcessRegistry.getInstance().getAllProcesses();
+ Collection<Process> processes =
ProcessRegistry.getInstance().listAll();
if (!processes.isEmpty()) {
registryCenter.getRepository().persist(
ProcessNode.getProcessListInstancePath(event.getTaskId(),
event.getInstanceId()),
YamlEngine.marshal(swapper.swapToYamlConfiguration(processes)));
@@ -79,7 +80,7 @@ public final class ProcessListChangedSubscriber {
*/
@Subscribe
public synchronized void completeToReportLocalProcesses(final
ReportLocalProcessesCompletedEvent event) {
- ShowProcessListLock lock =
ProcessRegistry.getInstance().getLocks().get(event.getTaskId());
+ ProcessOperationLock lock =
ProcessOperationLockRegistry.getInstance().getLocks().get(event.getTaskId());
if (null != lock) {
lock.doNotify();
}
@@ -96,7 +97,7 @@ public final class ProcessListChangedSubscriber {
if
(!event.getInstanceId().equals(contextManager.getInstanceContext().getInstance().getMetaData().getId()))
{
return;
}
- Process process =
ProcessRegistry.getInstance().getProcess(event.getProcessId());
+ Process process =
ProcessRegistry.getInstance().get(event.getProcessId());
if (null != process) {
for (Statement each : process.getProcessStatements()) {
each.cancel();
@@ -112,7 +113,7 @@ public final class ProcessListChangedSubscriber {
*/
@Subscribe
public synchronized void completeToKillProcessInstance(final
KillProcessInstanceCompleteEvent event) {
- ShowProcessListLock lock =
ProcessRegistry.getInstance().getLocks().get(event.getProcessId());
+ ProcessOperationLock lock =
ProcessOperationLockRegistry.getInstance().getLocks().get(event.getProcessId());
if (null != lock) {
lock.doNotify();
}
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriberTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriberTest.java
index ffbd7db80c1..1302b652be9 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriberTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/subscriber/ProcessListChangedSubscriberTest.java
@@ -22,7 +22,8 @@ import
org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
import org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import org.apache.shardingsphere.infra.executor.sql.process.Process;
import org.apache.shardingsphere.infra.executor.sql.process.ProcessRegistry;
-import
org.apache.shardingsphere.infra.executor.sql.process.lock.ShowProcessListLock;
+import
org.apache.shardingsphere.infra.executor.sql.process.lock.ProcessOperationLock;
+import
org.apache.shardingsphere.infra.executor.sql.process.lock.ProcessOperationLockRegistry;
import org.apache.shardingsphere.infra.instance.metadata.InstanceMetaData;
import
org.apache.shardingsphere.infra.instance.metadata.proxy.ProxyInstanceMetaData;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
@@ -105,7 +106,7 @@ class ProcessListChangedSubscriberTest {
Process process = mock(Process.class);
String processId = "foo_id";
when(process.getId()).thenReturn(processId);
- ProcessRegistry.getInstance().addProcess(process);
+ ProcessRegistry.getInstance().add(process);
subscriber.reportLocalProcesses(new
ShowProcessListTriggerEvent(instanceId, processId));
ClusterPersistRepository repository = ((RegistryCenter)
Plugins.getMemberAccessor().get(ProcessListChangedSubscriber.class.getDeclaredField("registryCenter"),
subscriber)).getRepository();
verify(repository).persist("/execution_nodes/foo_id/" + instanceId,
@@ -116,8 +117,8 @@ class ProcessListChangedSubscriberTest {
@Test
void assertCompleteToReportLocalProcesses() {
String taskId = "foo_id";
- ShowProcessListLock lock = new ShowProcessListLock();
- ProcessRegistry.getInstance().getLocks().put(taskId, lock);
+ ProcessOperationLock lock = new ProcessOperationLock();
+ ProcessOperationLockRegistry.getInstance().getLocks().put(taskId,
lock);
long startMillis = System.currentTimeMillis();
ExecutorService executorService = Executors.newFixedThreadPool(1);
executorService.submit(() -> {
@@ -131,7 +132,7 @@ class ProcessListChangedSubscriberTest {
long currentTime = System.currentTimeMillis();
assertTrue(currentTime >= startMillis + 50L);
assertTrue(currentTime <= startMillis + 5000L);
- ProcessRegistry.getInstance().getLocks().remove(taskId);
+ ProcessOperationLockRegistry.getInstance().getLocks().remove(taskId);
}
@Test
@@ -146,8 +147,8 @@ class ProcessListChangedSubscriberTest {
@Test
void assertCompleteToKillProcessInstance() {
String processId = "foo_id";
- ShowProcessListLock lock = new ShowProcessListLock();
- ProcessRegistry.getInstance().getLocks().put(processId, lock);
+ ProcessOperationLock lock = new ProcessOperationLock();
+ ProcessOperationLockRegistry.getInstance().getLocks().put(processId,
lock);
long startMillis = System.currentTimeMillis();
ExecutorService executorService = Executors.newFixedThreadPool(1);
executorService.submit(() -> {
@@ -161,10 +162,10 @@ class ProcessListChangedSubscriberTest {
long currentTime = System.currentTimeMillis();
assertTrue(currentTime >= startMillis + 50L);
assertTrue(currentTime <= startMillis + 5000L);
- ProcessRegistry.getInstance().getLocks().remove(processId);
+
ProcessOperationLockRegistry.getInstance().getLocks().remove(processId);
}
- private void lockAndAwaitDefaultTime(final ShowProcessListLock lock) {
+ private void lockAndAwaitDefaultTime(final ProcessOperationLock lock) {
lock.lock();
try {
lock.awaitDefaultTime();
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/StandaloneProcessListSubscriber.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/StandaloneProcessListSubscriber.java
index 8c5b6ec9213..0ec7320a19d 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/StandaloneProcessListSubscriber.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/StandaloneProcessListSubscriber.java
@@ -51,14 +51,14 @@ public final class StandaloneProcessListSubscriber
implements ProcessListSubscri
@Override
@Subscribe
public void postShowProcessListData(final ShowProcessListRequestEvent
event) {
- YamlProcessList yamlProcessList =
swapper.swapToYamlConfiguration(ProcessRegistry.getInstance().getAllProcesses());
+ YamlProcessList yamlProcessList =
swapper.swapToYamlConfiguration(ProcessRegistry.getInstance().listAll());
eventBusContext.post(new
ShowProcessListResponseEvent(Collections.singleton(YamlEngine.marshal(yamlProcessList))));
}
@Override
@Subscribe
public void killProcess(final KillProcessRequestEvent event) throws
SQLException {
- Process process =
ProcessRegistry.getInstance().getProcess(event.getId());
+ Process process = ProcessRegistry.getInstance().get(event.getId());
if (null == process) {
return;
}
diff --git
a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/StandaloneProcessListSubscriberTest.java
b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/StandaloneProcessListSubscriberTest.java
index 6e5abc86655..5d3fce58550 100644
---
a/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/StandaloneProcessListSubscriberTest.java
+++
b/mode/type/standalone/core/src/test/java/org/apache/shardingsphere/mode/manager/standalone/subscriber/StandaloneProcessListSubscriberTest.java
@@ -38,6 +38,6 @@ class StandaloneProcessListSubscriberTest {
ProcessRegistry processRegistry = mock(ProcessRegistry.class);
when(ProcessRegistry.getInstance()).thenReturn(processRegistry);
new StandaloneProcessListSubscriber(new
EventBusContext()).postShowProcessListData(new ShowProcessListRequestEvent());
- verify(processRegistry).getAllProcesses();
+ verify(processRegistry).listAll();
}
}
