fix(hstore): JRaft maxEntriesSize configuration parameters do not take effect (#2630)

JackyYangPassion · imbajin · web-flow · commit a038d2341cc5 · 2024-08-11T13:04:34.000+08:00
Co-authored-by: imbajin &lt;jin@apache.org&gt;
diff --git a/.asf.yaml b/.asf.yaml
@@ -28,7 +28,8 @@ github:
   del_branch_on_merge: true
   #labels:
   enabled_merge_buttons:
-    merge:  false
+     # TODO: disable it after common merged
+    merge:  true
     rebase: true
     squash: true
   protected_branches:
diff --git a/hugegraph-store/hg-store-core/src/main/java/org/apache/hugegraph/store/options/HgStoreEngineOptions.java b/hugegraph-store/hg-store-core/src/main/java/org/apache/hugegraph/store/options/HgStoreEngineOptions.java
@@ -98,7 +98,7 @@ public static class RaftOptions {
         /**
          * The maximum number of entries in AppendEntriesRequest
          */
-        private final int maxEntriesSize = 256;
+        private int maxEntriesSize = 256;
         /**
          * Raft cluster data backlog occurs, rate limiting wait time in milliseconds.
          **/
diff --git a/hugegraph-store/hg-store-node/src/main/java/org/apache/hugegraph/store/node/AppConfig.java b/hugegraph-store/hg-store-node/src/main/java/org/apache/hugegraph/store/node/AppConfig.java
@@ -182,6 +182,8 @@ public class Raft {
         private int maxSegmentFileSize;
         @Value("${raft.maxReplicatorInflightMsgs:256}")
         private int maxReplicatorInflightMsgs;
+        @Value("${raft.maxEntriesSize:256}")
+        private int maxEntriesSize;
 
     }
 
diff --git a/hugegraph-store/hg-store-node/src/main/java/org/apache/hugegraph/store/node/grpc/HgStoreNodeService.java b/hugegraph-store/hg-store-node/src/main/java/org/apache/hugegraph/store/node/grpc/HgStoreNodeService.java
@@ -100,6 +100,7 @@ public void init() {
                                                         .isUseRocksDBSegmentLogStorage());
                 setMaxSegmentFileSize(appConfig.getRaft().getMaxSegmentFileSize());
                 setMaxReplicatorInflightMsgs(appConfig.getRaft().getMaxReplicatorInflightMsgs());
+                setMaxEntriesSize(appConfig.getRaft().getMaxEntriesSize());
             }});
             setFakePdOptions(new FakePdOptions() {{
                 setStoreList(appConfig.getFakePdConfig().getStoreList());
@@ -125,9 +126,9 @@ public List<Integer> getGraphLeaderPartitionIds(String graphName) {
     }
 
     /**
-     * 添加raft 任务，转发数据给raft
+     * Add raft task, forward data to raft
      *
-     * @return true 表示数据已被提交，false表示未提交，用于单副本入库减少批次拆分
+     * @return true means the data has been submitted, false means not submitted, used to reduce batch splitting for single-replica storage
      */
     public <Req extends com.google.protobuf.GeneratedMessageV3>
     void addRaftTask(byte methodId, String graphName, Integer partitionId, Req req,
@@ -140,14 +141,14 @@ void addRaftTask(byte methodId, String graphName, Integer partitionId, Req req,
         }
         //
         try {
-            // 序列化，
+            // Serialization
             final byte[] buffer = new byte[req.getSerializedSize() + 1];
             final CodedOutputStream output = CodedOutputStream.newInstance(buffer);
             output.write(methodId);
             req.writeTo(output);
             output.checkNoSpaceLeft();
             output.flush();
-            // 传送给raft
+            // Add raft task
             storeEngine.addRaftTask(graphName, partitionId,
                                     RaftOperation.create(methodId, buffer, req), closure);
 
@@ -159,7 +160,7 @@ void addRaftTask(byte methodId, String graphName, Integer partitionId, Req req,
     }
 
     /**
-     * 来自日志的任务，一般是follower 或者 日志回滚的任务
+     * Tasks from logs, generally tasks from followers or log rollbacks
      */
     @Override
     public boolean invoke(int partId, byte[] request, RaftClosure response) throws
@@ -190,7 +191,7 @@ public boolean invoke(int partId, byte[] request, RaftClosure response) throws
     }
 
     /**
-     * 处理raft传送过来的数据
+     * Process the data sent by raft
      */
     @Override
     public boolean invoke(int partId, byte methodId, Object req, RaftClosure response) throws

Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,8 @@ public class Raft {`
`182`	`182`	`private int maxSegmentFileSize;`
`183`	`183`	`@Value("${raft.maxReplicatorInflightMsgs:256}")`
`184`	`184`	`private int maxReplicatorInflightMsgs;`
	`185`	`+ @Value("${raft.maxEntriesSize:256}")`
	`186`	`+ private int maxEntriesSize;`
`185`	`187`
`186`	`188`	`}`
`187`	`189`