Skip to content

[bugfix] Fix lock order when storing reports to the database #3450

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
vkarak merged 3 commits into from
Apr 4, 2025
Merged

[bugfix] Fix lock order when storing reports to the database #3450

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8f24d9
Fix DB lock order when storing reports
vkarak Apr 3, 2025
9c6e2e0
Create parent directories of DB lock required by Python <= 3.7
vkarak Apr 3, 2025
7317059
Merge branch 'develop' into bugfix/db-lock-order
vkarak Apr 4, 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
10 changes: 8 additions & 2 deletions reframe/frontend/reporting/storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,12 @@ def _db_lock(self):
# filelock 3.10
kwargs = {}

# Create parent directories of the lock file
#
# NOTE: This is not necessary for filelock >= 3.12.3 and Python >= 3.8
# However, we do create it here, in order to support the older Python
# versions.
os.makedirs(prefix, exist_ok=True)
return FileLock(os.path.join(prefix, '.db.lock'), **kwargs)

def _db_create(self):
Expand Down Expand Up @@ -223,8 +229,8 @@ def _db_store_report(self, conn, report, report_file_path):
return session_uuid

def store(self, report, report_file=None):
with self._db_connect(self._db_file()) as conn:
with self._db_lock():
with self._db_lock():
with self._db_connect(self._db_file()) as conn:
return self._db_store_report(conn, report, report_file)

@time_function
Expand Down
Loading