[WIP]nydus-image: enhance unpack command to support extracting files to dir #1480
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
adamqqqplay
requested review from
liubogithub
and removed request for
a team
adamqqqplay
force-pushed
the
enhance-unpack
branch
from
573b58b
to
2be1690
Compare
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #1480 +/- ##
==========================================
+ Coverage 62.50% 62.54% +0.03%
==========================================
Files 123 123
Lines 43148 43216 +68
Branches 43148 43216 +68
==========================================
+ Hits 26971 27030 +59
- Misses 14870 14877 +7
- Partials 1307 1309 +2
|
|
I will add unit tests in this PR later. Please wait a moment. |
adamqqqplay
force-pushed
the
enhance-unpack
branch
from
2be1690
to
73b6718
Compare
When --output is specified as a directory, the nydus-image unpack command will return an error, which is not convenient for users. This patch enhances this command in the following 3 aspects: 1. Allow --output to be passed as a directory. In this case, the tar file will be output to this subdirectory. 2. Added --untar flag to support decompressing this tar file into the directory specified by --output. 3. When --output is not specified, the default output is to /dev/stdout Signed-off-by: Qinqi Qu <[email protected]>
adamqqqplay
force-pushed
the
enhance-unpack
branch
from
73b6718
to
3d62276
Compare
imeoer
reviewed
Nov 29, 2023
| .unpack(config) | ||
| .with_context(|| "fail to unpack") | ||
| .with_context(|| format!("failed to unpack image to: {}", output)) |
imeoer
reviewed
Nov 29, 2023
| @@ -32,11 +32,12 @@ pub trait Unpacker { | |||
| fn unpack(&self, config: Arc<ConfigV2>) -> Result<()>; | |||
| } | |||
|
|
|||
| /// A unpacker with the ability to convert bootstrap file and blob file to tar | |||
| /// A unpacker with the ability to convert bootstrap file and blob file to tar or dir. | |||
imeoer
reviewed
Nov 29, 2023
| }) | ||
| } | ||
|
|
||
| fn load_rafs(&self, config: Arc<ConfigV2>) -> Result<RafsSuper> { | ||
| let (rs, _) = RafsSuper::load_from_file(self.bootstrap.as_path(), config, false)?; | ||
| Ok(rs) | ||
| } | ||
|
|
||
| fn get_unpack_path(&self) -> Result<PathBuf> { | ||
| // If output ends with path separator, then it is a dir. |
There was a problem hiding this comment.
We'd better not make the assumption.
ccx1024cc
suggested changes
Dec 13, 2023
| .required(false), | ||
| ) | ||
| .arg( | ||
| Arg::new("untar") |
There was a problem hiding this comment.
A smoke test is required for new option.
Besides update doc please.
There was a problem hiding this comment.
@ccx1024cc Unit testing is complete and now changed to WIP.
adamqqqplay
changed the title
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.
Relevant Issue (if applicable)
N/A
Details
When --output is specified as a directory, the nydus-image unpack command will return an error, which is not convenient for users.
This patch enhances this command in the following 3 aspects:
Types of changes
What types of changes does your PullRequest introduce? Put an
xin all the boxes that apply:Checklist
Go over all the following points, and put an
xin all the boxes that apply.