Skip to content

ref(allocation-policies): Remove CrossOrgQueryAllocationPolicy #8654

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

Merged
dezzeddi merged 2 commits into from
Nov 3, 2026
Merged

ref(allocation-policies): Remove CrossOrgQueryAllocationPolicy #8654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7805511
ref(allocation-policies): Remove CrossOrgQueryAllocationPolicy
dezzeddi Oct 29, 2026
eb05f48
Merge branch 'master' into dani/remove-dead-allocation-policies
dezzeddi Nov 3, 2026
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
15 changes: 0 additions & 15 deletions sentry-options/schemas/snuba/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,21 +386,6 @@
"max_threads": {
"type": "integer",
"optional": true
},
"cross_org_referrer_limits": {
"type": "object",
"additionalProperties": {
"type": "object",
"properties": {
"max_threads": {
"type": "integer"
},
"concurrent_limit": {
"type": "integer"
}
}
},
"optional": true
}
},
"additionalProperties": {
Expand Down
3 changes: 1 addition & 2 deletions snuba/datasets/configuration/outcomes/entities/outcomes_cross_org_hourly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ query_processors:
# Dedicated org-level outcomes entity for cross-org active-org discovery. Unlike the
# shared `outcomes` entity it intentionally has an EMPTY validators list (no
# EntityRequiredColumnValidator for org_id), so callers can group by org_id without a
# per-org filter. Access is governed at the storage layer by
# CrossOrgQueryAllocationPolicy.
# per-org filter.
validators: []
validate_data_model: error
3 changes: 1 addition & 2 deletions snuba/datasets/configuration/outcomes/storages/cross_org_hourly.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,4 @@ query_processors:
# shared outcomes_hourly storage over the same ClickHouse tables but intentionally
# OMITS the OrgIdEnforcer mandatory_condition_checker so a query can scan across
# organizations. The shared `outcomes` storage keeps OrgIdEnforcer; this storage is
# reachable only via the dedicated `outcomes_cross_org_hourly` entity and is gated by
# CrossOrgQueryAllocationPolicy (registered referrers only).
# reachable only via the dedicated `outcomes_cross_org_hourly` entity.
176 changes: 0 additions & 176 deletions snuba/query/allocation_policies/cross_org.py
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions tests/query/allocation_policies/test_allocation_policy_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
from snuba.query.allocation_policies.concurrent_rate_limit import (
ConcurrentRateLimitAllocationPolicy,
)
from snuba.query.allocation_policies.cross_org import CrossOrgQueryAllocationPolicy
from snuba.query.allocation_policies.per_referrer import ReferrerGuardRailPolicy
from snuba.utils.metrics.backends.testing import get_recorded_metric_calls
from tests.configs.component_config import (
Expand Down Expand Up @@ -508,7 +507,6 @@ def get_all_allocation_policy_classes(self) -> list[type[AllocationPolicy]]:
ReferrerGuardRailPolicy,
ConcurrentRateLimitAllocationPolicy,
BytesScannedRejectingPolicy,
CrossOrgQueryAllocationPolicy,
BytesScannedWindowAllocationPolicy,
]

Expand Down
5 changes: 0 additions & 5 deletions tests/query/allocation_policies/test_attachment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@
{"name": "BytesScannedRejectingPolicy", "is_enforced": 0},
{"name": "BytesScannedWindowAllocationPolicy", "is_enforced": 0},
{"name": "ConcurrentRateLimitAllocationPolicy", "is_enforced": 0},
{
"name": "CrossOrgQueryAllocationPolicy",
"is_enforced": 0,
"cross_org_referrer_limits": {"some.referrer": {"max_threads": 2, "concurrent_limit": 4}},
},
{"name": "DeleteConcurrentRateLimitAllocationPolicy", "is_enforced": 0},
{"name": "PassthroughPolicy", "is_enforced": 0},
{"name": "ReferrerGuardRailPolicy", "is_enforced": 0},
Expand Down
Loading
Loading