fix remaining issues when upgrading to ratis 3.0.1

apache · Jan 17, 2024 · 84aa4d2 · 84aa4d2
1 parent da79077
commit 84aa4d2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/config/RatisConfig.java b/iotdb-core/consensus/src/main/java/org/apache/iotdb/consensus/config/RatisConfig.java
@@ -550,7 +550,6 @@ public static class Log {
     private final int segmentCacheNumMax;
     private final SizeInBytes segmentCacheSizeMax;
     private final SizeInBytes preallocatedSize;
-    private final SizeInBytes writeBufferSize;
     private final int forceSyncNum;
     private final boolean unsafeFlushEnabled;
 
@@ -565,7 +564,6 @@ private Log(
         int segmentCacheNumMax,
         SizeInBytes segmentCacheSizeMax,
         SizeInBytes preallocatedSize,
-        SizeInBytes writeBufferSize,
         int forceSyncNum,
         boolean unsafeFlushEnabled) {
       this.useMemory = useMemory;
@@ -578,7 +576,6 @@ private Log(
       this.segmentCacheNumMax = segmentCacheNumMax;
       this.segmentCacheSizeMax = segmentCacheSizeMax;
       this.preallocatedSize = preallocatedSize;
-      this.writeBufferSize = writeBufferSize;
       this.forceSyncNum = forceSyncNum;
       this.unsafeFlushEnabled = unsafeFlushEnabled;
     }
@@ -619,10 +616,6 @@ public SizeInBytes getPreallocatedSize() {
       return preallocatedSize;
     }
 
-    public SizeInBytes getWriteBufferSize() {
-      return writeBufferSize;
-    }
-
     public int getForceSyncNum() {
       return forceSyncNum;
     }
@@ -651,7 +644,6 @@ public static class Builder {
       private int segmentCacheNumMax = 2;
       private SizeInBytes segmentCacheSizeMax = SizeInBytes.valueOf("200MB");
       private SizeInBytes preallocatedSize = SizeInBytes.valueOf("4MB");
-      private SizeInBytes writeBufferSize = SizeInBytes.valueOf("8MB");
       private int forceSyncNum = 128;
       private boolean unsafeFlushEnabled = true;
 
@@ -667,7 +659,6 @@ public Log build() {
             segmentCacheNumMax,
             segmentCacheSizeMax,
             preallocatedSize,
-            writeBufferSize,
             forceSyncNum,
             unsafeFlushEnabled);
       }
@@ -722,11 +713,6 @@ public Log.Builder setPreallocatedSize(SizeInBytes preallocatedSize) {
         return this;
       }
 
-      public Log.Builder setWriteBufferSize(SizeInBytes writeBufferSize) {
-        this.writeBufferSize = writeBufferSize;
-        return this;
-      }
-
       public Log.Builder setForceSyncNum(int forceSyncNum) {
         this.forceSyncNum = forceSyncNum;
         return this;

diff --git a/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/ratis/RecoverReadTest.java b/iotdb-core/consensus/src/test/java/org/apache/iotdb/consensus/ratis/RecoverReadTest.java
@@ -208,7 +208,7 @@ public void consistentReadFailedWithNoLeader() throws Exception {
   }
 
   @Test
-  public void consistentReadTimeout() throws Exception {
+  public void consistentReadWithSlowApply() throws Exception {
     final ConsensusGroupId gid = miniCluster.getGid();
     final List<Peer> members = miniCluster.getPeers();