This is an automated email from the ASF dual-hosted git repository.
wuweijie 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 0071f20 Merge RegistryCenter.registerInstanceOnline and
initStateNodes (#10518)
0071f20 is described below
commit 0071f2065cfe9beb2efcee57a92fb82fa628d84d
Author: Liang Zhang <[email protected]>
AuthorDate: Fri May 28 14:02:35 2021 +0800
Merge RegistryCenter.registerInstanceOnline and initStateNodes (#10518)
---
.../governance/core/facade/GovernanceFacade.java | 1 -
.../governance/core/registry/RegistryCenter.java | 10 ++--------
.../governance/core/facade/GovernanceFacadeTest.java | 1 -
.../governance/core/registry/RegistryCenterTest.java | 9 ++-------
4 files changed, 4 insertions(+), 17 deletions(-)
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacade.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacade.java
index 271c58e..4d06eae 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacade.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacade.java
@@ -78,7 +78,6 @@ public final class GovernanceFacade implements AutoCloseable {
*/
public void onlineInstance() {
registryCenter.registerInstanceOnline();
- registryCenter.initStateNodes();
listenerManager.initListeners();
}
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCenter.java
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCenter.java
index 7b46a57..c6e6e94 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCenter.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCenter.java
@@ -89,14 +89,6 @@ public final class RegistryCenter {
}
/**
- * Initialize state nodes.
- */
- public void initStateNodes() {
- repository.persist(StatesNode.getDataNodesPath(), "");
- repository.persist(StatesNode.getPrimaryNodesPath(), "");
- }
-
- /**
* Persist configurations.
*
* @param dataSourceConfigs schema and data source configuration map
@@ -137,6 +129,8 @@ public final class RegistryCenter {
* Register instance online.
*/
public void registerInstanceOnline() {
+ repository.persist(StatesNode.getDataNodesPath(), "");
+ repository.persist(StatesNode.getPrimaryNodesPath(), "");
repository.persistEphemeral(StatesNode.getProxyNodePath(instanceId),
"");
}
}
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java
index b2a6efd..91ffccd 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/facade/GovernanceFacadeTest.java
@@ -76,7 +76,6 @@ public final class GovernanceFacadeTest {
governanceFacade.onlineInstance(Collections.singletonMap("sharding_db",
dataSourceConfigs), schemaRuleConfigs, globalRuleConfigs, props);
verify(registryCenter).persistConfigurations(Collections.singletonMap("sharding_db",
dataSourceConfigs), schemaRuleConfigs, globalRuleConfigs, props, false);
verify(registryCenter).registerInstanceOnline();
- verify(registryCenter).initStateNodes();
verify(listenerManager).initListeners();
}
diff --git
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/RegistryCenterTest.java
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/RegistryCenterTest.java
index 316b841..25ca96e 100644
---
a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/RegistryCenterTest.java
+++
b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/RegistryCenterTest.java
@@ -91,13 +91,6 @@ public final class RegistryCenterTest {
}
@Test
- public void assertInitNodes() {
- registryCenter.initStateNodes();
- verify(registryCenterRepository).persist("/states/datanodes", "");
- verify(registryCenterRepository).persist("/states/primarynodes", "");
- }
-
- @Test
public void assertPersistConfigurations() {
Map<String, DataSourceConfiguration> dataSourceConfigs =
createDataSourceConfigurations();
Collection<RuleConfiguration> schemaRuleConfigs =
createRuleConfigurations();
@@ -157,6 +150,8 @@ public final class RegistryCenterTest {
@Test
public void assertRegisterInstanceOnline() {
registryCenter.registerInstanceOnline();
+ verify(registryCenterRepository).persist("/states/datanodes", "");
+ verify(registryCenterRepository).persist("/states/primarynodes", "");
verify(registryCenterRepository).persistEphemeral(anyString(),
anyString());
}
}
