Skip to content

ref(relay): Reduce lock contention on Relay usage #121987

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
Dav1dde merged 3 commits into from
Aug 14, 2026
+9 −4
Merged

ref(relay): Reduce lock contention on Relay usage #121987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f17216
ref(relay): Reduce lock contention on Relay usage
Dav1dde Aug 13, 2026
fc4093d
use buffer_incr
Dav1dde Aug 13, 2026
007e289
self.tasks()
Dav1dde Aug 13, 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
10 changes: 7 additions & 3 deletions src/sentry/api/endpoints/relay/register_response.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
from sentry.api.serializers import serialize
from sentry.models.relay import Relay, RelayUsage
from sentry.relay.utils import get_header_relay_id, get_header_relay_signature
from sentry.tasks.process_buffer import buffer_incr

from . import RelayIdSerializer

Expand Down Expand Up @@ -101,9 +102,12 @@ def post(self, request: Request) -> Response:
except RelayUsage.DoesNotExist:
RelayUsage.objects.create(relay_id=relay_id, version=version, public_key=public_key)

@cursor cursor Bot Aug 13, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Concurrent usage creates can 500

Medium Severity

Switching from get_or_create to a bare get plus create reopens a race on (relay_id, version). Concurrent first-time registrations can both miss the row, then the second create hits the unique constraint and returns 500 instead of taking the update path.

Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit fc4093d. Configure here.

@Dav1dde Dav1dde Aug 13, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Yeah, but that's not new. Can fix that in a separate PR

else:
relay_usage.last_seen = timezone.now()
relay_usage.public_key = public_key
relay_usage.save()
buffer_incr(
model=RelayUsage,
columns={},
filters={"id": relay_usage.id},
extra={"last_seen": timezone.now(), "public_key": public_key},
)
Comment thread
Dav1dde marked this conversation as resolved.

assert relay is not None
return Response(serialize({"relay_id": relay.relay_id}))
3 changes: 2 additions & 1 deletion tests/sentry/api/endpoints/test_relay_register.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,8 @@ def test_relay_usage_is_updated_at_registration(self) -> None:
self.register_relay(key_pair, "2.2.2", relay_id)
after_second_relay = timezone.now()
# re register the first one in order to update the last used time
self.register_relay(key_pair, "1.1.1", relay_id)
with self.tasks():
self.register_relay(key_pair, "1.1.1", relay_id)
after_re_register = timezone.now()

rv1 = RelayUsage.objects.get(relay_id=relay_id, version="1.1.1")
Expand Down
Loading