dvc: refactor cache saving #5314
Merged
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
added
refactoring
efiop
force-pushed
the
fix-5255
branch
8 times, most recently
from
a0bb3bb to
bb62098
Compare
efiop
commented
Jan 22, 2021
| shared = tree.config.get("shared") | ||
| if shared: | ||
| self._file_mode = 0o664 | ||
| self._dir_mode = 0o2775 |
There was a problem hiding this comment.
Same as git, using S_ISGID sticky bit, this is a more proper way to handle shared cache scenario.
efiop
commented
Jan 22, 2021
| self._dir_mode = 0o2775 | ||
| else: | ||
| self._file_mode = 0o666 & ~umask | ||
| self._dir_mode = 0o777 & ~umask |
There was a problem hiding this comment.
Previously we've used hardcoded modes, which was not right. Now properly using umask, same as git.
efiop
commented
Jan 22, 2021
Comment on lines
+461
to
+470
| if self.tree.scheme == "local": | ||
| with self.tree.state: | ||
| for checksum in named_cache.scheme_keys("local"): | ||
| cache_file = self.tree.hash_to_path_info(checksum) | ||
| if self.tree.exists(cache_file): | ||
| hash_info = HashInfo( | ||
| self.tree.PARAM_CHECKSUM, checksum | ||
| ) | ||
| self.tree.state.save(cache_file, hash_info) | ||
| self.cache.protect(cache_file) |
There was a problem hiding this comment.
Same as "trust" logic in pull. This really emphasizes that push and pull are the same thing: transering objects from one cache to another, so the receiving cache should be able to save objects as it pleases. This and the "trust" logic below will move to cache.save() in the future.
efiop
commented
Jan 22, 2021
| tmp = tempfile.NamedTemporaryFile(delete=False, dir=path.parent).name | ||
| assert os.path.exists(path.parent) | ||
| assert os.path.isdir(path.parent) | ||
| dump_yaml(tmp, cache) | ||
| self.tree.move(PathInfo(tmp), path) | ||
| self.repo.cache.local.move(PathInfo(tmp), path) |
There was a problem hiding this comment.
Logic related to saving stage cache object, should really be in the cache itself.
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.
Moving cache-related modes from the tree to the cache itself. On our way to unify transfer/push/pull/save functionality into one, so that we could use them in the 3.0 cache format.
Pre-requisite for #5255
❗ 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.
Thank you for the contribution - we'll try to review it as soon as possible. 🙏