-
Notifications
You must be signed in to change notification settings - Fork 1.6k
feat(api): add http/grpc interface rate limit #5502
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.
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
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,10 +25,10 @@ | |
| import org.tron.core.services.ratelimiter.adapter.IPreemptibleRateLimiter; | ||
| import org.tron.core.services.ratelimiter.adapter.IRateLimiter; | ||
| import org.tron.core.services.ratelimiter.adapter.QpsRateLimiterAdapter; | ||
| import org.tron.core.services.ratelimiter.strategy.QpsStrategy; | ||
|
|
||
| @Slf4j | ||
| public abstract class RateLimiterServlet extends HttpServlet { | ||
|
|
||
| private static final String KEY_PREFIX_HTTP = "http_"; | ||
| private static final String ADAPTER_PREFIX = "org.tron.core.services.ratelimiter.adapter."; | ||
|
|
||
|
|
@@ -37,20 +37,16 @@ public abstract class RateLimiterServlet extends HttpServlet { | |
|
|
||
| @PostConstruct | ||
| private void addRateContainer() { | ||
|
|
||
| RateLimiterInitialization.HttpRateLimiterItem item = Args.getInstance() | ||
| .getRateLimiterInitialization().getHttpMap().get(getClass().getSimpleName()); | ||
|
|
||
| boolean success = false; | ||
|
|
||
| if (item != null) { | ||
| String cName = ""; | ||
| String params = ""; | ||
| Object obj; | ||
| try { | ||
| cName = item.getStrategy(); | ||
| params = item.getParams(); | ||
|
|
||
| // add the specific rate limiter strategy of servlet. | ||
| Class<?> c = Class.forName(ADAPTER_PREFIX + cName); | ||
| Constructor constructor; | ||
|
|
@@ -59,34 +55,29 @@ private void addRateContainer() { | |
| constructor = c.getConstructor(String.class); | ||
| obj = constructor.newInstance(params); | ||
| container.add(KEY_PREFIX_HTTP, getClass().getSimpleName(), (IRateLimiter) obj); | ||
|
|
||
| } else { | ||
| constructor = c.getConstructor(); | ||
| obj = constructor.newInstance(); | ||
| obj = constructor.newInstance(QpsStrategy.DEFAULT_QPS_PARAM); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why change the default initial logic?
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. +1 |
||
| container.add(KEY_PREFIX_HTTP, getClass().getSimpleName(), (IRateLimiter) obj); | ||
| } | ||
| success = true; | ||
| } catch (Exception e) { | ||
| logger.warn( | ||
| "failure to add the rate limiter strategy. servlet = {}, " | ||
| logger.warn("failure to add the rate limiter strategy. servlet = {}, " | ||
| + "strategy name = {}, params = \"{}\".", | ||
| getClass().getSimpleName(), cName, params); | ||
| } | ||
| } | ||
|
|
||
| if (!success) { | ||
| // if the specific rate limiter strategy of servlet is not defined or fail to add, | ||
| // then add a default Strategy. | ||
| try { | ||
| IRateLimiter rateLimiter = new DefaultBaseQqsAdapter("qps=1000"); | ||
| IRateLimiter rateLimiter = new DefaultBaseQqsAdapter(QpsStrategy.DEFAULT_QPS_PARAM); | ||
| container.add(KEY_PREFIX_HTTP, getClass().getSimpleName(), rateLimiter); | ||
| } catch (Exception e) { | ||
| logger.warn( | ||
| "failure to add the default rate limiter strategy. servlet = {}.", | ||
| logger.warn("failure to add the default rate limiter strategy. servlet = {}.", | ||
| getClass().getSimpleName()); | ||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
constructor = c.getConstructor(String.class)?