Feat：Mount by API without makeConfig #1610
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
fappy1234567
requested review from
bergwolf,
adamqqqplay and
hsiangkao
and removed request for
a team
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #1610 +/- ##
==========================================
- Coverage 61.44% 61.38% -0.06%
==========================================
Files 145 146 +1
Lines 48032 48040 +8
Branches 46007 46007
==========================================
- Hits 29512 29490 -22
- Misses 16963 16987 +24
- Partials 1557 1563 +6 |
|
Please add commit |
fappy1234567
force-pushed
the
mount-by-api
branch
3 times, most recently
from
5984d8a
to
2b7539d
Compare
Desiki-high
reviewed
Aug 21, 2024
fappy1234567
force-pushed
the
mount-by-api
branch
11 times, most recently
from
c27f8f6
to
b811523
Compare
imeoer
reviewed
Aug 21, 2024
smoke/Makefile
Outdated
| test: build | ||
| golangci-lint run | ||
| sudo -E ./smoke.test -test.v -test.timeout 10m -test.parallel=16 -test.run=$(TESTS) | ||
| sudo -E ./smoke.test -test.v -test.timeout 10m -test.parallel=16 -test.run=TestNativeLayer |
smoke/tests/api_test.go
Outdated
| ctx.PrepareWorkDir(t) | ||
| defer ctx.Destroy(t) | ||
|
|
||
| rootFs := texture.MakeLowerLayer(t, filepath.Join(ctx.Env.WorkDir, "root-fs")) |
smoke/tests/tool/nydusd.go
Outdated
| f, err := os.Open(config.ConfigPath) | ||
| if err != nil { | ||
| return err | ||
| var tpl *template.Template |
There was a problem hiding this comment.
This is to remove the makeConfig function so that the API can be used directly instead of first writing to a file and then using the API.
smoke/tests/tool/nydusd.go
Outdated
| @@ -365,6 +371,23 @@ func (nydusd *Nydusd) Umount() error { | |||
| return nil | |||
| } | |||
|
|
|||
| func (nydusd *Nydusd) UmountByAPI(point string) error { | |||
| path := point | |||
| // path: /mount1 | |||
smoke/tests/tool/nydusd.go
Outdated
| @@ -365,6 +371,23 @@ func (nydusd *Nydusd) Umount() error { | |||
| return nil | |||
| } | |||
|
|
|||
| func (nydusd *Nydusd) UmountByAPI(point string) error { | |||
smoke/tests/tool/nydusd.go
Outdated
| @@ -365,6 +371,23 @@ func (nydusd *Nydusd) Umount() error { | |||
| return nil | |||
| } | |||
|
|
|||
| func (nydusd *Nydusd) UmountByAPI(point string) error { | |||
| path := point | |||
There was a problem hiding this comment.
Remove useless assignment.
smoke/tests/tool/nydusd.go
Outdated
| nydusd.VerifyByPath(t, expectedFileTree, nydusd.MountPath) | ||
| } | ||
|
|
||
| func (nydusd *Nydusd) VerifyByPath(t *testing.T, expectedFileTree map[string]*File, point string) { |
smoke/tests/tool/nydusd.go
Outdated
| @@ -622,17 +645,20 @@ func (nydusd *Nydusd) GetInflightMetrics() (*InflightMetrics, error) { | |||
| } | |||
|
|
|||
| func (nydusd *Nydusd) Verify(t *testing.T, expectedFileTree map[string]*File) { | |||
| nydusd.VerifyByPath(t, expectedFileTree, nydusd.MountPath) | |||
There was a problem hiding this comment.
Sorry for the misunderstand, we should call nydusd.VerifyByPath(t, expectedFileTree, "") here.
smoke/tests/tool/nydusd.go
Outdated
| nydusd.VerifyByPath(t, expectedFileTree, nydusd.MountPath) | ||
| } | ||
|
|
||
| func (nydusd *Nydusd) VerifyByPath(t *testing.T, expectedFileTree map[string]*File, point string) { | ||
| actualFiles := map[string]*File{} | ||
| err := filepath.WalkDir(nydusd.MountPath, func(path string, _ fs.DirEntry, err error) error { |
There was a problem hiding this comment.
nydusd.MountPath ->
mountPath := filepath.Join(nydusd.MountPath, subPath)
fappy1234567
force-pushed
the
mount-by-api
branch
2 times, most recently
from
ec35c6b
to
90feab4
Compare
fappy1234567
changed the title
imeoer
reviewed
Aug 28, 2024
imeoer
reviewed
Aug 28, 2024
smoke/tests/tool/nydusd.go
Outdated
| if targetPath == "." || targetPath == ".." { | ||
| pointMdr := strings.TrimPrefix(subPath, "/") | ||
| targetPath = strings.TrimPrefix(targetPath, pointMdr+"/") | ||
| if targetPath == "." || targetPath == ".." || targetPath == pointMdr { |
There was a problem hiding this comment.
Why need to check targetPath == pointMdr?
imeoer
reviewed
Aug 28, 2024
smoke/tests/tool/nydusd.go
Outdated
| switch tplType { | ||
| case NydusdConfigTpl: | ||
| tpl = template.Must(template.New("").Parse(configTpl)) | ||
| case NydusdOvlConfigTpl: |
There was a problem hiding this comment.
But the case path is not used.
fappy1234567
force-pushed
the
mount-by-api
branch
from
90feab4
to
eef495b
Compare
fappy1234567
force-pushed
the
mount-by-api
branch
5 times, most recently
from
b043cfc
to
6135f08
Compare
Signed-off-by: fappy1234567 <[email protected]>
fappy1234567
force-pushed
the
mount-by-api
branch
from
6135f08
to
6043273
Compare
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.
Details
Implement mounting through mountByAPI to evaluate its effectiveness
Omit the use of makeConfig