-
-
Notifications
You must be signed in to change notification settings - Fork 361
Suppress FileNotFoundError when deleting keys in the obstore adapter #3140
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
Conversation
Thanks for the PR/fix! This is slightly surprising behaviour to me - I would expect trying to delete a non-existent file to raise an error. But I guess if this is existing behaviour/design across other stores, this is good. To be sure that we're getting consistent behaviour across stores, could you move the test you added to the |
I think a better long-term solution would be for the stores to all raise the same exception when attempting to delete a missing key, and for the caller of the store method to handle that exception specifically in the context of attempting to remove an empty chunk. But this fix also works! |
From the obstore side I don't have total control over that. The upstream s3 implementation does not raise an error: https://docs.rs/object_store/latest/object_store/trait.ObjectStore.html#method.delete_stream |
Yes this seems to be the behaviour across stores:
so I believe it makes sense to do the same for And when thinking about the main purpose of the function (to clear chunks) this behaviour makes sense - it seems the function isn't really about deleting an object, instead it is to make sure that an object doesn't exist in the store.
Good idea, I've moved the test now to Across stores is a bit ambiguous in this context though - there is the zarr adapter stores ( However the issue / bugfix was only for the |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My approval doesn't mean anything really, but I'm submitting it because I ran into this issue and tested your branch locally to confirm that it solved the problem. I also made two code suggestions to apply Kyle's recommendation for convenience.
In developmentseed/obstore#487 I propose deprecating the |
Thanks @maxrjones and @kylebarron for the review - I've now updated the comment and removed the |
@d-v-b Thanks for enabling the merge. I checked the failing test for the def test_sync_timeout() -> None:
duration = 0.02
async def foo() -> None:
await asyncio.sleep(duration)
with pytest.raises(asyncio.TimeoutError):
sync(foo(), timeout=duration / 10) It seems completely unrelated to the changes in the PR, probably a flaky failure? Could you potentially retry it? |
@lukasbindreiter the flaky test theory seems valid! thanks for this contribution. (I accidentally posted this in #3136 (comment)) |
@meeseeksdev backport to 3.0.9 |
…eting keys in the obstore adapter
…he obstore adapter (#3180) Co-authored-by: Lukas Bindreiter <[email protected]>
* Enable tests on 3.0.x branch (#3135) * Changelog for 3.0.9 * Backport PR #3149: Add GroupNotFound error to API docs (#3179) Co-authored-by: David Stansby <[email protected]> * Backport PR #3140: Suppress FileNotFoundError when deleting keys in the obstore adapter (#3180) Co-authored-by: Lukas Bindreiter <[email protected]> * Backport PR #3138: Add with_read_only() convenience method to store (#3181) Co-authored-by: Max Jones <[email protected]> * Create read only copy if needed when opening a store path (#3156) * Create read only copy if needed when opening a store path * Add ValueError to Raises section * Update expected warning * Update src/zarr/storage/_common.py Co-authored-by: Davis Bennett <[email protected]> * Use ANY_ACCESS_MODE * Update src/zarr/storage/_common.py Co-authored-by: David Stansby <[email protected]> * Update src/zarr/storage/_common.py Co-authored-by: David Stansby <[email protected]> * Update changes * Try using get_args on definition * Revert "Try using get_args on definition" This reverts commit 7ad760f. * Add test * Remove warning * Apply suggestion for try; except shortening Co-authored-by: Tom Nicholas <[email protected]> * Improve code coverage --------- Co-authored-by: Davis Bennett <[email protected]> Co-authored-by: David Stansby <[email protected]> Co-authored-by: Tom Nicholas <[email protected]> (cherry picked from commit 5731c6c) * Create read only copy if needed when opening a store path (#3156) (#3182) * Create read only copy if needed when opening a store path * Add ValueError to Raises section * Update expected warning * Update src/zarr/storage/_common.py * Use ANY_ACCESS_MODE * Update src/zarr/storage/_common.py * Update src/zarr/storage/_common.py * Update changes * Try using get_args on definition * Revert "Try using get_args on definition" This reverts commit 7ad760f. * Add test * Remove warning * Apply suggestion for try; except shortening * Improve code coverage --------- (cherry picked from commit 5731c6c) Co-authored-by: Max Jones <[email protected]> Co-authored-by: David Stansby <[email protected]> Co-authored-by: Tom Nicholas <[email protected]> * Remove breaking check about `auto_mkdir` for FSSpecStore (#3193) * Remove breaking check from _make_async * Update expected error * Change import structure to protect against AttributeError * changelog * add test to ensure that we can create a read-only copy of the store with auto_mkdir=False * only test if the async wrapper is available --------- Co-authored-by: Davis Bennett <[email protected]> (cherry picked from commit 5a24487) * Remove breaking check about `auto_mkdir` for FSSpecStore (#3193) (#3203) * Remove breaking check from _make_async * Update expected error * Change import structure to protect against AttributeError * changelog * add test to ensure that we can create a read-only copy of the store with auto_mkdir=False * only test if the async wrapper is available --------- (cherry picked from commit 5a24487) Co-authored-by: Max Jones <[email protected]> * Add missing import for AsyncFileSystemWrapper for `_make_async` in `_fsspec.py` (#3195) * Add missing import for AsyncFileSystemWrapper in `_fsspec.py` * Add missing changelog entry for AsyncFileSystemWrapper import fix * Move AsyncFileSystemWrapper import past the version check in `_fsspec.py` * Add newline after AsyncFileSystemWrapper import in `_fsspec.py` * Simplify import statement for AsyncFileSystemWrapper in `_fsspec.py` --------- Co-authored-by: Altay Sansal <[email protected]> (cherry picked from commit 97aa42f) * Auto backport of pr 3195 on 3.0.10 (#3204) * Remove breaking check about `auto_mkdir` for FSSpecStore (#3193) * Remove breaking check from _make_async * Update expected error * Change import structure to protect against AttributeError * changelog * add test to ensure that we can create a read-only copy of the store with auto_mkdir=False * only test if the async wrapper is available --------- Co-authored-by: Davis Bennett <[email protected]> (cherry picked from commit 5a24487) * Add missing import for AsyncFileSystemWrapper for `_make_async` in `_fsspec.py` (#3195) * Add missing import for AsyncFileSystemWrapper in `_fsspec.py` * Add missing changelog entry for AsyncFileSystemWrapper import fix * Move AsyncFileSystemWrapper import past the version check in `_fsspec.py` * Add newline after AsyncFileSystemWrapper import in `_fsspec.py` * Simplify import statement for AsyncFileSystemWrapper in `_fsspec.py` --------- Co-authored-by: Altay Sansal <[email protected]> (cherry picked from commit 97aa42f) --------- Co-authored-by: Max Jones <[email protected]> Co-authored-by: Altay Sansal <[email protected]> Co-authored-by: Altay Sansal <[email protected]> * 3.0.9 release notes (#3183) * Create read only copy if needed when opening a store path (#3156) * Create read only copy if needed when opening a store path * Add ValueError to Raises section * Update expected warning * Update src/zarr/storage/_common.py Co-authored-by: Davis Bennett <[email protected]> * Use ANY_ACCESS_MODE * Update src/zarr/storage/_common.py Co-authored-by: David Stansby <[email protected]> * Update src/zarr/storage/_common.py Co-authored-by: David Stansby <[email protected]> * Update changes * Try using get_args on definition * Revert "Try using get_args on definition" This reverts commit 7ad760f. * Add test * Remove warning * Apply suggestion for try; except shortening Co-authored-by: Tom Nicholas <[email protected]> * Improve code coverage --------- Co-authored-by: Davis Bennett <[email protected]> Co-authored-by: David Stansby <[email protected]> Co-authored-by: Tom Nicholas <[email protected]> (cherry picked from commit 5731c6c) * release notes --------- Co-authored-by: Max Jones <[email protected]> Co-authored-by: David Stansby <[email protected]> Co-authored-by: Tom Nicholas <[email protected]> * release notes --------- Co-authored-by: Lumberbot (aka Jack) <[email protected]> Co-authored-by: Lukas Bindreiter <[email protected]> Co-authored-by: Max Jones <[email protected]> Co-authored-by: Davis Bennett <[email protected]> Co-authored-by: Tom Nicholas <[email protected]> Co-authored-by: Altay Sansal <[email protected]> Co-authored-by: Altay Sansal <[email protected]>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #3140 +/- ##
=======================================
Coverage 94.47% 94.48%
=======================================
Files 78 78
Lines 8585 8590 +5
=======================================
+ Hits 8111 8116 +5
Misses 474 474
🚀 New features to boost your workflow:
|
Suppress
FileNotFoundError
indelete
operation of the obstore adapter.Since some underlying stores allow this, while others raise an error, supressing the error results in consistent behaviour across all stores. This also mimics how the same thing is implemented in the
fsspec
adapter.Fixes #3136
TODO:
changes/