This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 5ec38addc07 Refactor ComputeNodePersistService (#34305)
5ec38addc07 is described below
commit 5ec38addc07b90d69cf7e3620aa70a34a2353a10
Author: Liang Zhang <[email protected]>
AuthorDate: Sat Jan 11 01:15:25 2025 +0800
Refactor ComputeNodePersistService (#34305)
---
.../instance/metadata/InstanceMetaDataFactory.java | 2 +-
.../service/unified/ComputeNodePersistService.java | 142 ++++++++++-----------
.../unified/ComputeNodePersistServiceTest.java | 89 ++++++-------
.../cluster/ClusterContextManagerBuilder.java | 2 +-
.../handler/global/ComputeNodeOnlineHandler.java | 2 +-
.../cluster/workerid/ClusterWorkerIdGenerator.java | 4 +-
.../global/ComputeNodeOnlineHandlerTest.java | 2 +-
.../workerid/ClusterWorkerIdGeneratorTest.java | 4 +-
.../ral/updatable/LabelComputeNodeExecutor.java | 2 +-
.../ral/updatable/SetComputeNodeStateExecutor.java | 2 +-
.../ral/updatable/UnlabelComputeNodeExecutor.java | 4 +-
11 files changed, 122 insertions(+), 133 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/metadata/InstanceMetaDataFactory.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/metadata/InstanceMetaDataFactory.java
index 4eee8cc2d60..56037d0cb04 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/metadata/InstanceMetaDataFactory.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/metadata/InstanceMetaDataFactory.java
@@ -33,7 +33,7 @@ public final class InstanceMetaDataFactory {
* Create instance meta data.
*
* @param instanceId instance ID
- * @param instanceType instance type
+ * @param instanceType instance type
* @param computeNodeData compute node data
* @return created instance meta data
*/
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/ComputeNodePersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/ComputeNodePersistService.java
index b72f0f03167..1c1e5614521 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/ComputeNodePersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/persist/service/unified/ComputeNodePersistService.java
@@ -55,129 +55,125 @@ public final class ComputeNodePersistService {
* @param computeNodeInstance compute node instance
*/
public void registerOnline(final ComputeNodeInstance computeNodeInstance) {
- String instanceId = computeNodeInstance.getMetaData().getId();
+ persistOnline(computeNodeInstance);
+ updateState(computeNodeInstance.getMetaData().getId(),
computeNodeInstance.getState().getCurrentState());
+ persistLabels(computeNodeInstance.getMetaData().getId(),
computeNodeInstance.getLabels());
+ }
+
+ private void persistOnline(final ComputeNodeInstance computeNodeInstance) {
ComputeNodeData computeNodeData = new ComputeNodeData(
computeNodeInstance.getMetaData().getDatabaseName(),
computeNodeInstance.getMetaData().getAttributes(),
computeNodeInstance.getMetaData().getVersion());
- repository.persistEphemeral(ComputeNodePath.getOnlinePath(instanceId,
computeNodeInstance.getMetaData().getType()),
+
repository.persistEphemeral(ComputeNodePath.getOnlinePath(computeNodeInstance.getMetaData().getId(),
computeNodeInstance.getMetaData().getType()),
YamlEngine.marshal(new
YamlComputeNodeDataSwapper().swapToYamlConfiguration(computeNodeData)));
- repository.persistEphemeral(ComputeNodePath.getStatePath(instanceId),
computeNodeInstance.getState().getCurrentState().name());
- persistInstanceLabels(instanceId, computeNodeInstance.getLabels());
}
/**
- * Persist instance labels.
- *
- * @param instanceId instance ID
- * @param labels instance labels
- */
- public void persistInstanceLabels(final String instanceId, final
Collection<String> labels) {
- repository.persistEphemeral(ComputeNodePath.getLabelsPath(instanceId),
YamlEngine.marshal(labels));
- }
-
- /**
- * Persist instance worker ID.
- *
- * @param instanceId instance ID
- * @param workerId worker ID
- */
- public void persistInstanceWorkerId(final String instanceId, final int
workerId) {
-
repository.persistEphemeral(ComputeNodePath.getWorkerIdPath(instanceId),
String.valueOf(workerId));
- }
-
- /**
- * Load compute node state.
- *
- * @param instanceId instance ID
- * @return state
- */
- public String loadComputeNodeState(final String instanceId) {
- return repository.query(ComputeNodePath.getStatePath(instanceId));
- }
-
- /**
- * Load instance worker ID.
+ * Compute node offline.
*
- * @param instanceId instance ID
- * @return worker ID
+ * @param computeNodeInstance compute node instance
*/
- public Optional<Integer> loadInstanceWorkerId(final String instanceId) {
- try {
- String workerId =
repository.query(ComputeNodePath.getWorkerIdPath(instanceId));
- return Strings.isNullOrEmpty(workerId) ? Optional.empty() :
Optional.of(Integer.valueOf(workerId));
- } catch (final NumberFormatException ex) {
- log.error("Invalid worker id for instance: {}", instanceId);
- }
- return Optional.empty();
+ public void offline(final ComputeNodeInstance computeNodeInstance) {
+
repository.delete(ComputeNodePath.getOnlinePath(computeNodeInstance.getMetaData().getId(),
computeNodeInstance.getMetaData().getType()));
}
/**
* Load all compute node instances.
*
- * @return loaded compute node instances
+ * @return loaded instances
*/
- public Collection<ComputeNodeInstance> loadAllComputeNodeInstances() {
- return Arrays.stream(InstanceType.values()).flatMap(each ->
loadComputeNodeInstances(each).stream()).collect(Collectors.toList());
+ public Collection<ComputeNodeInstance> loadAllInstances() {
+ return Arrays.stream(InstanceType.values()).flatMap(each ->
loadInstances(each).stream()).collect(Collectors.toList());
}
- private Collection<ComputeNodeInstance> loadComputeNodeInstances(final
InstanceType instanceType) {
+ private Collection<ComputeNodeInstance> loadInstances(final InstanceType
instanceType) {
Collection<ComputeNodeInstance> result = new LinkedList<>();
for (String each :
repository.getChildrenKeys(ComputeNodePath.getOnlinePath(instanceType))) {
String value =
repository.query(ComputeNodePath.getOnlinePath(each, instanceType));
- if (Strings.isNullOrEmpty(value)) {
- continue;
+ if (!Strings.isNullOrEmpty(value)) {
+ result.add(loadInstance(
+ InstanceMetaDataFactory.create(each, instanceType, new
YamlComputeNodeDataSwapper().swapToObject(YamlEngine.unmarshal(value,
YamlComputeNodeData.class)))));
}
- result.add(loadComputeNodeInstance(
- InstanceMetaDataFactory.create(each, instanceType, new
YamlComputeNodeDataSwapper().swapToObject(YamlEngine.unmarshal(value,
YamlComputeNodeData.class)))));
}
return result;
}
/**
- * Load compute node instance by instance meta data.
+ * Load compute node instance.
*
* @param instanceMetaData instance meta data
- * @return compute node instance
+ * @return loaded instance
*/
- public ComputeNodeInstance loadComputeNodeInstance(final InstanceMetaData
instanceMetaData) {
+ public ComputeNodeInstance loadInstance(final InstanceMetaData
instanceMetaData) {
ComputeNodeInstance result = new ComputeNodeInstance(instanceMetaData);
-
result.getLabels().addAll(loadInstanceLabels(instanceMetaData.getId()));
-
InstanceState.get(loadComputeNodeState(instanceMetaData.getId())).ifPresent(result::switchState);
-
loadInstanceWorkerId(instanceMetaData.getId()).ifPresent(result::setWorkerId);
+
InstanceState.get(loadState(instanceMetaData.getId())).ifPresent(result::switchState);
+ result.getLabels().addAll(loadLabels(instanceMetaData.getId()));
+ loadWorkerId(instanceMetaData.getId()).ifPresent(result::setWorkerId);
return result;
}
+ private String loadState(final String instanceId) {
+ return repository.query(ComputeNodePath.getStatePath(instanceId));
+ }
+
@SuppressWarnings("unchecked")
- private Collection<String> loadInstanceLabels(final String instanceId) {
+ private Collection<String> loadLabels(final String instanceId) {
String yamlContent =
repository.query(ComputeNodePath.getLabelsPath(instanceId));
return Strings.isNullOrEmpty(yamlContent) ? Collections.emptyList() :
YamlEngine.unmarshal(yamlContent, Collection.class);
}
/**
- * Get assigned worker IDs.
+ * Update state.
*
- * @return assigned worker IDs
+ * @param instanceId instance ID
+ * @param instanceState instance state
*/
- public Collection<Integer> getAssignedWorkerIds() {
- Collection<String> instanceIds =
repository.getChildrenKeys(ComputeNodePath.getWorkerIdRootPath());
- return instanceIds.stream().map(each ->
repository.query(ComputeNodePath.getWorkerIdPath(each))).filter(Objects::nonNull).map(Integer::parseInt).collect(Collectors.toSet());
+ public void updateState(final String instanceId, final InstanceState
instanceState) {
+ repository.persistEphemeral(ComputeNodePath.getStatePath(instanceId),
instanceState.name());
}
/**
- * Update compute node state.
+ * Persist labels.
*
* @param instanceId instance ID
- * @param instanceState instance state
+ * @param labels instance labels
*/
- public void updateComputeNodeState(final String instanceId, final
InstanceState instanceState) {
- repository.persistEphemeral(ComputeNodePath.getStatePath(instanceId),
instanceState.name());
+ public void persistLabels(final String instanceId, final
Collection<String> labels) {
+ repository.persistEphemeral(ComputeNodePath.getLabelsPath(instanceId),
YamlEngine.marshal(labels));
}
/**
- * Compute node offline.
+ * Persist worker ID.
*
- * @param computeNodeInstance compute node instance
+ * @param instanceId instance ID
+ * @param workerId worker ID
*/
- public void offline(final ComputeNodeInstance computeNodeInstance) {
-
repository.delete(ComputeNodePath.getOnlinePath(computeNodeInstance.getMetaData().getId(),
computeNodeInstance.getMetaData().getType()));
+ public void persistWorkerId(final String instanceId, final int workerId) {
+
repository.persistEphemeral(ComputeNodePath.getWorkerIdPath(instanceId),
String.valueOf(workerId));
+ }
+
+ /**
+ * Load worker ID.
+ *
+ * @param instanceId instance ID
+ * @return worker ID
+ */
+ public Optional<Integer> loadWorkerId(final String instanceId) {
+ try {
+ String workerId =
repository.query(ComputeNodePath.getWorkerIdPath(instanceId));
+ return Strings.isNullOrEmpty(workerId) ? Optional.empty() :
Optional.of(Integer.valueOf(workerId));
+ } catch (final NumberFormatException ex) {
+ log.error("Invalid worker id for instance: {}", instanceId);
+ return Optional.empty();
+ }
+ }
+
+ /**
+ * Get assigned worker IDs.
+ *
+ * @return assigned worker IDs
+ */
+ public Collection<Integer> getAssignedWorkerIds() {
+ Collection<String> instanceIds =
repository.getChildrenKeys(ComputeNodePath.getWorkerIdRootPath());
+ return instanceIds.stream().map(each ->
repository.query(ComputeNodePath.getWorkerIdPath(each))).filter(Objects::nonNull).map(Integer::parseInt).collect(Collectors.toSet());
}
}
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/persist/service/unified/ComputeNodePersistServiceTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/persist/service/unified/ComputeNodePersistServiceTest.java
index 50c73be6236..ce9a5fe7345 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/persist/service/unified/ComputeNodePersistServiceTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/persist/service/unified/ComputeNodePersistServiceTest.java
@@ -68,66 +68,71 @@ class ComputeNodePersistServiceTest {
}
@Test
- void assertPersistInstanceLabels() {
- String instanceId = new ProxyInstanceMetaData("foo_instance_id",
3307).getId();
- computeNodePersistService.persistInstanceLabels(instanceId,
Collections.singletonList("test"));
-
verify(repository).persistEphemeral("/nodes/compute_nodes/labels/foo_instance_id",
YamlEngine.marshal(Collections.singletonList("test")));
+ void assertOffline() {
+ computeNodePersistService.offline(new ComputeNodeInstance(new
ProxyInstanceMetaData("foo_instance_id", 3307)));
+
verify(repository).delete("/nodes/compute_nodes/online/proxy/foo_instance_id");
}
@Test
- void assertPersistInstanceWorkerId() {
- String instanceId = new ProxyInstanceMetaData("foo_instance_id",
3307).getId();
- computeNodePersistService.persistInstanceWorkerId(instanceId, 100);
-
verify(repository).persistEphemeral("/nodes/compute_nodes/worker_id/foo_instance_id",
String.valueOf(100));
+ void assertLoadAllInstances() {
+
when(repository.getChildrenKeys("/nodes/compute_nodes/online/jdbc")).thenReturn(Collections.singletonList("foo_instance_3307"));
+
when(repository.getChildrenKeys("/nodes/compute_nodes/online/proxy")).thenReturn(Collections.singletonList("foo_instance_3308"));
+ YamlComputeNodeData yamlComputeNodeData0 = new YamlComputeNodeData();
+ yamlComputeNodeData0.setAttribute("127.0.0.1");
+ yamlComputeNodeData0.setVersion("foo_version");
+
when(repository.query("/nodes/compute_nodes/online/jdbc/foo_instance_3307")).thenReturn(YamlEngine.marshal(yamlComputeNodeData0));
+ List<ComputeNodeInstance> actual = new
ArrayList<>(computeNodePersistService.loadAllInstances());
+ assertThat(actual.size(), is(1));
+ assertThat(actual.get(0).getMetaData().getId(),
is("foo_instance_3307"));
+ assertThat(actual.get(0).getMetaData().getIp(), is("127.0.0.1"));
}
@Test
- void assertLoadComputeNodeState() {
- String instanceId = new ProxyInstanceMetaData("foo_instance_id",
3307).getId();
-
when(repository.query("/nodes/compute_nodes/status/foo_instance_id")).thenReturn("OK");
- assertThat(computeNodePersistService.loadComputeNodeState(instanceId),
is("OK"));
+ void assertLoadInstance() {
+ InstanceMetaData instanceMetaData = new
ProxyInstanceMetaData("foo_instance_id", 3307);
+ ComputeNodeInstance actual =
computeNodePersistService.loadInstance(instanceMetaData);
+ assertThat(actual.getMetaData(), is(instanceMetaData));
}
@Test
- void assertLoadInstanceWorkerId() {
+ void assertUpdateState() {
+ computeNodePersistService.updateState("foo_instance_id",
InstanceState.OK);
+
verify(repository).persistEphemeral("/nodes/compute_nodes/status/foo_instance_id",
InstanceState.OK.name());
+ }
+
+ @Test
+ void assertPersistLabels() {
String instanceId = new ProxyInstanceMetaData("foo_instance_id",
3307).getId();
-
when(repository.query("/nodes/compute_nodes/worker_id/foo_instance_id")).thenReturn("1");
- assertThat(computeNodePersistService.loadInstanceWorkerId(instanceId),
is(Optional.of(1)));
+ computeNodePersistService.persistLabels(instanceId,
Collections.singletonList("test"));
+
verify(repository).persistEphemeral("/nodes/compute_nodes/labels/foo_instance_id",
YamlEngine.marshal(Collections.singletonList("test")));
}
@Test
- void assertLoadWithEmptyInstanceWorkerId() {
+ void assertPersistWorkerId() {
String instanceId = new ProxyInstanceMetaData("foo_instance_id",
3307).getId();
-
when(repository.query("/nodes/compute_nodes/worker_id/foo_instance_id")).thenReturn("");
-
assertFalse(computeNodePersistService.loadInstanceWorkerId(instanceId).isPresent());
+ computeNodePersistService.persistWorkerId(instanceId, 100);
+
verify(repository).persistEphemeral("/nodes/compute_nodes/worker_id/foo_instance_id",
String.valueOf(100));
}
@Test
- void assertLoadInstanceWorkerIdWithInvalidFormat() {
+ void assertLoadWorkerId() {
String instanceId = new ProxyInstanceMetaData("foo_instance_id",
3307).getId();
-
when(repository.query("/nodes/compute_nodes/worker_id/foo_instance_id")).thenReturn("a");
-
assertFalse(computeNodePersistService.loadInstanceWorkerId(instanceId).isPresent());
+
when(repository.query("/nodes/compute_nodes/worker_id/foo_instance_id")).thenReturn("1");
+ assertThat(computeNodePersistService.loadWorkerId(instanceId),
is(Optional.of(1)));
}
@Test
- void assertLoadAllComputeNodeInstances() {
-
when(repository.getChildrenKeys("/nodes/compute_nodes/online/jdbc")).thenReturn(Collections.singletonList("foo_instance_3307"));
-
when(repository.getChildrenKeys("/nodes/compute_nodes/online/proxy")).thenReturn(Collections.singletonList("foo_instance_3308"));
- YamlComputeNodeData yamlComputeNodeData0 = new YamlComputeNodeData();
- yamlComputeNodeData0.setAttribute("127.0.0.1");
- yamlComputeNodeData0.setVersion("foo_version");
-
when(repository.query("/nodes/compute_nodes/online/jdbc/foo_instance_3307")).thenReturn(YamlEngine.marshal(yamlComputeNodeData0));
- List<ComputeNodeInstance> actual = new
ArrayList<>(computeNodePersistService.loadAllComputeNodeInstances());
- assertThat(actual.size(), is(1));
- assertThat(actual.get(0).getMetaData().getId(),
is("foo_instance_3307"));
- assertThat(actual.get(0).getMetaData().getIp(), is("127.0.0.1"));
+ void assertLoadWithEmptyWorkerId() {
+ String instanceId = new ProxyInstanceMetaData("foo_instance_id",
3307).getId();
+
when(repository.query("/nodes/compute_nodes/worker_id/foo_instance_id")).thenReturn("");
+
assertFalse(computeNodePersistService.loadWorkerId(instanceId).isPresent());
}
@Test
- void assertLoadComputeNodeInstance() {
- InstanceMetaData instanceMetaData = new
ProxyInstanceMetaData("foo_instance_id", 3307);
- ComputeNodeInstance actual =
computeNodePersistService.loadComputeNodeInstance(instanceMetaData);
- assertThat(actual.getMetaData(), is(instanceMetaData));
+ void assertLoadWorkerIdWithInvalidFormat() {
+ String instanceId = new ProxyInstanceMetaData("foo_instance_id",
3307).getId();
+
when(repository.query("/nodes/compute_nodes/worker_id/foo_instance_id")).thenReturn("a");
+
assertFalse(computeNodePersistService.loadWorkerId(instanceId).isPresent());
}
@Test
@@ -137,16 +142,4 @@ class ComputeNodePersistServiceTest {
when(repository.query("/nodes/compute_nodes/worker_id/2")).thenReturn("2");
assertThat(computeNodePersistService.getAssignedWorkerIds(),
is(Collections.singleton(2)));
}
-
- @Test
- void assertUpdateComputeNodeState() {
- computeNodePersistService.updateComputeNodeState("foo_instance_id",
InstanceState.OK);
-
verify(repository).persistEphemeral("/nodes/compute_nodes/status/foo_instance_id",
InstanceState.OK.name());
- }
-
- @Test
- void assertOffline() {
- computeNodePersistService.offline(new ComputeNodeInstance(new
ProxyInstanceMetaData("foo_instance_id", 3307)));
-
verify(repository).delete("/nodes/compute_nodes/online/proxy/foo_instance_id");
- }
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
index e53b3fd87f9..c6257cc6c9b 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -78,7 +78,7 @@ public final class ClusterContextManagerBuilder implements
ContextManagerBuilder
final ContextManager contextManager, final
PersistRepository repository) {
contextManager.getPersistServiceFacade().getComputeNodePersistService().registerOnline(computeNodeInstanceContext.getInstance());
contextManager.getComputeNodeInstanceContext().getClusterInstanceRegistry().getAllClusterInstances()
-
.addAll(contextManager.getPersistServiceFacade().getComputeNodePersistService().loadAllComputeNodeInstances());
+
.addAll(contextManager.getPersistServiceFacade().getComputeNodePersistService().loadAllInstances());
new DataChangedEventListenerRegistry(contextManager,
getDatabaseNames(param,
contextManager.getPersistServiceFacade().getMetaDataPersistService())).register();
DeliverEventSubscriberRegistry deliverEventSubscriberRegistry = new
DeliverEventSubscriberRegistry(contextManager.getComputeNodeInstanceContext().getEventBusContext());
deliverEventSubscriberRegistry.register(createDeliverEventSubscribers(repository));
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeOnlineHandler.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeOnlineHandler.java
index 281d145c1d9..07012875c59 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeOnlineHandler.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeOnlineHandler.java
@@ -61,7 +61,7 @@ public final class ComputeNodeOnlineHandler implements
DataChangedEventHandler {
InstanceMetaData instanceMetaData =
InstanceMetaDataFactory.create(matcher.group(2),
InstanceType.valueOf(matcher.group(1).toUpperCase()), computeNodeData);
if (Type.ADDED == event.getType()) {
contextManager.getComputeNodeInstanceContext().getClusterInstanceRegistry()
-
.add(contextManager.getPersistServiceFacade().getComputeNodePersistService().loadComputeNodeInstance(instanceMetaData));
+
.add(contextManager.getPersistServiceFacade().getComputeNodePersistService().loadInstance(instanceMetaData));
} else if (Type.DELETED == event.getType()) {
contextManager.getComputeNodeInstanceContext().getClusterInstanceRegistry().delete(new
ComputeNodeInstance(instanceMetaData));
}
diff --git
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/workerid/ClusterWorkerIdGenerator.java
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/workerid/ClusterWorkerIdGenerator.java
index 8345253faff..dbf581889ca 100644
---
a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/workerid/ClusterWorkerIdGenerator.java
+++
b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/workerid/ClusterWorkerIdGenerator.java
@@ -56,7 +56,7 @@ public final class ClusterWorkerIdGenerator implements
WorkerIdGenerator {
@Override
public int generate(final Properties props) {
- int result =
computeNodePersistService.loadInstanceWorkerId(instanceId).orElseGet(this::generateNewWorkerId);
+ int result =
computeNodePersistService.loadWorkerId(instanceId).orElseGet(this::generateNewWorkerId);
logWarning(result, props);
return result;
}
@@ -67,7 +67,7 @@ public final class ClusterWorkerIdGenerator implements
WorkerIdGenerator {
generatedWorkId = generateAvailableWorkerId();
} while (!generatedWorkId.isPresent());
int result = generatedWorkId.get();
- computeNodePersistService.persistInstanceWorkerId(instanceId, result);
+ computeNodePersistService.persistWorkerId(instanceId, result);
return result;
}
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeOnlineHandlerTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeOnlineHandlerTest.java
index 4f56f1941d7..7b25a1f95e4 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeOnlineHandlerTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/dispatch/handler/global/ComputeNodeOnlineHandlerTest.java
@@ -59,7 +59,7 @@ class ComputeNodeOnlineHandlerTest {
@Test
void assertHandleWithInstanceOnlineEvent() {
ComputeNodeInstance computeNodeInstance =
mock(ComputeNodeInstance.class);
-
when(contextManager.getPersistServiceFacade().getComputeNodePersistService().loadComputeNodeInstance(any())).thenReturn(computeNodeInstance);
+
when(contextManager.getPersistServiceFacade().getComputeNodePersistService().loadInstance(any())).thenReturn(computeNodeInstance);
handler.handle(contextManager, new
DataChangedEvent("/nodes/compute_nodes/online/proxy/foo_instance_id",
"{attribute: 127.0.0.1@3307,version: 1}", Type.ADDED));
verify(contextManager.getComputeNodeInstanceContext().getClusterInstanceRegistry()).add(computeNodeInstance);
}
diff --git
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/workerid/ClusterWorkerIdGeneratorTest.java
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/workerid/ClusterWorkerIdGeneratorTest.java
index e885965f44c..0209cbf900b 100644
---
a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/workerid/ClusterWorkerIdGeneratorTest.java
+++
b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/workerid/ClusterWorkerIdGeneratorTest.java
@@ -64,7 +64,7 @@ class ClusterWorkerIdGeneratorTest {
@Test
void assertGenerateWithExistedWorkerId() {
-
when(computeNodePersistService.loadInstanceWorkerId("foo_id")).thenReturn(Optional.of(10));
+
when(computeNodePersistService.loadWorkerId("foo_id")).thenReturn(Optional.of(10));
assertThat(workerIdGenerator.generate(new Properties()), is(10));
}
@@ -87,7 +87,7 @@ class ClusterWorkerIdGeneratorTest {
@Test
void assertGenerateWorkerIdWithWarnLog() {
-
when(computeNodePersistService.loadInstanceWorkerId("foo_id")).thenReturn(Optional.of(10));
+
when(computeNodePersistService.loadWorkerId("foo_id")).thenReturn(Optional.of(10));
assertThat(workerIdGenerator.generate(PropertiesBuilder.build(new
Property(WorkerIdGenerator.WORKER_ID_KEY, "100"))), is(10));
assertThat(workerIdGenerator.generate(PropertiesBuilder.build(new
Property(WorkerIdGenerator.WORKER_ID_KEY, "100"))), is(10));
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LabelComputeNodeExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LabelComputeNodeExecutor.java
index 3c5a69e011c..6d69e9ee4e0 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LabelComputeNodeExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/LabelComputeNodeExecutor.java
@@ -44,7 +44,7 @@ public final class LabelComputeNodeExecutor implements
DistSQLUpdateExecutor<Lab
if (!sqlStatement.isOverwrite()) {
labels.addAll(computeNodeInstance.get().getLabels());
}
-
contextManager.getPersistServiceFacade().getComputeNodePersistService().persistInstanceLabels(instanceId,
new LinkedList<>(labels));
+
contextManager.getPersistServiceFacade().getComputeNodePersistService().persistLabels(instanceId,
new LinkedList<>(labels));
}
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetComputeNodeStateExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetComputeNodeStateExecutor.java
index 7dd1e314a7a..0043b7e0c10 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetComputeNodeStateExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/SetComputeNodeStateExecutor.java
@@ -38,7 +38,7 @@ public final class SetComputeNodeStateExecutor implements
DistSQLUpdateExecutor<
} else {
checkEnablingIsValid(contextManager, sqlStatement.getInstanceId());
}
-
contextManager.getPersistServiceFacade().getComputeNodePersistService().updateComputeNodeState(sqlStatement.getInstanceId(),
+
contextManager.getPersistServiceFacade().getComputeNodePersistService().updateState(sqlStatement.getInstanceId(),
"DISABLE".equals(sqlStatement.getState()) ?
InstanceState.CIRCUIT_BREAK : InstanceState.OK);
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlabelComputeNodeExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlabelComputeNodeExecutor.java
index abc998d1956..eedab1dd6dd 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlabelComputeNodeExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/UnlabelComputeNodeExecutor.java
@@ -42,10 +42,10 @@ public final class UnlabelComputeNodeExecutor implements
DistSQLUpdateExecutor<U
if (computeNodeInstance.isPresent()) {
Collection<String> labels = new
LinkedHashSet<>(computeNodeInstance.get().getLabels());
if (sqlStatement.getLabels().isEmpty()) {
-
contextManager.getPersistServiceFacade().getComputeNodePersistService().persistInstanceLabels(instanceId,
Collections.emptyList());
+
contextManager.getPersistServiceFacade().getComputeNodePersistService().persistLabels(instanceId,
Collections.emptyList());
} else {
labels.removeAll(sqlStatement.getLabels());
-
contextManager.getPersistServiceFacade().getComputeNodePersistService().persistInstanceLabels(instanceId,
new ArrayList<>(labels));
+
contextManager.getPersistServiceFacade().getComputeNodePersistService().persistLabels(instanceId,
new ArrayList<>(labels));
}
}
}
