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

Don't try to cancel failed Zarr uploads twice #1139

Merged
merged 1 commit into from
Oct 18, 2022
Merged

Conversation

jwodder
Copy link
Member

@jwodder jwodder commented Oct 18, 2022

Fixed a bug seen in #1028 (comment).

@jwodder jwodder added the patch Increment the patch version when merged label Oct 18, 2022
@codecov
Copy link

codecov bot commented Oct 18, 2022

Codecov Report

Base: 87.88% // Head: 87.93% // Increases project coverage by +0.04% 🎉

Coverage data is based on head (10c3b60) compared to base (c7a71e9).
Patch coverage: 0.00% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1139      +/-   ##
==========================================
+ Coverage   87.88%   87.93%   +0.04%     
==========================================
  Files          73       73              
  Lines        8584     8585       +1     
==========================================
+ Hits         7544     7549       +5     
+ Misses       1040     1036       -4     
Flag Coverage Δ
unittests 87.93% <0.00%> (+0.04%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
dandi/files/zarr.py 85.09% <0.00%> (-0.29%) ⬇️
dandi/_version.py 45.96% <0.00%> (+1.75%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@@ -450,6 +450,7 @@ def mkzarr() -> str:
f.cancel()
executor.shutdown()
client.delete(f"/zarr/{zarr_id}/upload/")
ZARR_UPLOADS_IN_PROGRESS.discard(upload_data)
Copy link
Member

Choose a reason for hiding this comment

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

uff, took me awhile to locate this ZARR_UPLOADS_IN_PROGRESS which is apparently not a local to the function, but bound at module level below at some line 576, uff . With that it is a global structure, it makes sense.

@yarikoptic
Copy link
Member

Thank you! looks good!

@yarikoptic yarikoptic merged commit 26fa719 into master Oct 18, 2022
@yarikoptic yarikoptic deleted the better-cancellation branch October 18, 2022 19:08
@github-actions
Copy link

🚀 PR was released in 0.46.6 🚀

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
patch Increment the patch version when merged released
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants