fix: increase the default throttle rate for enterprise users (POC) #4394
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
adamstankiewicz
commented
Jul 24, 2024
| except UserThrottleRate.DoesNotExist: | ||
| # If we don't have a custom user override, skip throttling if they are a privileged user | ||
| if user.is_superuser or user.is_staff or is_publisher_user(user): | ||
| return True | ||
|
|
||
| # If the user is not a privileged user, increase throttling rate if they are an enterprise user | ||
| if is_enterprise_user(request): | ||
| self.rate = '300/hour' |
There was a problem hiding this comment.
[inform/context] This specific rate is still up in the air; it might need to be higher than this (e.g., 600/hour) for enterprise users. This POC PR intends to demonstrate the approach, rather than a specific rate at the moment.
adamstankiewicz
commented
Jul 24, 2024
| @@ -28,10 +42,15 @@ def allow_request(self, request, view): | |||
| # Override this throttle's rate if applicable | |||
| user_throttle = UserThrottleRate.objects.get(user=user) | |||
| self.rate = user_throttle.rate | |||
| self.num_requests, self.duration = self.parse_rate(self.rate) | |||
| except UserThrottleRate.DoesNotExist: | |||
| # If we don't have a custom user override, skip throttling if they are a privileged user | |||
| if user.is_superuser or user.is_staff or is_publisher_user(user): | |||
There was a problem hiding this comment.
[inform/context] We already remove the throttling based on whether the authenticated user is a "publisher user" (aka is a member of a Django Group). This POC is largely extending this to account for an is_enterprise_user check as well.
adamstankiewicz
force-pushed
the
ags/enterprise-rate-limit
branch
from
4934358
to
39117c2
Compare
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.
The
frontend-app-learner-portal-enterpriseMFE makes requests to several API endpoints withincourse-discovery, e.g. to serve metadata about courses, programs, course recommendations, and course reviews. However, enterprise users are frequently rate limited by the default throttle rate of100/hour(i.e., N = 2.45k requests rate limited in the past 1 week from this MFE).This PR proposes a (POC) solution for increasing the default throttle rate if the authenticated user is an enterprise user, as determined by the authenticated user's
rolesin their decoded JWT cookie.