Skip to content

feat(config): optimize rate.limiter configuration parsing #5206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xxo1shine merged 1 commit into from
May 8, 2023
Merged

feat(config): optimize rate.limiter configuration parsing #5206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions framework/src/main/java/org/tron/core/config/args/Args.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,9 +973,7 @@ public static void setParam(final String[] args, final String confFileName) {
config.hasPath(Constant.RATE_LIMITER_GLOBAL_IP_QPS) ? config
.getInt(Constant.RATE_LIMITER_GLOBAL_IP_QPS) : 10000;

PARAMETER.rateLimiterInitialization =
config.hasPath(Constant.RATE_LIMITER) ? getRateLimiterFromConfig(config)
: new RateLimiterInitialization();
PARAMETER.rateLimiterInitialization = getRateLimiterFromConfig(config);

PARAMETER.changedDelegation =
config.hasPath(Constant.COMMITTEE_CHANGED_DELEGATION) ? config
Expand Down Expand Up @@ -1214,21 +1212,22 @@ private static Account createAccount(final ConfigObject asset) {
}

private static RateLimiterInitialization getRateLimiterFromConfig(
final com.typesafe.config.Config config) {

final com.typesafe.config.Config config) {
RateLimiterInitialization initialization = new RateLimiterInitialization();
ArrayList<RateLimiterInitialization.HttpRateLimiterItem> list1 = config
.getObjectList(Constant.RATE_LIMITER_HTTP).stream()
.map(RateLimiterInitialization::createHttpItem)
.collect(Collectors.toCollection(ArrayList::new));
initialization.setHttpMap(list1);

ArrayList<RateLimiterInitialization.RpcRateLimiterItem> list2 = config
.getObjectList(Constant.RATE_LIMITER_RPC).stream()
.map(RateLimiterInitialization::createRpcItem)
.collect(Collectors.toCollection(ArrayList::new));

initialization.setRpcMap(list2);
if (config.hasPath(Constant.RATE_LIMITER_HTTP)) {
ArrayList<RateLimiterInitialization.HttpRateLimiterItem> list1 = config
.getObjectList(Constant.RATE_LIMITER_HTTP).stream()
.map(RateLimiterInitialization::createHttpItem)
.collect(Collectors.toCollection(ArrayList::new));
initialization.setHttpMap(list1);
}
if (config.hasPath(Constant.RATE_LIMITER_RPC)) {
ArrayList<RateLimiterInitialization.RpcRateLimiterItem> list2 = config
.getObjectList(Constant.RATE_LIMITER_RPC).stream()
.map(RateLimiterInitialization::createRpcItem)
.collect(Collectors.toCollection(ArrayList::new));
initialization.setRpcMap(list2);
}
return initialization;
}

Expand Down
8 changes: 6 additions & 2 deletions framework/src/test/java/org/tron/common/config/args/ArgsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.tron.common.parameter.RateLimiterInitialization;
import org.tron.common.utils.FileUtil;
import org.tron.core.Constant;
import org.tron.core.config.args.Args;
Expand Down Expand Up @@ -34,9 +35,12 @@ public void testConfig() {
Assert.assertEquals(Args.getInstance().getBlockCacheTimeout(), 60);
Assert.assertEquals(Args.getInstance().isNodeDetectEnable(), false);
Assert.assertFalse(Args.getInstance().isNodeEffectiveCheckEnable());
Assert.assertEquals(Args.getInstance().getRateLimiterGlobalQps(), 50000);
Assert.assertEquals(Args.getInstance().getRateLimiterGlobalIpQps(), 10000);
Assert.assertEquals(Args.getInstance().getRateLimiterGlobalQps(), 1000);
Assert.assertEquals(Args.getInstance().getRateLimiterGlobalIpQps(), 1000);
Assert.assertEquals(Args.getInstance().p2pDisable, true);
Assert.assertEquals(Args.getInstance().getMaxTps(), 1000);
RateLimiterInitialization rateLimiter = Args.getInstance().getRateLimiterInitialization();
Assert.assertEquals(rateLimiter.getHttpMap().size(), 1);
Assert.assertEquals(rateLimiter.getRpcMap().size(), 0);
}
}
10 changes: 10 additions & 0 deletions framework/src/test/resources/config-test.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,5 +346,15 @@ committee = {
allowCreationOfContracts = 1 //mainnet:0 (reset by committee),test:1
}

rate.limiter.global.qps = 1000
rate.limiter.global.ip.qps = 1000
rate.limiter.http = [
{
component = "GetNowBlockServlet",
strategy = "GlobalPreemptibleAdapter",
paramString = "permit=1"
}
]

node.dynamicConfig.enable = true
node.dynamicConfig.checkInterval = 0