Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
edx-platform-release
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hsin-Yu Chien
edx-platform-release
Commits
30c3a39d
Commit
30c3a39d
authored
6 years ago
by
christopher lee
Browse files
Options
Downloads
Patches
Plain Diff
Fix throttle rate for 'staff' user
parent
ccd966a5
No related branches found
Branches containing commit
Tags
release-2020-10-02-11.03
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
common/djangoapps/enrollment/__init__.py
+10
-0
10 additions, 0 deletions
common/djangoapps/enrollment/__init__.py
common/djangoapps/enrollment/views.py
+31
-1
31 additions, 1 deletion
common/djangoapps/enrollment/views.py
with
41 additions
and
1 deletion
common/djangoapps/enrollment/__init__.py
+
10
−
0
View file @
30c3a39d
"""
Enrollment API helpers and settings
"""
from
openedx.core.djangoapps.waffle_utils
import
(
WaffleFlag
,
WaffleFlagNamespace
)
WAFFLE_FLAG_NAMESPACE
=
WaffleFlagNamespace
(
name
=
'
enrollment_api_rate_limit
'
)
USE_RATE_LIMIT_400_FOR_STAFF_FOR_ENROLLMENT_API
=
WaffleFlag
(
WAFFLE_FLAG_NAMESPACE
,
'
staff_rate_limit_400
'
)
USE_RATE_LIMIT_100_FOR_STAFF_FOR_ENROLLMENT_API
=
WaffleFlag
(
WAFFLE_FLAG_NAMESPACE
,
'
staff_rate_limit_100
'
)
USE_RATE_LIMIT_40_FOR_ENROLLMENT_API
=
WaffleFlag
(
WAFFLE_FLAG_NAMESPACE
,
'
rate_limit_40
'
)
This diff is collapsed.
Click to expand it.
common/djangoapps/enrollment/views.py
+
31
−
1
View file @
30c3a39d
...
...
@@ -12,6 +12,11 @@ from django.utils.decorators import method_decorator
from
edx_rest_framework_extensions.authentication
import
JwtAuthentication
from
enrollment
import
api
from
enrollment.errors
import
CourseEnrollmentError
,
CourseEnrollmentExistsError
,
CourseModeNotFoundError
from
enrollment
import
(
USE_RATE_LIMIT_100_FOR_STAFF_FOR_ENROLLMENT_API
,
USE_RATE_LIMIT_40_FOR_ENROLLMENT_API
,
USE_RATE_LIMIT_400_FOR_STAFF_FOR_ENROLLMENT_API
,
)
from
opaque_keys
import
InvalidKeyError
from
opaque_keys.edx.keys
import
CourseKey
...
...
@@ -76,7 +81,32 @@ class ApiKeyPermissionMixIn(object):
class
EnrollmentUserThrottle
(
UserRateThrottle
,
ApiKeyPermissionMixIn
):
"""
Limit the number of requests users can make to the enrollment API.
"""
rate
=
'
40/minute
'
# TODO: After confirming that reducing the throttle is successful, remove
# and clean up waffles. The rate limit has been increased over the course
# of a few months to account for unnecessary calls from the ecommerce
# service. These calls are no longer made and the plan is to set the
# rate limit back to its original state. LEARNER-5148
if
USE_RATE_LIMIT_400_FOR_STAFF_FOR_ENROLLMENT_API
.
is_enabled
():
THROTTLE_RATES
=
{
'
user
'
:
'
40/minute
'
,
'
staff
'
:
'
400/minute
'
,
}
elif
USE_RATE_LIMIT_100_FOR_STAFF_FOR_ENROLLMENT_API
.
is_enabled
():
THROTTLE_RATES
=
{
'
user
'
:
'
40/minute
'
,
'
staff
'
:
'
100/minute
'
,
}
elif
USE_RATE_LIMIT_40_FOR_ENROLLMENT_API
.
is_enabled
():
THROTTLE_RATES
=
{
'
user
'
:
'
40/minute
'
,
'
staff
'
:
'
40/minute
'
,
}
else
:
THROTTLE_RATES
=
{
'
user
'
:
'
40/minute
'
,
'
staff
'
:
'
2000/minute
'
,
}
def
allow_request
(
self
,
request
,
view
):
# Use a special scope for staff to allow for a separate throttle rate
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment