This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 0cefd5f7dfe Rename tryLock to persistLock in ClusterPersistRepository
(#20095)
0cefd5f7dfe is described below
commit 0cefd5f7dfe0922c9cec72570199611c98bf0214
Author: gin <[email protected]>
AuthorDate: Fri Aug 12 10:45:49 2022 +0800
Rename tryLock to persistLock in ClusterPersistRepository (#20095)
---
.../fixture/FixtureClusterPersistRepository.java | 2 +-
.../cluster/coordinator/ClusterLockPersistService.java | 2 +-
.../fixture/ClusterPersistRepositoryFixture.java | 2 +-
.../ProcessListClusterPersistRepositoryFixture.java | 2 +-
.../repository/cluster/ClusterPersistRepository.java | 18 +++++++++---------
.../mode/repository/cluster/etcd/EtcdRepository.java | 2 +-
.../cluster/etcd/lock/EtcdInternalLockHolder.java | 6 +++---
.../cluster/zookeeper/CuratorZookeeperRepository.java | 2 +-
.../proxy/fixture/ClusterPersistRepositoryFixture.java | 2 +-
.../driver/fixture/TestClusterPersistRepository.java | 2 +-
10 files changed, 20 insertions(+), 20 deletions(-)
diff --git
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/fixture/FixtureClusterPersistRepository.java
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/fixture/FixtureClusterPersistRepository.java
index e9e1137a179..0d95603c3d0 100644
---
a/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/fixture/FixtureClusterPersistRepository.java
+++
b/shardingsphere-jdbc/shardingsphere-jdbc-spring/shardingsphere-jdbc-core-spring/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/fixture/FixtureClusterPersistRepository.java
@@ -70,7 +70,7 @@ public final class FixtureClusterPersistRepository implements
ClusterPersistRepo
}
@Override
- public boolean tryLock(final String lockKey, final long timeoutMillis) {
+ public boolean persistLock(final String lockKey, final long timeoutMillis)
{
return false;
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterLockPersistService.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterLockPersistService.java
index c4a77f3fd32..6f7dd10dd6a 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterLockPersistService.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/ClusterLockPersistService.java
@@ -33,7 +33,7 @@ public final class ClusterLockPersistService implements
LockPersistService {
@Override
public boolean tryLock(final LockDefinition lockDefinition, final long
timeoutMillis) {
- return repository.tryLock(lockDefinition.getLockKey(), timeoutMillis);
+ return repository.persistLock(lockDefinition.getLockKey(),
timeoutMillis);
}
@Override
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/fixture/ClusterPersistRepositoryFixture.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/fixture/ClusterPersistRepositoryFixture.java
index 798880247f6..60ae3f25da8 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/fixture/ClusterPersistRepositoryFixture.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/fixture/ClusterPersistRepositoryFixture.java
@@ -62,7 +62,7 @@ public final class ClusterPersistRepositoryFixture implements
ClusterPersistRepo
}
@Override
- public boolean tryLock(final String lockKey, final long timeoutMillis) {
+ public boolean persistLock(final String lockKey, final long timeoutMillis)
{
return false;
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/ProcessListClusterPersistRepositoryFixture.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/ProcessListClusterPersistRepositoryFix
[...]
index 3067d4016b9..a4b852c7e9c 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/ProcessListClusterPersistRepositoryFixture.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/ProcessListClusterPersistRepositoryFixture.java
@@ -69,7 +69,7 @@ public final class ProcessListClusterPersistRepositoryFixture
implements Cluster
}
@Override
- public boolean tryLock(final String lockKey, final long timeoutMillis) {
+ public boolean persistLock(final String lockKey, final long timeoutMillis)
{
return false;
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/ClusterPersistRepository.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/ClusterPer
[...]
index 892cb92638f..7de28a9babb 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/ClusterPersistRepository.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/ClusterPersistRepository.java
@@ -41,6 +41,15 @@ public interface ClusterPersistRepository extends
PersistRepository {
*/
void persistEphemeral(String key, String value);
+ /**
+ * Persist lock.
+ *
+ * @param lockKey lock key
+ * @param timeoutMillis timeout millis
+ * @return is locked or not
+ */
+ boolean persistLock(String lockKey, long timeoutMillis);
+
/**
* Watch key or path of governance server.
*
@@ -55,13 +64,4 @@ public interface ClusterPersistRepository extends
PersistRepository {
* @param instanceContext instance context
*/
void watchSessionConnection(InstanceContext instanceContext);
-
- /**
- * Try lock.
- *
- * @param lockKey lock key
- * @param timeoutMillis timeout millis
- * @return is locked or not
- */
- boolean tryLock(String lockKey, long timeoutMillis);
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphere-cluster-mode-repository-etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/EtcdRepository.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphere-cluster-mo
[...]
index e7ea57cc557..d136d31ab22 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphere-cluster-mode-repository-etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/EtcdRepository.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphere-cluster-mode-repository-etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/EtcdRepository.java
@@ -145,7 +145,7 @@ public final class EtcdRepository implements
ClusterPersistRepository {
}
@Override
- public boolean tryLock(final String lockKey, final long timeoutMillis) {
+ public boolean persistLock(final String lockKey, final long timeoutMillis)
{
return
etcdInternalLockHolder.getInternalLock(lockKey).tryLock(timeoutMillis);
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphere-cluster-mode-repository-etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/lock/EtcdInternalLockHolder.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphe
[...]
index ea3177023b7..6c14265415d 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphere-cluster-mode-repository-etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/lock/EtcdInternalLockHolder.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphere-cluster-mode-repository-etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/lock/EtcdInternalLockHolder.java
@@ -62,7 +62,7 @@ public final class EtcdInternalLockHolder implements
InternalLockHolder {
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- log.error("EtcdRepository tryLock error, lockName:{}", lockKey,
ex);
+ log.error("Create etcd internal lock failed, lockName:{}",
lockKey, ex);
}
return null;
}
@@ -87,7 +87,7 @@ public final class EtcdInternalLockHolder implements
InternalLockHolder {
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- log.error("EtcdRepository tryLock error, lockName:{}",
lockKey, ex);
+ log.error("Etcd internal lock try lock failed", ex);
return false;
}
}
@@ -99,7 +99,7 @@ public final class EtcdInternalLockHolder implements
InternalLockHolder {
// CHECKSTYLE:OFF
} catch (final Exception ex) {
// CHECKSTYLE:ON
- log.error("EtcdRepository unlock error, lockName:{}", lockKey,
ex);
+ log.error("Etcd internal lock unlock failed", ex);
}
}
}
diff --git
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphere-cluster-mode-repository-zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepository.java
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-prov
[...]
index 922b52f662a..d96d87502de 100644
---
a/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphere-cluster-mode-repository-zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepository.java
+++
b/shardingsphere-mode/shardingsphere-mode-type/shardingsphere-cluster-mode/shardingsphere-cluster-mode-repository/shardingsphere-cluster-mode-repository-provider/shardingsphere-cluster-mode-repository-zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepository.java
@@ -255,7 +255,7 @@ public final class CuratorZookeeperRepository implements
ClusterPersistRepositor
}
@Override
- public boolean tryLock(final String lockKey, final long timeoutMillis) {
+ public boolean persistLock(final String lockKey, final long timeoutMillis)
{
return
internalLockHolder.getInternalLock(lockKey).tryLock(timeoutMillis);
}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/ClusterPersistRepositoryFixture.java
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/ClusterPersistRepositoryFixture.java
index 7bd8778d649..26259006531 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/ClusterPersistRepositoryFixture.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/ClusterPersistRepositoryFixture.java
@@ -68,7 +68,7 @@ public final class ClusterPersistRepositoryFixture implements
ClusterPersistRepo
}
@Override
- public boolean tryLock(final String lockKey, final long timeoutMillis) {
+ public boolean persistLock(final String lockKey, final long timeoutMillis)
{
return false;
}
diff --git
a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestClusterPersistRepository.java
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestClusterPersistRepository.java
index 73c95ef736b..8781809d825 100644
---
a/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestClusterPersistRepository.java
+++
b/shardingsphere-test/shardingsphere-integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestClusterPersistRepository.java
@@ -70,7 +70,7 @@ public final class TestClusterPersistRepository implements
ClusterPersistReposit
}
@Override
- public boolean tryLock(final String lockKey, final long timeoutMillis) {
+ public boolean persistLock(final String lockKey, final long timeoutMillis)
{
return false;
}
