You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by xi...@apache.org on 2021/03/12 11:26:38 UTC
[shardingsphere] branch master updated: Refactor governance lock
(#9651)
This is an automated email from the ASF dual-hosted git repository.
xiaoyu 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 344a50e Refactor governance lock (#9651)
344a50e is described below
commit 344a50edf386d10e0e5e3fe7bbc864c7cfcda3af
Author: Haoran Meng <me...@gmail.com>
AuthorDate: Fri Mar 12 19:26:17 2021 +0800
Refactor governance lock (#9651)
---
.../metadata/GovernanceMetaDataContexts.java | 4 ++--
...eleasedEvent.java => LockNotificationEvent.java} | 4 ++--
...alLockAddedEvent.java => LockReleasedEvent.java} | 4 ++--
.../governance/core/lock/GovernanceLock.java | 19 +++++++------------
.../governance/core/lock/node/LockNode.java | 21 +++++----------------
.../governance/core/registry/RegistryCenter.java | 4 ++--
...hangedListener.java => LockChangedListener.java} | 18 +++++++++---------
.../registry/listener/RegistryListenerManager.java | 6 +++---
.../governance/core/lock/node/LockNodeTest.java | 9 ++-------
.../core/registry/RegistryCenterTest.java | 8 ++++----
...stenerTest.java => LockChangedListenerTest.java} | 20 ++++++++++----------
11 files changed, 48 insertions(+), 69 deletions(-)
diff --git a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
index 0c7c1d7..cd6832c 100644
--- a/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
+++ b/shardingsphere-governance/shardingsphere-governance-context/src/main/java/org/apache/shardingsphere/governance/context/metadata/GovernanceMetaDataContexts.java
@@ -22,7 +22,7 @@ import com.google.common.eventbus.Subscribe;
import org.apache.shardingsphere.governance.core.event.model.auth.UserRuleChangedEvent;
import org.apache.shardingsphere.governance.core.event.model.datasource.DataSourceChangeCompletedEvent;
import org.apache.shardingsphere.governance.core.event.model.datasource.DataSourceChangedEvent;
-import org.apache.shardingsphere.governance.core.event.model.lock.GlobalLockReleasedEvent;
+import org.apache.shardingsphere.governance.core.event.model.lock.LockReleasedEvent;
import org.apache.shardingsphere.governance.core.event.model.metadata.MetaDataChangedEvent;
import org.apache.shardingsphere.governance.core.event.model.metadata.MetaDataDeletedEvent;
import org.apache.shardingsphere.governance.core.event.model.metadata.MetaDataPersistedEvent;
@@ -229,7 +229,7 @@ public final class GovernanceMetaDataContexts implements MetaDataContexts {
}
metaDataContexts = new StandardMetaDataContexts(newMetaDataMap, metaDataContexts.getExecutorEngine(), metaDataContexts.getAuthentication(), metaDataContexts.getProps());
} finally {
- ShardingSphereEventBus.getInstance().post(new GlobalLockReleasedEvent());
+ ShardingSphereEventBus.getInstance().post(new LockReleasedEvent());
}
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/model/lock/GlobalLockReleasedEvent.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/model/lock/LockNotificationEvent.java
similarity index 90%
rename from shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/model/lock/GlobalLockReleasedEvent.java
rename to shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/model/lock/LockNotificationEvent.java
index f628af13..1d5effd 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/model/lock/GlobalLockReleasedEvent.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/model/lock/LockNotificationEvent.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.governance.core.event.model.lock;
import org.apache.shardingsphere.governance.core.event.model.GovernanceEvent;
/**
- * Global lock released event.
+ * Lock notification event.
*/
-public final class GlobalLockReleasedEvent implements GovernanceEvent {
+public final class LockNotificationEvent implements GovernanceEvent {
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/model/lock/GlobalLockAddedEvent.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/model/lock/LockReleasedEvent.java
similarity index 90%
rename from shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/model/lock/GlobalLockAddedEvent.java
rename to shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/model/lock/LockReleasedEvent.java
index d978de9..e2db5e3 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/model/lock/GlobalLockAddedEvent.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/event/model/lock/LockReleasedEvent.java
@@ -20,7 +20,7 @@ package org.apache.shardingsphere.governance.core.event.model.lock;
import org.apache.shardingsphere.governance.core.event.model.GovernanceEvent;
/**
- * Global lock added event.
+ * Lock released event.
*/
-public final class GlobalLockAddedEvent implements GovernanceEvent {
+public final class LockReleasedEvent implements GovernanceEvent {
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/lock/GovernanceLock.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/lock/GovernanceLock.java
index de16cd6..f6a5784 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/lock/GovernanceLock.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/lock/GovernanceLock.java
@@ -18,14 +18,12 @@
package org.apache.shardingsphere.governance.core.lock;
import com.google.common.eventbus.Subscribe;
-import org.apache.shardingsphere.governance.core.event.model.lock.GlobalLockAddedEvent;
-import org.apache.shardingsphere.governance.core.event.model.lock.GlobalLockReleasedEvent;
+import org.apache.shardingsphere.governance.core.event.model.lock.LockNotificationEvent;
+import org.apache.shardingsphere.governance.core.event.model.lock.LockReleasedEvent;
import org.apache.shardingsphere.governance.core.registry.RegistryCenter;
import org.apache.shardingsphere.governance.core.registry.RegistryCenterNodeStatus;
import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
import org.apache.shardingsphere.infra.lock.AbstractShardingSphereLock;
-import org.apache.shardingsphere.infra.state.StateEvent;
-import org.apache.shardingsphere.infra.state.StateType;
/**
* Governance lock.
@@ -50,25 +48,22 @@ public final class GovernanceLock extends AbstractShardingSphereLock {
}
/**
- * Lock instance after global lock added.
+ * Lock instance.
*
- * @param event global lock added event
+ * @param event lock notification event
*/
@Subscribe
- public void doLock(final GlobalLockAddedEvent event) {
- ShardingSphereEventBus.getInstance().post(new StateEvent(StateType.LOCK, true));
+ public void doLock(final LockNotificationEvent event) {
registryCenter.persistInstanceData(RegistryCenterNodeStatus.LOCKED.toString());
}
/**
* Unlock instance.
*
- * @param event global lock released event
+ * @param event lock released event
*/
@Subscribe
- public void unlock(final GlobalLockReleasedEvent event) {
- ShardingSphereEventBus.getInstance().post(new StateEvent(StateType.LOCK, false));
+ public void unlock(final LockReleasedEvent event) {
registryCenter.persistInstanceData("");
- signalAll();
}
}
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/lock/node/LockNode.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/lock/node/LockNode.java
index 8fd72cd..7ee5859 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/lock/node/LockNode.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/lock/node/LockNode.java
@@ -26,25 +26,14 @@ public final class LockNode {
private static final String LOCK_NODE_ROOT = "lock";
- private static final String GLOBAL_LOCK_NODE = "glock";
-
- private static final String RESOURCE_LOCK_NODE = "rlock";
-
- /**
- * Get global lock node path.
- *
- * @return global lock node path
- */
- public String getGlobalLockNodePath() {
- return Joiner.on("/").join("", LOCK_NODE_ROOT, GLOBAL_LOCK_NODE);
- }
+ private static final String LOCK_NODE = "glock";
/**
- * Get resource lock node path.
+ * Get lock node path.
*
- * @return resource lock node path
+ * @return lock node path
*/
- public String getResourceLockNodePath() {
- return Joiner.on("/").join("", LOCK_NODE_ROOT, RESOURCE_LOCK_NODE);
+ public String getLockNodePath() {
+ return Joiner.on("/").join("", LOCK_NODE_ROOT, LOCK_NODE);
}
}
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 8dbbfaa..02f5488 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
@@ -540,14 +540,14 @@ public final class RegistryCenter {
* @return true if get the lock, false if not
*/
public boolean tryLock(final long timeout) {
- return repository.tryLock(lockNode.getGlobalLockNodePath(), timeout, TimeUnit.MILLISECONDS) && checkLock();
+ return repository.tryLock(lockNode.getLockNodePath(), timeout, TimeUnit.MILLISECONDS) && checkLock();
}
/**
* Release lock.
*/
public void releaseLock() {
- repository.releaseLock(lockNode.getGlobalLockNodePath());
+ repository.releaseLock(lockNode.getLockNodePath());
}
private boolean checkLock() {
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/GlobalLockChangedListener.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/LockChangedListener.java
similarity index 81%
rename from shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/GlobalLockChangedListener.java
rename to shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/LockChangedListener.java
index b14640c..cd6c683 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/GlobalLockChangedListener.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/LockChangedListener.java
@@ -20,8 +20,8 @@ package org.apache.shardingsphere.governance.core.registry.listener;
import com.google.common.base.Joiner;
import org.apache.shardingsphere.governance.core.event.listener.PostGovernanceRepositoryEventListener;
import org.apache.shardingsphere.governance.core.event.model.GovernanceEvent;
-import org.apache.shardingsphere.governance.core.event.model.lock.GlobalLockAddedEvent;
-import org.apache.shardingsphere.governance.core.event.model.lock.GlobalLockReleasedEvent;
+import org.apache.shardingsphere.governance.core.event.model.lock.LockNotificationEvent;
+import org.apache.shardingsphere.governance.core.event.model.lock.LockReleasedEvent;
import org.apache.shardingsphere.governance.core.lock.node.LockNode;
import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
@@ -31,24 +31,24 @@ import java.util.Collections;
import java.util.Optional;
/**
- * Global lock changed listener.
+ * Lock changed listener.
*/
-public final class GlobalLockChangedListener extends PostGovernanceRepositoryEventListener<GovernanceEvent> {
+public final class LockChangedListener extends PostGovernanceRepositoryEventListener<GovernanceEvent> {
private final LockNode lockNode;
- public GlobalLockChangedListener(final RegistryRepository registryRepository) {
- super(registryRepository, Collections.singleton(new LockNode().getGlobalLockNodePath()));
+ public LockChangedListener(final RegistryRepository registryRepository) {
+ super(registryRepository, Collections.singleton(new LockNode().getLockNodePath()));
lockNode = new LockNode();
}
@Override
protected Optional<GovernanceEvent> createEvent(final DataChangedEvent event) {
- if (event.getKey().startsWith(Joiner.on("/").join(lockNode.getGlobalLockNodePath(), ""))) {
+ if (event.getKey().startsWith(Joiner.on("/").join(lockNode.getLockNodePath(), ""))) {
if (event.getType() == Type.ADDED) {
- return Optional.of(new GlobalLockAddedEvent());
+ return Optional.of(new LockNotificationEvent());
} else if (event.getType() == Type.DELETED) {
- return Optional.of(new GlobalLockReleasedEvent());
+ return Optional.of(new LockReleasedEvent());
}
}
return Optional.empty();
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/RegistryListenerManager.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/RegistryListenerManager.java
index 2ef378f..5cabee7 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/RegistryListenerManager.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/listener/RegistryListenerManager.java
@@ -32,7 +32,7 @@ public final class RegistryListenerManager {
private final DataSourceStateChangedListener dataSourceStateChangedListener;
- private final GlobalLockChangedListener globalLockChangedListener;
+ private final LockChangedListener lockChangedListener;
private final MetaDataListener metaDataListener;
@@ -43,7 +43,7 @@ public final class RegistryListenerManager {
public RegistryListenerManager(final RegistryRepository registryRepository, final Collection<String> schemaNames) {
terminalStateChangedListener = new TerminalStateChangedListener(registryRepository);
dataSourceStateChangedListener = new DataSourceStateChangedListener(registryRepository, schemaNames);
- globalLockChangedListener = new GlobalLockChangedListener(registryRepository);
+ lockChangedListener = new LockChangedListener(registryRepository);
metaDataListener = new MetaDataListener(registryRepository, schemaNames);
propertiesChangedListener = new PropertiesChangedListener(registryRepository);
authenticationChangedListener = new AuthenticationChangedListener(registryRepository);
@@ -55,7 +55,7 @@ public final class RegistryListenerManager {
public void initListeners() {
terminalStateChangedListener.watch(Type.UPDATED);
dataSourceStateChangedListener.watch(Type.UPDATED, Type.DELETED, Type.ADDED);
- globalLockChangedListener.watch(Type.ADDED, Type.DELETED);
+ lockChangedListener.watch(Type.ADDED, Type.DELETED);
metaDataListener.watch();
propertiesChangedListener.watch(Type.UPDATED);
authenticationChangedListener.watch(Type.UPDATED);
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/lock/node/LockNodeTest.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/lock/node/LockNodeTest.java
index 24e776b..b7ecd75 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/lock/node/LockNodeTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/lock/node/LockNodeTest.java
@@ -33,12 +33,7 @@ public final class LockNodeTest {
}
@Test
- public void assertGetGlobalLockNodePath() {
- assertThat(lockNode.getGlobalLockNodePath(), is("/lock/glock"));
- }
-
- @Test
- public void assertGetResourceNodePath() {
- assertThat(lockNode.getResourceLockNodePath(), is("/lock/rlock"));
+ public void assertGetLockNodePath() {
+ assertThat(lockNode.getLockNodePath(), is("/lock/glock"));
}
}
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 adf1870..632d636 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
@@ -160,15 +160,15 @@ public final class RegistryCenterTest {
}
@Test
- public void assertTryGlobalLock() {
+ public void assertTryLock() {
registryCenter.tryLock(50L);
- verify(registryRepository).tryLock(eq(new LockNode().getGlobalLockNodePath()), eq(50L), eq(TimeUnit.MILLISECONDS));
+ verify(registryRepository).tryLock(eq(new LockNode().getLockNodePath()), eq(50L), eq(TimeUnit.MILLISECONDS));
}
@Test
- public void assertReleaseGlobalLock() {
+ public void assertReleaseLock() {
registryCenter.releaseLock();
- verify(registryRepository).releaseLock(eq(new LockNode().getGlobalLockNodePath()));
+ verify(registryRepository).releaseLock(eq(new LockNode().getLockNodePath()));
}
@Test
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/GlobalLockChangedListenerTest.java b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/LockChangedListenerTest.java
similarity index 71%
rename from shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/GlobalLockChangedListenerTest.java
rename to shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/LockChangedListenerTest.java
index daf9d01..a272978 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/GlobalLockChangedListenerTest.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/test/java/org/apache/shardingsphere/governance/core/registry/listener/LockChangedListenerTest.java
@@ -18,8 +18,8 @@
package org.apache.shardingsphere.governance.core.registry.listener;
import org.apache.shardingsphere.governance.core.event.model.GovernanceEvent;
-import org.apache.shardingsphere.governance.core.event.model.lock.GlobalLockAddedEvent;
-import org.apache.shardingsphere.governance.core.event.model.lock.GlobalLockReleasedEvent;
+import org.apache.shardingsphere.governance.core.event.model.lock.LockNotificationEvent;
+import org.apache.shardingsphere.governance.core.event.model.lock.LockReleasedEvent;
import org.apache.shardingsphere.governance.repository.api.RegistryRepository;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent;
import org.apache.shardingsphere.governance.repository.api.listener.DataChangedEvent.Type;
@@ -35,35 +35,35 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
@RunWith(MockitoJUnitRunner.class)
-public final class GlobalLockChangedListenerTest {
+public final class LockChangedListenerTest {
- private GlobalLockChangedListener globalLockChangedListener;
+ private LockChangedListener lockChangedListener;
@Mock
private RegistryRepository registryRepository;
@Before
public void setUp() {
- globalLockChangedListener = new GlobalLockChangedListener(registryRepository);
+ lockChangedListener = new LockChangedListener(registryRepository);
}
@Test
public void assertCreateEventWithInvalidPath() {
- Optional<GovernanceEvent> actual = globalLockChangedListener.createEvent(new DataChangedEvent("/lock/glock", "", Type.ADDED));
+ Optional<GovernanceEvent> actual = lockChangedListener.createEvent(new DataChangedEvent("/lock/glock", "", Type.ADDED));
assertFalse(actual.isPresent());
}
@Test
public void assertCreateAddedEvent() {
- Optional<GovernanceEvent> actual = globalLockChangedListener.createEvent(new DataChangedEvent("/lock/glock/lock-test-id", "", Type.ADDED));
+ Optional<GovernanceEvent> actual = lockChangedListener.createEvent(new DataChangedEvent("/lock/glock/lock-test-id", "", Type.ADDED));
assertTrue(actual.isPresent());
- assertTrue(actual.get() instanceof GlobalLockAddedEvent);
+ assertTrue(actual.get() instanceof LockNotificationEvent);
}
@Test
public void assertCreateDeletedEvent() {
- Optional<GovernanceEvent> actual = globalLockChangedListener.createEvent(new DataChangedEvent("/lock/glock/lock-test-id", "", Type.DELETED));
+ Optional<GovernanceEvent> actual = lockChangedListener.createEvent(new DataChangedEvent("/lock/glock/lock-test-id", "", Type.DELETED));
assertTrue(actual.isPresent());
- assertTrue(actual.get() instanceof GlobalLockReleasedEvent);
+ assertTrue(actual.get() instanceof LockReleasedEvent);
}
}