Skip to content

fix: resolve race condition in FeatureSegment priority assignment #7016

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

Open
SahilJat wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: resolve race condition in FeatureSegment priority assignment #7016

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fab92d9
fix: resolve race condition in FeatureSegment priority assignment
SahilJat Mar 23, 2026
ab91d49
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 23, 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
12 changes: 11 additions & 1 deletion api/features/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
ObjectDoesNotExist,
ValidationError,
)
from django.db import models
from django.db import models, transaction
from django.db.models import Max, Q, QuerySet
from django.utils import formats, timezone
from django_lifecycle import ( # type: ignore[import-untyped]
Expand Down Expand Up @@ -216,6 +216,8 @@ def _get_project(self) -> typing.Optional["Project"]:


def get_next_segment_priority(feature): # type: ignore[no-untyped-def]
Feature.objects.select_for_update().get(pk=feature.id)

feature_segments = FeatureSegment.objects.filter(feature=feature).order_by(
"-priority"
)
Expand Down Expand Up @@ -281,6 +283,14 @@ class FeatureSegment(

objects = FeatureSegmentManager() # type: ignore[misc]

@hook(BEFORE_CREATE)
def set_priority(self) -> None:
if self.priority is None:
# We use an atomic transaction here to ensure
# the select_for_update() lock in get_next_segment_priority works.
with transaction.atomic():
self.priority = get_next_segment_priority(self.feature)

class Meta:
unique_together = (
"feature",
Expand Down