Skip to content

chore(hybridcloud) Align keys used for organization snowflakeids #104075

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
merged 3 commits into from
Nov 27, 2025
Merged

chore(hybridcloud) Align keys used for organization snowflakeids #104075

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
970f70c
chore(hybridcloud) Align keys used for organization snowflakeids
markstory Nov 26, 2025
a1d574c
Remove print()
markstory Nov 26, 2025
68c418a
Remove change to create_organization()
markstory Nov 26, 2025
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
7 changes: 2 additions & 5 deletions src/sentry/hybridcloud/services/control_organization_provisioning/impl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
serialize_slug_reservation,
)
from sentry.hybridcloud.services.organization_mapping.serial import serialize_organization_mapping
from sentry.models.organization import Organization
from sentry.models.organizationmapping import OrganizationMapping
from sentry.models.organizationmember import OrganizationMember
from sentry.models.organizationmembermapping import OrganizationMemberMapping
Expand Down Expand Up @@ -63,9 +64,6 @@ class InvalidOrganizationProvisioningException(Exception):
pass


REDIS_KEY_PREFIX = "control_org"


class DatabaseBackedControlOrganizationProvisioningService(
ControlOrganizationProvisioningRpcService
):
Expand Down Expand Up @@ -95,8 +93,7 @@ def _validate_organization_mapping_belongs_to_user(

@staticmethod
def _generate_org_snowflake_id(region_name: str) -> int:
redis_key = f"{REDIS_KEY_PREFIX}_{region_name}"
return generate_snowflake_id(redis_key)
return generate_snowflake_id(Organization.snowflake_redis_key)

@staticmethod
def _generate_org_slug(region_name: str, slug: str) -> str:
Expand Down
Loading