From 4ecf6dd1c0020b30ca504f43cfd6428616ac18ca Mon Sep 17 00:00:00 2001 From: Bohdan Odintsov Date: Tue, 17 Nov 2026 13:35:11 +0200 Subject: [PATCH 1/3] fix registration submission deadlock --- api/base/utils.py | 4 +- api/collection_submissions/permissions.py | 1 + api/collections/permissions.py | 1 + api/draft_nodes/views.py | 1 + api/institutions/views.py | 1 + api/nodes/filters.py | 2 +- api/nodes/serializers.py | 2 +- api/providers/views.py | 10 +++-- api/schema_responses/permissions.py | 1 + api/users/serializers.py | 1 + api_tests/base/test_utils.py | 42 +++++++++++++++++++ .../views/test_draft_registration_list.py | 13 ++++++ 12 files changed, 71 insertions(+), 8 deletions(-) diff --git a/api/base/utils.py b/api/base/utils.py index 6b967760e32..7edc6d4e708 100644 --- a/api/base/utils.py +++ b/api/base/utils.py @@ -87,7 +87,7 @@ def absolute_reverse(view_name, query_kwargs=None, args=None, kwargs=None): return url -def get_object_or_error(model_or_qs, query_or_pk=None, request=None, display_name=None, check_deleted=True): +def get_object_or_error(model_or_qs, query_or_pk=None, request=None, display_name=None, check_deleted=True, allow_select_for_update=True): OSFUser = apps.get_model('osf', 'OSFUser') if not request: # for backwards compat with existing get_object_or_error usages @@ -95,7 +95,7 @@ def get_object_or_error(model_or_qs, query_or_pk=None, request=None, display_nam obj = query = None model_cls = model_or_qs - select_for_update = check_select_for_update(request) + select_for_update = allow_select_for_update and check_select_for_update(request) if isinstance(model_or_qs, QuerySet): # they passed a queryset diff --git a/api/collection_submissions/permissions.py b/api/collection_submissions/permissions.py index 22aafb2dfe7..2d02a25b9d1 100644 --- a/api/collection_submissions/permissions.py +++ b/api/collection_submissions/permissions.py @@ -18,6 +18,7 @@ def has_permission(self, request, view): ), request=request, display_name='collection submission', + allow_select_for_update=False, ) return self.has_object_permission(request, view, obj) diff --git a/api/collections/permissions.py b/api/collections/permissions.py index 129c10438a0..09191349588 100644 --- a/api/collections/permissions.py +++ b/api/collections/permissions.py @@ -182,6 +182,7 @@ def has_permission(self, request, view): ), request=request, display_name='collection submission', + allow_select_for_update=False, ) if obj.guid.referent.deleted: raise Gone() diff --git a/api/draft_nodes/views.py b/api/draft_nodes/views.py index 3ba48fb3390..2aef7922e93 100644 --- a/api/draft_nodes/views.py +++ b/api/draft_nodes/views.py @@ -37,6 +37,7 @@ def get_node(self, check_object_permissions=True): Q(guids___id=self.kwargs['node_id']), request=self.request, display_name='node', + allow_select_for_update=False, ) if check_object_permissions: diff --git a/api/institutions/views.py b/api/institutions/views.py index 78dc0f926f5..90609470e38 100644 --- a/api/institutions/views.py +++ b/api/institutions/views.py @@ -59,6 +59,7 @@ def get_institution(self): self.kwargs[self.institution_lookup_url_kwarg], self.request, display_name='institution', + allow_select_for_update=False, ) return inst diff --git a/api/nodes/filters.py b/api/nodes/filters.py index 108b93ab4c3..e851af375f8 100644 --- a/api/nodes/filters.py +++ b/api/nodes/filters.py @@ -40,7 +40,7 @@ def build_query_from_field(self, field_name, operation): if operation['op'] == 'eq': if operation['value']: # filter[parent]= - parent = utils.get_object_or_error(AbstractNode, operation['value'], self.request, display_name='parent') + parent = utils.get_object_or_error(AbstractNode, operation['value'], self.request, display_name='parent', allow_select_for_update=False) node_ids = NodeRelation.objects.filter(parent=parent, is_node_link=False).values_list('child_id', flat=True) return Q(id__in=node_ids) elif operation['op'] == 'ne': diff --git a/api/nodes/serializers.py b/api/nodes/serializers.py index ab6e6fb77f3..610cf57797b 100644 --- a/api/nodes/serializers.py +++ b/api/nodes/serializers.py @@ -1576,7 +1576,7 @@ def create(self, validated_data): class RegistrationSchemaRelationshipField(RelationshipField): def to_internal_value(self, registration_schema_id): - schema = get_object_or_error(RegistrationSchema, registration_schema_id, self.context['request']) + schema = get_object_or_error(RegistrationSchema, registration_schema_id, self.context['request'], allow_select_for_update=False) latest_version = RegistrationSchema.objects.get_latest_version(schema.name).schema_version if latest_version != schema.schema_version or not schema.active: raise exceptions.ValidationError('Registration supplement must be an active schema.') diff --git a/api/providers/views.py b/api/providers/views.py index 4a35706bb4d..459d04ed6f3 100644 --- a/api/providers/views.py +++ b/api/providers/views.py @@ -101,6 +101,7 @@ def get_provider(self): self.kwargs['provider_id'], self.request, display_name=self.provider_class.__name__, + allow_select_for_update=False, ) if self.kwargs.get('node_id'): @@ -287,7 +288,7 @@ class BaseProviderSubjects(SubjectList): def get_default_queryset(self): parent = self.request.query_params.get('filter[parent]', None) - provider = get_object_or_error(self.provider_class, self.kwargs['provider_id'], self.request, display_name=self.provider_class.__name__) + provider = get_object_or_error(self.provider_class, self.kwargs['provider_id'], self.request, display_name=self.provider_class.__name__, allow_select_for_update=False) if parent: if parent == 'null': return optimize_subject_query(provider.top_level_subjects) @@ -398,6 +399,7 @@ def get_default_queryset(self): self.kwargs['provider_id'], self.request, display_name=self.provider_class.__name__, + allow_select_for_update=False, ) if provider.licenses_acceptable.count(): @@ -549,7 +551,7 @@ def get_queryset(self): def perform_create(self, serializer): user = self.request.user - provider = get_object_or_error(RegistrationProvider, self.kwargs['provider_id'], self.request, display_name='RegistrationProvider') + provider = get_object_or_error(RegistrationProvider, self.kwargs['provider_id'], self.request, display_name='RegistrationProvider', allow_select_for_update=False) if provider and provider.primary_collection: return serializer.save(creator=user, collection=provider.primary_collection) raise ValidationError(f'Provider {provider.name} has no primary collection to submit to.') @@ -598,7 +600,7 @@ class ModeratorMixin(ProviderMixin): model_class = OSFUser def get_provider(self): - return get_object_or_error(self.provider_type, self.kwargs['provider_id'], self.request, display_name='PreprintProvider') + return get_object_or_error(self.provider_type, self.kwargs['provider_id'], self.request, display_name='PreprintProvider', allow_select_for_update=False) def get_serializer_context(self, *args, **kwargs): ctx = super().get_serializer_context(*args, **kwargs) @@ -884,7 +886,7 @@ def get_hash(self, file_obj): def put(self, request, *args, **kwargs): provider_id = kwargs['provider_id'] - provider = get_object_or_error(RegistrationProvider, provider_id, request) + provider = get_object_or_error(RegistrationProvider, provider_id, request, allow_select_for_update=False) if not provider.allow_bulk_uploads: return JsonResponse( {'errors': [{'type': 'bulkUploadNotAllowed'}]}, diff --git a/api/schema_responses/permissions.py b/api/schema_responses/permissions.py index 41025258633..449851c0d91 100644 --- a/api/schema_responses/permissions.py +++ b/api/schema_responses/permissions.py @@ -138,6 +138,7 @@ def has_permission(self, request, view): Registration, query_or_pk=request_json['data']['relationships']['registration']['data']['id'], request=request, + allow_select_for_update=False, ) return self.has_object_permission(request, view, obj) diff --git a/api/users/serializers.py b/api/users/serializers.py index 5f7a4c6be6e..d52c6488050 100644 --- a/api/users/serializers.py +++ b/api/users/serializers.py @@ -861,6 +861,7 @@ def create(self, validated_data: Dict[str, Any]) -> UserMessage: institution_id, request, 'institution', + allow_select_for_update=False, ) if not sender.is_institutional_admin_at(institution): diff --git a/api_tests/base/test_utils.py b/api_tests/base/test_utils.py index cd3d56652f9..34a625ce3fa 100644 --- a/api_tests/base/test_utils.py +++ b/api_tests/base/test_utils.py @@ -4,9 +4,12 @@ from importlib import import_module from django.conf import settings as django_conf_settings +from django.db import connection, transaction +from django.test.utils import CaptureQueriesContext from rest_framework import fields from api.base import utils as api_utils +from osf.models import AbstractNode from osf.models.base import coerce_guid, Guid, GuidMixin, OptionalGuidMixin, VersionedGuidMixin, InvalidGuid from osf_tests.factories import ProjectFactory, PreprintFactory from tests.test_websitefiles import TestFile @@ -50,6 +53,45 @@ def test_is_deprecated_larger_versions(self): assert is_deprecated is True +@pytest.mark.django_db +@mock.patch('osf.utils.requests.settings.SELECT_FOR_UPDATE_ENABLED', True) +class TestGetObjectOrErrorSelectForUpdate: + + @pytest.fixture() + def node(self): + return ProjectFactory() + + @staticmethod + def lock_queries(ctx): + for_update_sql = connection.ops.for_update_sql() + return [query for query in ctx.captured_queries if for_update_sql in query['sql']] + + def test_locks_row_on_mutating_request_by_default(self, node): + with transaction.atomic(), CaptureQueriesContext(connection) as ctx: + obj = api_utils.get_object_or_error(AbstractNode, node._id, mock.Mock(method='POST')) + + assert obj == node + assert self.lock_queries(ctx) + + def test_does_not_lock_row_when_select_for_update_not_allowed(self, node): + with transaction.atomic(), CaptureQueriesContext(connection) as ctx: + obj = api_utils.get_object_or_error( + AbstractNode, + node._id, + mock.Mock(method='POST'), + allow_select_for_update=False, + ) + + assert obj == node + assert not self.lock_queries(ctx) + + def test_does_not_lock_row_on_safe_request(self, node): + with transaction.atomic(), CaptureQueriesContext(connection) as ctx: + obj = api_utils.get_object_or_error(AbstractNode, node._id, mock.Mock(method='GET')) + + assert obj == node + assert not self.lock_queries(ctx) + @pytest.mark.django_db class TestFlaskDjangoIntegration: def test_push_status_message_no_response(self): diff --git a/api_tests/draft_registrations/views/test_draft_registration_list.py b/api_tests/draft_registrations/views/test_draft_registration_list.py index 8dcd88a8b56..dcb2a2257f6 100644 --- a/api_tests/draft_registrations/views/test_draft_registration_list.py +++ b/api_tests/draft_registrations/views/test_draft_registration_list.py @@ -2,6 +2,8 @@ from waffle.testutils import override_flag from framework.auth.core import Auth +from django.db import connection, transaction +from django.test.utils import CaptureQueriesContext from django.utils import timezone from api_tests.nodes.views.test_node_draft_registration_list import AbstractDraftRegistrationTestCase from api.base.settings.defaults import API_BASE @@ -465,6 +467,17 @@ def test_admin_can_create_draft( assert draft.creator == user assert draft.has_permission(user, ADMIN) is True + def test_create_draft_does_not_lock_registration_schema(self, app, user, url_draft_registrations, payload): + with transaction.atomic(), CaptureQueriesContext(connection) as ctx, capture_notifications(): + res = app.post_json_api(url_draft_registrations, payload, auth=user.auth) + + assert res.status_code == 201 + for_update_sql = connection.ops.for_update_sql() + assert not any( + for_update_sql in query['sql'] and 'FROM "osf_registrationschema"' in query['sql'] + for query in ctx.captured_queries + ) + def test_create_no_project_draft_emails_initiator(self, app, user, url_draft_registrations, payload): with capture_notifications() as notifications: app.post_json_api( From fd5b78d0f52ea9659f53f45b72b9aa485d780382 Mon Sep 17 00:00:00 2001 From: Bohdan Odintsov Date: Thu, 19 Nov 2026 12:31:23 +0200 Subject: [PATCH 2/3] remove lock in collectionSubmission, fix last admin delete --- api/base/utils.py | 2 +- api/collections/permissions.py | 1 - api/providers/views.py | 12 ++++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/api/base/utils.py b/api/base/utils.py index 7edc6d4e708..293b067f16f 100644 --- a/api/base/utils.py +++ b/api/base/utils.py @@ -101,7 +101,7 @@ def get_object_or_error(model_or_qs, query_or_pk=None, request=None, display_nam # they passed a queryset model_cls = model_or_qs.model try: - obj = model_or_qs.select_for_update().get() if select_for_update else model_or_qs.get() + obj = model_or_qs.select_for_update(of=('self',)).get() if select_for_update else model_or_qs.get() except model_cls.DoesNotExist: raise NotFound diff --git a/api/collections/permissions.py b/api/collections/permissions.py index 09191349588..129c10438a0 100644 --- a/api/collections/permissions.py +++ b/api/collections/permissions.py @@ -182,7 +182,6 @@ def has_permission(self, request, view): ), request=request, display_name='collection submission', - allow_select_for_update=False, ) if obj.guid.referent.deleted: raise Gone() diff --git a/api/providers/views.py b/api/providers/views.py index 459d04ed6f3..3fad7604ec7 100644 --- a/api/providers/views.py +++ b/api/providers/views.py @@ -599,8 +599,14 @@ class ModeratorMixin(ProviderMixin): provider_class = PreprintProvider model_class = OSFUser - def get_provider(self): - return get_object_or_error(self.provider_type, self.kwargs['provider_id'], self.request, display_name='PreprintProvider', allow_select_for_update=False) + def get_provider(self, allow_select_for_update=False): + return get_object_or_error( + self.provider_type, + self.kwargs['provider_id'], + self.request, + display_name='PreprintProvider', + allow_select_for_update=allow_select_for_update, + ) def get_serializer_context(self, *args, **kwargs): ctx = super().get_serializer_context(*args, **kwargs) @@ -656,6 +662,8 @@ def get_object(self): except AttributeError: # Group doesn't exist -- users not moderator raise NotFound + if perm_group == ADMIN: + self.get_provider(allow_select_for_update=True) setattr(user, 'permission_group', perm_group) return user From e0c93779caa5f1b9eb539b4864914c9b05332a15 Mon Sep 17 00:00:00 2001 From: Bohdan Odintsov Date: Thu, 19 Nov 2026 23:23:13 +0200 Subject: [PATCH 3/3] add tests --- ..._registration_provider_submissions_list.py | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 api_tests/providers/registrations/views/test_registration_provider_submissions_list.py diff --git a/api_tests/providers/registrations/views/test_registration_provider_submissions_list.py b/api_tests/providers/registrations/views/test_registration_provider_submissions_list.py new file mode 100644 index 00000000000..5a0820be025 --- /dev/null +++ b/api_tests/providers/registrations/views/test_registration_provider_submissions_list.py @@ -0,0 +1,76 @@ +import pytest +from django.db import connection, transaction +from django.test.utils import CaptureQueriesContext + +from api.base.settings.defaults import API_BASE +from osf_tests.factories import ( + AuthUserFactory, + CollectionFactory, + RegistrationFactory, + RegistrationProviderFactory, +) +from tests.utils import capture_notifications + + +@pytest.mark.django_db +class TestRegistrationProviderSubmissionCreate: + + @pytest.fixture() + def user(self): + return AuthUserFactory() + + @pytest.fixture() + def registration(self, user): + return RegistrationFactory(creator=user) + + @pytest.fixture() + def provider(self): + return RegistrationProviderFactory() + + @pytest.fixture() + def url(self, provider): + return f'/{API_BASE}providers/registrations/{provider._id}/submissions/' + + @pytest.fixture() + def payload(self, registration): + return { + 'data': { + 'type': 'collection-submissions', + 'attributes': { + 'guid': registration._id, + }, + }, + } + + @pytest.fixture() + def primary_collection(self, user, provider): + collection = CollectionFactory(creator=user, provider=provider, is_public=True) + provider.primary_collection = collection + provider.save() + return collection + + def test_create_submission_in_primary_collection(self, app, user, registration, primary_collection, url, payload): + with capture_notifications(): + res = app.post_json_api(url, payload, auth=user.auth) + + assert res.status_code == 201 + assert primary_collection.collectionsubmission_set.filter(guid___id=registration._id).exists() + + def test_cannot_create_submission_without_primary_collection(self, app, user, provider, url, payload): + assert provider.primary_collection is None + + res = app.post_json_api(url, payload, auth=user.auth, expect_errors=True) + + assert res.status_code == 400 + assert 'has no primary collection' in res.json['errors'][0]['detail'] + + def test_create_submission_does_not_lock_provider(self, app, user, primary_collection, url, payload): + with transaction.atomic(), CaptureQueriesContext(connection) as ctx, capture_notifications(): + res = app.post_json_api(url, payload, auth=user.auth) + + assert res.status_code == 201 + for_update_sql = connection.ops.for_update_sql() + assert not any( + query['sql'].startswith('SELECT') and 'osf_abstractprovider' in query['sql'] and for_update_sql in query['sql'] + for query in ctx.captured_queries + )