Skip to content

fix: ensure database commits complete before HTTP responses #722

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
chrisburr wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −7
Open

fix: ensure database commits complete before HTTP responses #722

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 12 additions & 7 deletions diracx-routers/src/diracx/routers/dependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"AvailableSecurityProperties",
)

from functools import partial
from typing import Annotated, TypeVar

from fastapi import Depends
Expand All @@ -32,24 +33,28 @@

T = TypeVar("T")

# Use scope="function" to ensure DB commits happen before sending HTTP responses
# This prevents race conditions when DIRAC immediately queries data after DiracX writes it
DBDepends = partial(Depends, scope="function")


def add_settings_annotation(cls: T) -> T:
"""Add a `Depends` annotation to a class that has a `create` classmethod."""
return Annotated[cls, Depends(cls.create)] # type: ignore


# Databases
AuthDB = Annotated[_AuthDB, Depends(_AuthDB.transaction)]
JobDB = Annotated[_JobDB, Depends(_JobDB.transaction)]
JobLoggingDB = Annotated[_JobLoggingDB, Depends(_JobLoggingDB.transaction)]
PilotAgentsDB = Annotated[_PilotAgentsDB, Depends(_PilotAgentsDB.transaction)]
AuthDB = Annotated[_AuthDB, DBDepends(_AuthDB.transaction)]
JobDB = Annotated[_JobDB, DBDepends(_JobDB.transaction)]
JobLoggingDB = Annotated[_JobLoggingDB, DBDepends(_JobLoggingDB.transaction)]
PilotAgentsDB = Annotated[_PilotAgentsDB, DBDepends(_PilotAgentsDB.transaction)]
SandboxMetadataDB = Annotated[
_SandboxMetadataDB, Depends(_SandboxMetadataDB.transaction)
_SandboxMetadataDB, DBDepends(_SandboxMetadataDB.transaction)
]
TaskQueueDB = Annotated[_TaskQueueDB, Depends(_TaskQueueDB.transaction)]
TaskQueueDB = Annotated[_TaskQueueDB, DBDepends(_TaskQueueDB.transaction)]

# Opensearch databases
JobParametersDB = Annotated[_JobParametersDB, Depends(_JobParametersDB.session)]
JobParametersDB = Annotated[_JobParametersDB, DBDepends(_JobParametersDB.session)]


# Miscellaneous
Expand Down
Loading