Add rate limiting middleware #38
Open
Conversation
This file contains 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
BenjaminLudwigSAP
force-pushed
the
ratelimiting
branch
2 times, most recently
from
1918a6e
to
bf04263
Compare
BenjaminLudwigSAP
force-pushed
the
ratelimiting
branch
from
bf04263
to
3a19899
Compare
- Add rate limiting config options. Only the ones that we might want to change have been added as config options for now. - Remove statsd options from watcher middleware. Since the defaults values are being used it's better to use them for both watcher MW as well as rate limiting MW, rather than definining statsd options for each of the middlewares. If in the future we need to set non-default options we can create a dedicated statsd config option group that all middlewares are getting their statsd config from.
BenjaminLudwigSAP
force-pushed
the
ratelimiting
branch
from
3a19899
to
c763099
Compare
notandy
requested changes
Oct 2, 2024
Comment on lines
100
to
+114
| if CONF.audit.enabled: | ||
|
|
||
| # rate limiting - depends on audit middleware, therefore must stand | ||
| # before it in order to appear after it in the chain | ||
| app = ratelimitmiddleware.OpenStackRateLimitMiddleware( | ||
| app, | ||
| config_file=CONF.rate_limiting.config_file, | ||
| service_type=CONF.rate_limiting.service_type, | ||
| rate_limit_by=CONF.rate_limiting.rate_limit_by, | ||
| max_sleep_time_seconds=CONF.rate_limiting.max_sleep_time_seconds, | ||
| backend_host=CONF.rate_limiting.backend_host, | ||
| backend_port=CONF.rate_limiting.backend_port, | ||
| backend_max_connections=CONF.rate_limiting.backend_max_connections, | ||
| backend_timeout_seconds=CONF.rate_limiting.backend_timeout_seconds, | ||
| ) |
There was a problem hiding this comment.
ratelimitmiddleware has nothing to do with - and doesn't require audit_middleware, but watcher_middleware. Therefor, this needs to moved down but above the watcher middleware initialization.
| try: | ||
| from uwsgi_middleware import uwsgi | ||
| app = uwsgi.Uwsgi(app) | ||
| except (EnvironmentError, OSError, ImportError) as e: | ||
| LOG.debug("Could not load uwsgi middleware: %s", e) | ||
|
|
||
| # Inject Request ID |
There was a problem hiding this comment.
has nothing to do with this PR
| @@ -86,16 +87,33 @@ def setup_app(pecan_config=None, debug=False, argv=None): | |||
| def _wrap_app(app): | |||
| """Wraps wsgi app with additional middlewares.""" | |||
|
|
|||
| # This needs to be the first middleware (and the last in the chain) | |||
| # UWSGI needs to be the first middleware (and the last in the chain) | |||
There was a problem hiding this comment.
has nothing to do with this PR
| @@ -14,6 +14,7 @@ | |||
|
|
|||
| import sys | |||
|
|
|||
| import rate_limit as ratelimitmiddleware | |||
There was a problem hiding this comment.
It would be wiser to try the import and check later if the import succeeded. This way the test-requirements.txt don't need the rate limit middleware - there is no tests anyway in octavia.
Comment on lines
+23
to
+24
| # Any requirements we need for CCloud | ||
| git+https://github.com/sapcc/openstack-rate-limit-middleware.git#egg=rate-limit-middleware |
There was a problem hiding this comment.
unneded if octavia can startup without the module (see earlier comment)
| backend_timeout_seconds=CONF.rate_limiting.backend_timeout_seconds, | ||
| ) | ||
|
|
||
| # audit middleware |
There was a problem hiding this comment.
nothing to do with this PR
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Add rate limiting config options. Only the ones that we might want to change have been added as config options for now.
Remove statsd options from watcher middleware. Since the defaults values are being used it's better to use them for both watcher MW as well as rate limiting MW, rather than definining statsd options for each of the middlewares. If in the future we need to set non-default options we can create a dedicated statsd config option group that all middlewares are getting their statsd config from.
This PR is accompanied by sapcc/helm-charts#4046