Skip to content
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.

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

🐛Storage: fix copying of file and ensure project lock release is always notified safely #7206

Merged
merged 13 commits into from
Feb 11, 2025

Conversation

sanderegg
Copy link
Member

@sanderegg sanderegg commented Feb 11, 2025

What do these changes do?

  • fixes issue where a study could not be duplicated following refactoring ♻️Storage: Code refactoring prior to changes (🚨🚨) #7088
  • fixes issue where the project lock release would not be notified to the frontend in case of error while copying
  • ensure error in notification callback does not raise an error
  • de-duplicated a few things

Related issue/s

How to test

Dev-ops checklist

@sanderegg sanderegg added a:storage issue related to storage service a:webserver issue related to the webserver service labels Feb 11, 2025
@sanderegg sanderegg added this to the Singularity milestone Feb 11, 2025
@sanderegg sanderegg self-assigned this Feb 11, 2025
Copy link

codecov bot commented Feb 11, 2025

Codecov Report

Attention: Patch coverage is 93.87755% with 3 lines in your changes missing coverage. Please review.

Project coverage is 84.90%. Comparing base (547ee94) to head (a077042).
Report is 1 commits behind head on master.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #7206      +/-   ##
==========================================
+ Coverage   81.10%   84.90%   +3.79%     
==========================================
  Files        1313     1287      -26     
  Lines       53011    54228    +1217     
  Branches      677      658      -19     
==========================================
+ Hits        42997    46044    +3047     
+ Misses       9870     8002    -1868     
- Partials      144      182      +38     
Flag Coverage Δ
integrationtests 68.44% <ø> (+<0.01%) ⬆️
unittests 83.40% <93.87%> (+5.32%) ⬆️
Components Coverage Δ
api ∅ <ø> (∅)
pkg_aws_library ∅ <ø> (∅)
pkg_dask_task_models_library ∅ <ø> (∅)
pkg_models_library ∅ <ø> (∅)
pkg_notifications_library ∅ <ø> (∅)
pkg_postgres_database ∅ <ø> (∅)
pkg_service_integration ∅ <ø> (∅)
pkg_service_library 73.03% <93.75%> (∅)
pkg_settings_library ∅ <ø> (∅)
pkg_simcore_sdk 85.46% <ø> (-1.30%) ⬇️
agent 96.46% <ø> (ø)
api_server 90.55% <ø> (ø)
autoscaling 96.08% <ø> (∅)
catalog 91.71% <ø> (ø)
clusters_keeper 99.24% <ø> (ø)
dask_sidecar 91.25% <ø> (ø)
datcore_adapter 93.19% <ø> (ø)
director 76.59% <ø> (ø)
director_v2 91.29% <ø> (-0.02%) ⬇️
dynamic_scheduler 97.17% <ø> (ø)
dynamic_sidecar 89.77% <ø> (ø)
efs_guardian 90.25% <ø> (ø)
invitations 93.28% <ø> (ø)
osparc_gateway_server ∅ <ø> (∅)
payments 92.66% <ø> (ø)
resource_usage_tracker 88.79% <ø> (∅)
storage 86.10% <100.00%> (-0.24%) ⬇️
webclient ∅ <ø> (∅)
webserver 79.35% <ø> (+13.66%) ⬆️

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 547ee94...a077042. Read the comment docs.

@sanderegg sanderegg marked this pull request as ready for review February 11, 2025 09:30
@sanderegg sanderegg requested a review from pcrespov as a code owner February 11, 2025 09:30
@sanderegg sanderegg changed the title 🐛Storage: fix copying of file and ensure project lock release is always notified 🐛Storage: fix copying of file and ensure project lock release is always notified safely Feb 11, 2025
Copy link
Member

@odeimaiz odeimaiz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks

@sanderegg sanderegg enabled auto-merge (squash) February 11, 2025 09:35
Copy link
Member

@pcrespov pcrespov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thx

Copy link
Contributor

@bisgaard-itis bisgaard-itis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks a lot for the fix

Copy link
Contributor

@GitHK GitHK left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks OK to me, let me know if seething goes wrong with the director-v2 02 integration tests (in theory your changes should have no impact)

@sanderegg sanderegg added the 🤖-automerge marks PR as ready to be merged for Mergify label Feb 11, 2025
Copy link
Contributor

mergify bot commented Feb 11, 2025

Restarted CI due to failing tests

@sanderegg sanderegg removed the 🤖-automerge marks PR as ready to be merged for Mergify label Feb 11, 2025
@sanderegg sanderegg force-pushed the storage/fix-copying branch 2 times, most recently from de81256 to 7dcf4e5 Compare February 11, 2025 12:01
@sanderegg sanderegg disabled auto-merge February 11, 2025 15:36
@sanderegg sanderegg merged commit b478207 into ITISFoundation:master Feb 11, 2025
6 checks passed
@sanderegg sanderegg deleted the storage/fix-copying branch February 11, 2025 15:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
a:storage issue related to storage service a:webserver issue related to the webserver service
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants