Skip to content
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

Jump to bottom

[CapMan visibility] Increase the default throttle/warning threshold for allocation policies #6189

Merged
merged 1 commit into from
Aug 9, 2024
Merged

[CapMan visibility] Increase the default throttle/warning threshold for allocation policies #6189

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
8 changes: 4 additions & 4 deletions snuba/query/allocation_policies/bytes_scanned_rejecting_policy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
PETABYTE = 10**12
DEFAULT_BYTES_SCANNED_LIMIT = int(1.28 * PETABYTE)
DEFAULT_TIMEOUT_PENALIZATION = DEFAULT_BYTES_SCANNED_LIMIT // 40
DEFAULT_BYTES_THROTTLE_DIVIDER = 2
DEFAULT_BYTES_THROTTLE_DIVIDER = 1.5
DEFAULT_THREADS_THROTTLE_DIVIDER = 2
QUOTA_UNIT = "bytes"
SUGGESTION = "The feature, organization/project is scanning too many bytes, this usually means they are abusing that API"
Expand Down Expand Up @@ -102,14 +102,14 @@ def _additional_config_definitions(self) -> list[AllocationPolicyConfig]:
AllocationPolicyConfig(
"bytes_throttle_divider",
"Divide the scan limit by this number gives the throttling threshold",
int,
float,
DEFAULT_BYTES_THROTTLE_DIVIDER,
),
AllocationPolicyConfig(
"threads_throttle_divider",
"max threads divided by this number is the number of threads we use to execute queries for a throttled (project_id|organization_id, referrer)",
int,
DEFAULT_BYTES_THROTTLE_DIVIDER,
DEFAULT_THREADS_THROTTLE_DIVIDER,
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this fixes an existing bug

),
]

Expand Down Expand Up @@ -204,7 +204,7 @@ def _get_quota_allowance(
customer_tenant_key, customer_tenant_value, referrer
)
throttle_threshold = max(
1, scan_limit // self.get_config_value("bytes_throttle_divider")
1, int(scan_limit // self.get_config_value("bytes_throttle_divider"))
)
timestamp, granted_quotas = _RATE_LIMITER.check_within_quotas(
[
Expand Down
10 changes: 6 additions & 4 deletions snuba/query/allocation_policies/per_referrer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
_DEFAULT_CONCURRENT_REQUEST_PER_REFERRER = 100
_REFERRER_CONCURRENT_OVERRIDE = -1
_REFERRER_MAX_THREADS_OVERRIDE = -1
_REQUESTS_THROTTLE_DIVIDER = 2
_REQUESTS_THROTTLE_DIVIDER = 1.5
_THREADS_THROTTLE_DIVIDER = 2

QUOTA_UNIT = "concurrent_queries"
Expand Down Expand Up @@ -77,7 +77,7 @@ def _additional_config_definitions(self) -> list[AllocationPolicyConfig]:
AllocationPolicyConfig(
name="requests_throttle_divider",
description="default_concurrent_request_per_referrer divided by this value will be the threshold at which we will decrease the number of threads (THROTTLED_THREADS) used to execute queries",
value_type=int,
value_type=float,
default=_REQUESTS_THROTTLE_DIVIDER,
),
AllocationPolicyConfig(
Expand Down Expand Up @@ -129,8 +129,10 @@ def _get_quota_allowance(
num_threads = self._get_max_threads(referrer)
requests_throttle_threshold = max(
1,
self.get_config_value("default_concurrent_request_per_referrer")
// self.get_config_value("requests_throttle_divider"),
int(
self.get_config_value("default_concurrent_request_per_referrer")
// self.get_config_value("requests_throttle_divider")
),
)

is_throttled = False
Expand Down
2 changes: 1 addition & 1 deletion tests/query/allocation_policies/test_bytes_scanned_rejecting_policy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def test_throttles(
policy: BytesScannedRejectingPolicy,
) -> None:
_configure_policy(policy)
policy.set_config_value("bytes_throttle_divider", 2)
policy.set_config_value("bytes_throttle_divider", 1.5)
policy.set_config_value("threads_throttle_divider", 2)
tenant_ids: dict[str, int | str] = {
"organization_id": 123,
Expand Down
6 changes: 3 additions & 3 deletions tests/web/test_db_query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ def test_db_query_success() -> None:
"quota_used": 1560000000000,
"quota_unit": "bytes",
"suggestion": "The feature, organization/project is scanning too many bytes, this usually means they are abusing that API",
"throttle_threshold": 1280000000000,
"throttle_threshold": 1706666666666,
},
},
"details": {
Expand All @@ -322,7 +322,7 @@ def test_db_query_success() -> None:
"storage_key": "StorageKey.ERRORS_RO",
},
"is_throttled": False,
"throttle_threshold": 50,
"throttle_threshold": 66,
"rejection_threshold": 100,
"quota_used": 1,
"quota_unit": "concurrent_queries",
Expand Down Expand Up @@ -351,7 +351,7 @@ def test_db_query_success() -> None:
"storage_key": "StorageKey.ERRORS_RO",
},
"is_throttled": True,
"throttle_threshold": 1280000000000,
"throttle_threshold": 1706666666666,
"rejection_threshold": 2560000000000,
"quota_used": 1560000000000,
"quota_unit": "bytes",
Expand Down
Loading