Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

converter: add feature detection for --batch-size #489

Merged
merged 1 commit into from
Jun 7, 2023

Conversation

hangvane
Copy link
Contributor

@hangvane hangvane commented May 31, 2023

  1. Change the way to detect features by checking help message of nydus-image create -h.
  2. Add feature detection for --batch-size to keep compatibility with old versions of nydus-image.

For old versions of nydus-image:

runner@nyd:~/work/image-service/image-service$ sudo contrib/nydusify/cmd/nydusify convert --source dockerhub.kubekey.local/nydus/node:19-alpine --target dockerhub.kubekey.local/nydus/node:19-alpine-nydus-batch-1M --target-insecure --source-insecure --batch-size 0x100000 log-level trace
INFO[2023-06-06T12:43:00+08:00] pulling image dockerhub.kubekey.local/nydus/node:19-alpine  module=converter
INFO[2023-06-06T12:43:04+08:00] pulled image dockerhub.kubekey.local/nydus/node:19-alpine, elapse 3.254672243s  module=converter
INFO[2023-06-06T12:43:04+08:00] converting image dockerhub.kubekey.local/nydus/node:19-alpine  module=converter
WARN[2023-06-06T12:43:04+08:00] the feature '--type tar-rafs' is ignored, it requires higher version of nydus-image 
WARN[2023-06-06T12:43:04+08:00] the feature '--batch-size' is ignored, it requires higher version of nydus-image 
INFO[2023-06-06T12:43:06+08:00] converted image dockerhub.kubekey.local/nydus/node:19-alpine-nydus-batch-1M, elapse 2.330174644s  module=converter
INFO[2023-06-06T12:43:06+08:00] pushing image dockerhub.kubekey.local/nydus/node:19-alpine-nydus-batch-1M  module=converter
INFO[2023-06-06T12:43:06+08:00] pushed image dockerhub.kubekey.local/nydus/node:19-alpine-nydus-batch-1M, elapse 129.367187ms  module=converter
runner@nyd:~/work/image-service/image-service$ nydus-image --version
Version:        v2.1.6-5-g3454dc04
Git Commit:     3454dc04d5044c1bdee45d8259b391d4e4f0f6a2
Build Time:     2023-06-06T04:41:09.784423847Z
Profile:        release
Rustc:          rustc 1.61.0 (fe5b13d68 2022-05-18)

This PR is related to #482

@codecov
Copy link

codecov bot commented May 31, 2023

Codecov Report

Merging #489 (536b5c8) into main (8fc731a) will increase coverage by 0.47%.
The diff coverage is 87.30%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main     #489      +/-   ##
==========================================
+ Coverage   37.31%   37.78%   +0.47%     
==========================================
  Files          59       59              
  Lines        6960     6979      +19     
==========================================
+ Hits         2597     2637      +40     
+ Misses       4052     4031      -21     
  Partials      311      311              
Impacted Files Coverage Δ
pkg/converter/tool/builder.go 0.00% <0.00%> (ø)
pkg/converter/tool/feature.go 89.85% <88.70%> (+45.85%) ⬆️

pkg/converter/convert_unix.go Outdated Show resolved Hide resolved
pkg/converter/tool/feature.go Show resolved Hide resolved
pkg/converter/tool/feature.go Outdated Show resolved Hide resolved
pkg/converter/tool/feature_test.go Outdated Show resolved Hide resolved
pkg/converter/tool/feature.go Outdated Show resolved Hide resolved
@hangvane hangvane force-pushed the feature-detection branch 4 times, most recently from eff5e6e to 93b5b40 Compare June 6, 2023 04:51
@hangvane hangvane requested a review from imeoer June 6, 2023 04:52
@hangvane hangvane force-pushed the feature-detection branch 3 times, most recently from 16a70c0 to b949e03 Compare June 6, 2023 05:21
pkg/converter/tool/feature.go Outdated Show resolved Hide resolved
pkg/converter/tool/feature.go Outdated Show resolved Hide resolved
pkg/converter/tool/feature_test.go Show resolved Hide resolved
…#482

1. detect features by checking `nydus-image create -h`.
2. Add feature detection for `--batch-size`.

Signed-off-by: Wenhao Ren <wenhaoren@mail.dlut.edu.cn>
Copy link
Collaborator

@imeoer imeoer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks.

@imeoer imeoer merged commit 0c19b54 into containerd:main Jun 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants