You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ta...@apache.org on 2022/12/13 07:43:55 UTC
[iotdb] branch master updated: [IOTDB-5191] Rename RatisConfig.RatisConsensus (#8428)
This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 7ad27ce5e1 [IOTDB-5191] Rename RatisConfig.RatisConsensus (#8428)
7ad27ce5e1 is described below
commit 7ad27ce5e1256121aed3b0deb133eb07c7d1918d
Author: William Song <48...@users.noreply.github.com>
AuthorDate: Tue Dec 13 15:43:49 2022 +0800
[IOTDB-5191] Rename RatisConfig.RatisConsensus (#8428)
* rename to implConfig
* rename to impl
* rename to impl
* spotless
---
.../iotdb/confignode/manager/ConsensusManager.java | 2 +-
.../apache/iotdb/consensus/config/RatisConfig.java | 45 +++++++++++-----------
.../apache/iotdb/consensus/ratis/RatisClient.java | 6 +--
.../iotdb/consensus/ratis/RatisConsensus.java | 10 ++---
.../iotdb/consensus/ratis/RatisConsensusTest.java | 2 +-
.../db/consensus/DataRegionConsensusImpl.java | 2 +-
.../db/consensus/SchemaRegionConsensusImpl.java | 2 +-
7 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
index a0c2b6d3e0..8d34ca5bcc 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
@@ -158,7 +158,7 @@ public class ConsensusManager {
TimeUnit.MILLISECONDS))
.build())
.setRatisConsensus(
- RatisConfig.RatisConsensus.newBuilder()
+ RatisConfig.Impl.newBuilder()
.setClientRequestTimeoutMillis(
CONF.getConfigNodeRatisRequestTimeoutMs())
.setClientMaxRetryAttempt(
diff --git a/consensus/src/main/java/org/apache/iotdb/consensus/config/RatisConfig.java b/consensus/src/main/java/org/apache/iotdb/consensus/config/RatisConfig.java
index 3a8dd16449..8f877662bd 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/config/RatisConfig.java
+++ b/consensus/src/main/java/org/apache/iotdb/consensus/config/RatisConfig.java
@@ -35,7 +35,7 @@ public class RatisConfig {
private final Log log;
private final LeaderLogAppender leaderLogAppender;
private final Grpc grpc;
- private final RatisConsensus ratisConsensus;
+ private final Impl impl;
private RatisConfig(
Rpc rpc,
@@ -45,7 +45,7 @@ public class RatisConfig {
Log log,
Grpc grpc,
LeaderLogAppender leaderLogAppender,
- RatisConsensus ratisConsensus) {
+ Impl impl) {
this.rpc = rpc;
this.leaderElection = leaderElection;
this.snapshot = snapshot;
@@ -53,7 +53,7 @@ public class RatisConfig {
this.log = log;
this.leaderLogAppender = leaderLogAppender;
this.grpc = grpc;
- this.ratisConsensus = ratisConsensus;
+ this.impl = impl;
}
public Rpc getRpc() {
@@ -84,8 +84,8 @@ public class RatisConfig {
return grpc;
}
- public RatisConsensus getRatisConsensus() {
- return ratisConsensus;
+ public Impl getImpl() {
+ return impl;
}
public static Builder newBuilder() {
@@ -100,7 +100,7 @@ public class RatisConfig {
private Log log;
private LeaderLogAppender leaderLogAppender;
private Grpc grpc;
- private RatisConsensus ratisConsensus;
+ private Impl impl;
public RatisConfig build() {
return new RatisConfig(
@@ -111,7 +111,7 @@ public class RatisConfig {
log != null ? log : Log.newBuilder().build(),
grpc != null ? grpc : Grpc.newBuilder().build(),
leaderLogAppender != null ? leaderLogAppender : LeaderLogAppender.newBuilder().build(),
- ratisConsensus != null ? ratisConsensus : RatisConsensus.newBuilder().build());
+ impl != null ? impl : Impl.newBuilder().build());
}
public Builder setRpc(Rpc rpc) {
@@ -144,8 +144,8 @@ public class RatisConfig {
return this;
}
- public Builder setRatisConsensus(RatisConsensus ratisConsensus) {
- this.ratisConsensus = ratisConsensus;
+ public Builder setRatisConsensus(Impl impl) {
+ this.impl = impl;
return this;
}
@@ -772,7 +772,7 @@ public class RatisConfig {
}
}
- public static class RatisConsensus {
+ public static class Impl {
private final int retryTimesMax;
private final long retryWaitMillis;
@@ -784,7 +784,7 @@ public class RatisConfig {
private final long triggerSnapshotTime;
private final long triggerSnapshotFileSize;
- private RatisConsensus(
+ private Impl(
int retryTimesMax,
long retryWaitMillis,
long clientRequestTimeoutMillis,
@@ -835,7 +835,7 @@ public class RatisConfig {
return triggerSnapshotFileSize;
}
- public static RatisConsensus.Builder newBuilder() {
+ public static Impl.Builder newBuilder() {
return new Builder();
}
@@ -853,8 +853,8 @@ public class RatisConfig {
// 20GB
private long triggerSnapshotFileSize = 20L << 30;
- public RatisConsensus build() {
- return new RatisConsensus(
+ public Impl build() {
+ return new Impl(
retryTimesMax,
retryWaitMillis,
clientRequestTimeoutMillis,
@@ -865,43 +865,42 @@ public class RatisConfig {
triggerSnapshotFileSize);
}
- public RatisConsensus.Builder setRetryTimesMax(int retryTimesMax) {
+ public Impl.Builder setRetryTimesMax(int retryTimesMax) {
this.retryTimesMax = retryTimesMax;
return this;
}
- public RatisConsensus.Builder setRetryWaitMillis(long retryWaitMillis) {
+ public Impl.Builder setRetryWaitMillis(long retryWaitMillis) {
this.retryWaitMillis = retryWaitMillis;
return this;
}
- public RatisConsensus.Builder setClientRequestTimeoutMillis(long clientRequestTimeoutMillis) {
+ public Impl.Builder setClientRequestTimeoutMillis(long clientRequestTimeoutMillis) {
this.clientRequestTimeoutMillis = clientRequestTimeoutMillis;
return this;
}
- public RatisConsensus.Builder setClientMaxRetryAttempt(int clientMaxRetryAttempt) {
+ public Impl.Builder setClientMaxRetryAttempt(int clientMaxRetryAttempt) {
this.clientMaxRetryAttempt = clientMaxRetryAttempt;
return this;
}
- public RatisConsensus.Builder setClientRetryInitialSleepTimeMs(
- long clientRetryInitialSleepTimeMs) {
+ public Impl.Builder setClientRetryInitialSleepTimeMs(long clientRetryInitialSleepTimeMs) {
this.clientRetryInitialSleepTimeMs = clientRetryInitialSleepTimeMs;
return this;
}
- public RatisConsensus.Builder setClientRetryMaxSleepTimeMs(long clientRetryMaxSleepTimeMs) {
+ public Impl.Builder setClientRetryMaxSleepTimeMs(long clientRetryMaxSleepTimeMs) {
this.clientRetryMaxSleepTimeMs = clientRetryMaxSleepTimeMs;
return this;
}
- public RatisConsensus.Builder setTriggerSnapshotTime(long triggerSnapshotTime) {
+ public Impl.Builder setTriggerSnapshotTime(long triggerSnapshotTime) {
this.triggerSnapshotTime = triggerSnapshotTime;
return this;
}
- public RatisConsensus.Builder setTriggerSnapshotFileSize(long triggerSnapshotFileSize) {
+ public Impl.Builder setTriggerSnapshotFileSize(long triggerSnapshotFileSize) {
this.triggerSnapshotFileSize = triggerSnapshotFileSize;
return this;
}
diff --git a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisClient.java b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisClient.java
index 321b6ec51f..d9884f57d6 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisClient.java
+++ b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisClient.java
@@ -77,14 +77,14 @@ public class RatisClient {
private final RaftProperties raftProperties;
private final RaftClientRpc clientRpc;
- private final Supplier<RatisConfig.RatisConsensus> config;
+ private final Supplier<RatisConfig.Impl> config;
public Factory(
ClientManager<RaftGroup, RatisClient> clientManager,
ClientFactoryProperty clientPoolProperty,
RaftProperties raftProperties,
RaftClientRpc clientRpc,
- Supplier<RatisConfig.RatisConsensus> config) {
+ Supplier<RatisConfig.Impl> config) {
super(clientManager, clientPoolProperty);
this.raftProperties = raftProperties;
this.clientRpc = clientRpc;
@@ -131,7 +131,7 @@ public class RatisClient {
private static final int maxAttempts = 10;
RetryPolicy defaultPolicy;
- public RatisRetryPolicy(RatisConfig.RatisConsensus config) {
+ public RatisRetryPolicy(RatisConfig.Impl config) {
defaultPolicy =
ExponentialBackoffRetry.newBuilder()
.setBaseSleepTime(
diff --git a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java
index 59e4449624..151bf17bb4 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java
+++ b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java
@@ -191,8 +191,8 @@ class RatisConsensus implements IConsensus {
private RaftClientReply writeWithRetry(CheckedSupplier<RaftClientReply, IOException> caller)
throws IOException {
- final int maxRetryTimes = config.getRatisConsensus().getRetryTimesMax();
- final long waitMillis = config.getRatisConsensus().getRetryWaitMillis();
+ final int maxRetryTimes = config.getImpl().getRetryTimesMax();
+ final long waitMillis = config.getImpl().getRetryWaitMillis();
int retry = 0;
RaftClientReply reply = null;
@@ -701,7 +701,7 @@ class RatisConsensus implements IConsensus {
final long currentDirLength =
calcMap.computeIfAbsent(currentDir, MemorizedFileSizeCalc::new).getTotalFolderSize();
- final long triggerSnapshotFileSize = config.getRatisConsensus().getTriggerSnapshotFileSize();
+ final long triggerSnapshotFileSize = config.getImpl().getTriggerSnapshotFileSize();
if (currentDirLength >= triggerSnapshotFileSize) {
ConsensusGenericResponse consensusGenericResponse =
@@ -716,7 +716,7 @@ class RatisConsensus implements IConsensus {
}
private void startSnapshotGuardian() {
- final long delay = config.getRatisConsensus().getTriggerSnapshotTime();
+ final long delay = config.getImpl().getTriggerSnapshotTime();
ScheduledExecutorUtil.safelyScheduleWithFixedDelay(
diskGuardian, this::triggerSnapshotByCustomize, 0, delay, TimeUnit.SECONDS);
}
@@ -817,7 +817,7 @@ class RatisConsensus implements IConsensus {
new ClientFactoryProperty.Builder().build(),
properties,
clientRpc,
- MemoizedSupplier.valueOf(() -> config.getRatisConsensus())),
+ MemoizedSupplier.valueOf(() -> config.getImpl())),
new ClientPoolProperty.Builder<RatisClient>().build().getConfig());
}
}
diff --git a/consensus/src/test/java/org/apache/iotdb/consensus/ratis/RatisConsensusTest.java b/consensus/src/test/java/org/apache/iotdb/consensus/ratis/RatisConsensusTest.java
index 6bd98a27d3..8bba1a7a13 100644
--- a/consensus/src/test/java/org/apache/iotdb/consensus/ratis/RatisConsensusTest.java
+++ b/consensus/src/test/java/org/apache/iotdb/consensus/ratis/RatisConsensusTest.java
@@ -77,7 +77,7 @@ public class RatisConsensusTest {
.setCreationGap(10)
.build())
.setRatisConsensus(
- RatisConfig.RatisConsensus.newBuilder()
+ RatisConfig.Impl.newBuilder()
.setTriggerSnapshotFileSize(1)
.setTriggerSnapshotTime(4)
.build())
diff --git a/server/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java b/server/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java
index a8c18a3002..53319ea7c9 100644
--- a/server/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java
@@ -148,7 +148,7 @@ public class DataRegionConsensusImpl {
conf.getDataRatisConsensusLogAppenderBufferSizeMax())
.build())
.setRatisConsensus(
- RatisConfig.RatisConsensus.newBuilder()
+ RatisConfig.Impl.newBuilder()
.setClientRequestTimeoutMillis(
conf.getDataRatisConsensusRequestTimeoutMs())
.setClientMaxRetryAttempt(
diff --git a/server/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java b/server/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java
index 306292119f..38a94598a1 100644
--- a/server/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java
@@ -116,7 +116,7 @@ public class SchemaRegionConsensusImpl {
conf.getSchemaRatisConsensusLogAppenderBufferSizeMax())
.build())
.setRatisConsensus(
- RatisConfig.RatisConsensus.newBuilder()
+ RatisConfig.Impl.newBuilder()
.setClientRequestTimeoutMillis(
conf.getSchemaRatisConsensusRequestTimeoutMs())
.setClientMaxRetryAttempt(