Skip to content

Commit dc63ec1

Browse files
committed
feat(net): modify global rate limiter default value
1 parent 52eaea6 commit dc63ec1

2 files changed

Lines changed: 8 additions & 6 deletions

File tree

framework/src/main/java/org/tron/core/config/args/Args.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,8 @@ public static void clearParam() {
221221
PARAMETER.allowNewRewardAlgorithm = 0;
222222
PARAMETER.allowNewReward = 0;
223223
PARAMETER.memoFee = 0;
224-
PARAMETER.rateLimiterGlobalQps = 3000;
225-
PARAMETER.rateLimiterGlobalIpQps = 30;
224+
PARAMETER.rateLimiterGlobalQps = 50000;
225+
PARAMETER.rateLimiterGlobalIpQps = 10000;
226226
PARAMETER.p2pDisable = false;
227227
}
228228

@@ -932,11 +932,11 @@ public static void setParam(final String[] args, final String confFileName) {
932932

933933
PARAMETER.rateLimiterGlobalQps =
934934
config.hasPath(Constant.RATE_LIMITER_GLOBAL_QPS) ? config
935-
.getInt(Constant.RATE_LIMITER_GLOBAL_QPS) : 3000;
935+
.getInt(Constant.RATE_LIMITER_GLOBAL_QPS) : 50000;
936936

937937
PARAMETER.rateLimiterGlobalIpQps =
938938
config.hasPath(Constant.RATE_LIMITER_GLOBAL_IP_QPS) ? config
939-
.getInt(Constant.RATE_LIMITER_GLOBAL_IP_QPS) : 30;
939+
.getInt(Constant.RATE_LIMITER_GLOBAL_IP_QPS) : 10000;
940940

941941
PARAMETER.rateLimiterInitialization =
942942
config.hasPath(Constant.RATE_LIMITER) ? getRateLimiterFromConfig(config)
@@ -1490,6 +1490,8 @@ public static void logConfig() {
14901490
logger.info("Max connection with same IP: {}", parameter.getMaxConnectionsWithSameIp());
14911491
logger.info("Solidity threads: {}", parameter.getSolidityThreads());
14921492
logger.info("Trx reference block: {}", parameter.getTrxReferenceBlock());
1493+
logger.info("Rate limiter global qps: {}", parameter.getRateLimiterGlobalQps());
1494+
logger.info("Rate limiter global ip qps: {}", parameter.getRateLimiterGlobalIpQps());
14931495
logger.info("************************ Backup config ************************");
14941496
logger.info("Backup priority: {}", parameter.getBackupPriority());
14951497
logger.info("Backup listen port: {}", parameter.getBackupPort());

framework/src/test/java/org/tron/common/config/args/ArgsTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ public void testConfig() {
3030
Assert.assertEquals(Args.getInstance().getNodeDiscoveryPingTimeout(), 15_000);
3131
Assert.assertEquals(Args.getInstance().getMaxFastForwardNum(), 3);
3232
Assert.assertEquals(Args.getInstance().getBlockCacheTimeout(), 60);
33-
Assert.assertEquals(Args.getInstance().getRateLimiterGlobalQps(), 3000);
34-
Assert.assertEquals(Args.getInstance().getRateLimiterGlobalIpQps(), 30);
33+
Assert.assertEquals(Args.getInstance().getRateLimiterGlobalQps(), 50000);
34+
Assert.assertEquals(Args.getInstance().getRateLimiterGlobalIpQps(), 10000);
3535
Assert.assertEquals(Args.getInstance().p2pDisable, true);
3636
}
3737
}

0 commit comments

Comments
 (0)