Skip to content

🐛 efs - deletion of data run in executor #7013

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
merged 6 commits into from
Jan 8, 2025
Merged

🐛 efs - deletion of data run in executor #7013

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1c64499
run in executor
matusdrobuliak66 Jan 7, 2025
e83af65
Merge branch 'master' into bugfix/efs-blocking-operation
matusdrobuliak66 Jan 7, 2025
bf36a85
Merge branch 'master' into bugfix/efs-blocking-operation
matusdrobuliak66 Jan 7, 2025
38f9489
Merge branch 'master' into bugfix/efs-blocking-operation
matusdrobuliak66 Jan 8, 2025
0c476e1
reuse remove_directory function
matusdrobuliak66 Jan 8, 2025
0dc3045
Merge branch 'master' into bugfix/efs-blocking-operation
matusdrobuliak66 Jan 8, 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
4 changes: 3 additions & 1 deletion services/efs-guardian/src/simcore_service_efs_guardian/services/efs_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import asyncio
import logging
import os
import shutil
Expand Down Expand Up @@ -153,7 +154,8 @@ async def remove_project_efs_data(self, project_id: ProjectID) -> None:
if Path.exists(_dir_path):
# Remove the directory and all its contents
try:
shutil.rmtree(_dir_path)
loop = asyncio.get_event_loop()
await loop.run_in_executor(None, shutil.rmtree, _dir_path)
_logger.info("%s has been deleted.", _dir_path)
except FileNotFoundError:
_logger.exception("Directory %s does not exist.", _dir_path)
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e-playwright/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ def log_in_and_out(
def _open_with_resources(page: Page, *, click_it: bool):
study_title_field = page.get_by_test_id("studyTitleField")
# wait until the title is automatically filled up
expect(study_title_field).not_to_have_value("")
expect(study_title_field).not_to_have_value("", timeout=30000)

open_with_resources_button = page.get_by_test_id("openWithResources")
if click_it:
Expand Down
Loading