Hackport "backup: read extended metadata from snapshot"#5099
Merged
MichaelEischer merged 7 commits intorestic:patch-releasefrom Oct 22, 2024
Merged
Conversation
Previously, NodeFromFileInfo used the original file path to create the node, which also meant that extended metadata was read from there instead of within the vss snapshot. This change is a temporary solution for restic 0.17.2 and will be replaced with a clean fix in restic 0.18.0.
When using the VSS FS, then `f.Name()` contained the filename in the snapshot. This caused a double mapping when calling NodeFromFileInfo.
The only user was archiver.fileSaver.
2deb315 to
d79fd11
Compare
d79fd11 to
ee9a5cd
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
What does this PR change? What problem does it solve?
Backport #5097 to the
patch-releasebranch. The main different to that PR is that the commit "fs/vss: properly create node from vss path" is reimplemented using a horrible hack. This is necessary as a clean solution requires the FS interface refactoring from #5021.internal/fscannot importinternal/resticas the latter already imports the former. ThusNodeFromFileInfocannot be easily moved tointernal/fsas in #5097. The call toMapFilenamecould in principle also be integrated intoNodeFromFileInfo, however, this requires more test fixes.The majority of the remaining commits are just cherry-picked from #5097.
P.S. The "hackport" typo is intentional.
Was the change previously discussed in an issue or on the forum?
Related to #5063
Checklist
[ ] I have added documentation for relevant changes (in the manual).changelog/unreleased/that describes the changes for our users (see template).gofmton the code in all commits.