(incubator-hugegraph) branch master updated: fix(hstore): enable JRaft MaxBodySize config (#2633)

[jin]

This is an automated email from the ASF dual-hosted git repository.

jin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hugegraph.git


The following commit(s) were added to refs/heads/master by this push:
     new 58f58ee09 fix(hstore): enable JRaft MaxBodySize config (#2633)
58f58ee09 is described below

commit 58f58ee094f61ee5b0b538432fc4a914c96b2c86
Author: YangJiaqi <yang.jiaqi.had...@gmail.com>
AuthorDate: Sun Aug 18 14:47:11 2024 +0800

    fix(hstore): enable JRaft MaxBodySize config (#2633)
    
    * enable JRaft MaxBodySize config
    Caused by: 
org.springframework.beans.factory.UnsatisfiedDependencyException: Error 
creating bean with name 'org.apache.hugegraph.store.node.AppConfig$Raft': 
Unsatisfied dependency expressed through field 'maxBodySize'; nested exception 
is org.springframework.beans.TypeMismatchException: Failed to convert value of 
type 'java.lang.String' to required type 'int'; nested exception is 
java.lang.NumberFormatException: For input string: "512*1024"
    
    ---------
    
    Co-authored-by: V_Galaxy <vgalax...@apache.org>
---
 .../src/main/java/org/apache/hugegraph/store/PartitionEngine.java | 1 +
 .../org/apache/hugegraph/store/options/HgStoreEngineOptions.java  | 4 ++++
 .../src/main/java/org/apache/hugegraph/store/node/AppConfig.java  | 8 +++++---
 .../org/apache/hugegraph/store/node/grpc/HgStoreNodeService.java  | 1 +
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git 
a/hugegraph-store/hg-store-core/src/main/java/org/apache/hugegraph/store/PartitionEngine.java
 
b/hugegraph-store/hg-store-core/src/main/java/org/apache/hugegraph/store/PartitionEngine.java
index 11538478c..ee65162f7 100644
--- 
a/hugegraph-store/hg-store-core/src/main/java/org/apache/hugegraph/store/PartitionEngine.java
+++ 
b/hugegraph-store/hg-store-core/src/main/java/org/apache/hugegraph/store/PartitionEngine.java
@@ -249,6 +249,7 @@ public class PartitionEngine implements 
Lifecycle<PartitionEngineOptions>, RaftS
         raftOptions.setMaxReplicatorInflightMsgs(
                 options.getRaftOptions().getMaxReplicatorInflightMsgs());
         raftOptions.setMaxByteCountPerRpc(1024 * 1024);
+        raftOptions.setMaxBodySize(options.getRaftOptions().getMaxBodySize());
         nodeOptions.setEnableMetrics(true);
 
         final PeerId serverId = JRaftUtils.getPeerId(options.getRaftAddress());
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
index 18d145fb4..c315d3440 100644
--- 
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
@@ -99,6 +99,10 @@ public class HgStoreEngineOptions {
          * The maximum number of entries in AppendEntriesRequest
          */
         private int maxEntriesSize = 256;
+        /**
+         * The maximum byte size of AppendEntriesRequest
+         */
+        private int maxBodySize = 512 * 1024;
         /**
          * 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
index c65691223..9920d9238 100644
--- 
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
@@ -172,11 +172,11 @@ public class AppConfig {
         private int snapshotInterval;
         @Value("${raft.disruptorBufferSize:0}")
         private int disruptorBufferSize;
-        @Value("${raft.max-log-file-size: 50000000000}")
+        @Value("${raft.max-log-file-size:50000000000}")
         private long maxLogFileSize;
-        @Value("${ave-logEntry-size-ratio : 0.95}")
+        @Value("${ave-logEntry-size-ratio:0.95}")
         private double aveLogEntrySizeRation;
-        @Value("${raft.useRocksDBSegmentLogStorage: true}")
+        @Value("${raft.useRocksDBSegmentLogStorage:true}")
         private boolean useRocksDBSegmentLogStorage;
         @Value("${raft.maxSegmentFileSize:67108864}")
         private int maxSegmentFileSize;
@@ -184,6 +184,8 @@ public class AppConfig {
         private int maxReplicatorInflightMsgs;
         @Value("${raft.maxEntriesSize:256}")
         private int maxEntriesSize;
+        @Value("${raft.maxBodySize:524288}")
+        private int maxBodySize;
 
     }
 
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
index 6c8855516..e99d7d24a 100644
--- 
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
@@ -101,6 +101,7 @@ public class HgStoreNodeService implements RaftTaskHandler {
                 
setMaxSegmentFileSize(appConfig.getRaft().getMaxSegmentFileSize());
                 
setMaxReplicatorInflightMsgs(appConfig.getRaft().getMaxReplicatorInflightMsgs());
                 setMaxEntriesSize(appConfig.getRaft().getMaxEntriesSize());
+                setMaxBodySize(appConfig.getRaft().getMaxBodySize());
             }});
             setFakePdOptions(new FakePdOptions() {{
                 setStoreList(appConfig.getFakePdConfig().getStoreList());