Filesystem: refactor estargz support #77
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
Prepare for removing stargz filesystem implementation. Since the stargz filesystem implementation is very similar to the nydus filesystem implementation, much of the code can be shared, for example the shared daemon related codes. We are going to merge them together, this PR moves codes, and breaks the current stargz implementation. Signed-off-by: Yan Song <yansong.ys@antfin.com>
Move pkg/filesystem/stargz to pkg/filesystem/fs/stargz. And remove stargz related codes from pkg/filesystem/fs, it's prepare for stargz support in pkg/filesystem/fs package directly. Signed-off-by: Yan Song <yansong.ys@antfin.com>
Add stargz handle logic in filesystem implementation, this commit recovery stargz support. Signed-off-by: Yan Song <yansong.ys@antfin.com>
Codecov Report
@@ Coverage Diff @@
## main #77 +/- ##
==========================================
+ Coverage 28.78% 29.44% +0.66%
==========================================
Files 20 17 -3
Lines 1567 1467 -100
==========================================
- Hits 451 432 -19
+ Misses 1049 971 -78
+ Partials 67 64 -3
Continue to review full report at Codecov.
|
bergwolf
reviewed
Jun 24, 2022
pkg/filesystem/fs/fs.go
Outdated
| // So we only need to read the MaxSuperBlockSize size to include both v5 and v6 superblocks | ||
| const MaxSuperBlockSize = 8 * 1024 | ||
| const RafsV6Magic = 0xE0F5E1E2 | ||
| const ChunkInfoOffset = 1024 + 128 + 24 |
There was a problem hiding this comment.
Fixed, actually, these codes just moved from other place. :)
pkg/filesystem/fs/fs.go
Outdated
| log.G(ctx).Infof("total nydus prepare data layer duration %d", duration.Milliseconds()) | ||
| }() | ||
|
|
||
| if fs.imageMode == OnDemand { |
There was a problem hiding this comment.
Move it to before the duration calculation? No need to calculate duration for preload mode.
There was a problem hiding this comment.
Also it's better to check fs.imageMode == Preload directly.
pkg/filesystem/fs/fs.go
Outdated
| } | ||
| defer readerCloser.Close() | ||
|
|
||
| blobFile, err := os.OpenFile(blobPath, os.O_CREATE|os.O_RDWR, 0755) |
| return errors.Wrap(err, "failed to create blob file") | ||
| } | ||
| defer blobFile.Close() | ||
| _, err = io.Copy(blobFile, readerCloser) |
There was a problem hiding this comment.
remove blob file upon error?
Signed-off-by: Yan Song <yansong.ys@antfin.com>
hsiangkao
approved these changes
Jun 25, 2022
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.
Since the stargz filesystem implementation is very similar
to the nydus filesystem implementation, much of the code
can be shared, for example the shared daemon related codes.
We are going to merge them together, this PR moves codes,
and adjust the code path for stargz support.