remote: skip non-cache looking files when estimating remote size #3557
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
efiop
commented
Mar 31, 2020
| @@ -697,17 +697,18 @@ def checksum_to_path_info(self, checksum): | |||
| def list_cache_paths(self, prefix=None, progress_callback=None): | |||
There was a problem hiding this comment.
This is pretty much a walk_files method, but it is not supported in every remote yet, so we are using a legacy implementation for now.
There was a problem hiding this comment.
Using walk_files would've been much more intuitive, esp since walk presumes that it is an iterator, unlike list_cache_paths which could be anything.
efiop
changed the title
|
Oops, I think I forgot to change the places that expect cache paths but get hashes. Looking into it. |
`list_cache_paths()` doesn't ignore paths that don't look like hashes, which makes dvc raise an exception when it tries to convert such paths to hashes. We should use `all()` instead. Discord context: https://discordapp.com/channels/485586884165107732/485596304961962003/694454282719592458
This will allow us to see it from verbose logs coming from users.
efiop
commented
Mar 31, 2020
| @@ -936,13 +935,13 @@ def update(n=1): | |||
| pbar.update(n * total_prefixes) | |||
|
|
|||
| if max_remote_size: | |||
| paths = self._cache_paths_with_max( | |||
| checksums = self._all_with_limit( | |||
There was a problem hiding this comment.
Hm, maybe simply islice()?
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
dvc pushand other commands will fail if they find a file that doesn't look like a cache file in the remote. The issue is that we've started usinglist_cache_pathsfor remote size estimation, which doesn't skip non-cache looking files. We should useall()instead.Discord context: https://discordapp.com/channels/485586884165107732/485596304961962003/694454999492591657
❗ I have followed the Contributing to DVC checklist.
📖 If this PR requires documentation updates, I have created a separate PR (or issue, at least) in dvc.org and linked it here. If the CLI API is changed, I have updated tab completion scripts.
❌ I will check DeepSource, CodeClimate, and other sanity checks below. (We consider them recommendatory and don't expect everything to be addressed. Please fix things that actually improve code or fix bugs.)
Thank you for the contribution - we'll try to review it as soon as possible. 🙏