-
Notifications
You must be signed in to change notification settings - Fork 206
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
With help of newly introduced Overlay FileSystem in `fuse-backend-rs` library, now we can create writable rootfs in Nydus. Implementation of writable rootfs is based on one passthrough FS(as upper layer) over one readonly rafs(as lower layer). To do so, configuration is extended with some Overlay options. Signed-off-by: Wei Zhang <[email protected]>
- Loading branch information
1 parent
a0ec880
commit 0f43960
Showing
12 changed files
with
321 additions
and
21 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| // Copyright 2023 Nydus Developers. All rights reserved. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| package tests | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os" | ||
| "path/filepath" | ||
| "testing" | ||
|
|
||
| "github.com/containerd/log" | ||
| "github.com/containerd/nydus-snapshotter/pkg/converter" | ||
| "github.com/dragonflyoss/nydus/smoke/tests/texture" | ||
| "github.com/dragonflyoss/nydus/smoke/tests/tool" | ||
| "github.com/dragonflyoss/nydus/smoke/tests/tool/test" | ||
| "github.com/opencontainers/go-digest" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
| type OverlayFsTestSuite struct { | ||
| t *testing.T | ||
| } | ||
|
|
||
| func (ovl_ts *OverlayFsTestSuite) prepareTestEnv(t *testing.T) *tool.Context { | ||
| ctx := tool.DefaultContext(t) | ||
| ctx.PrepareWorkDir(t) | ||
|
|
||
| packOption := converter.PackOption{ | ||
| BuilderPath: ctx.Binary.Builder, | ||
| Compressor: ctx.Build.Compressor, | ||
| FsVersion: ctx.Build.FSVersion, | ||
| ChunkSize: ctx.Build.ChunkSize, | ||
| } | ||
|
|
||
| lowerLayer := texture.MakeLowerLayer(t, filepath.Join(ctx.Env.WorkDir, "lower")) | ||
| lowerBlobDigest := lowerLayer.Pack(t, packOption, ctx.Env.BlobDir) | ||
| mergeOption := converter.MergeOption{ | ||
| BuilderPath: ctx.Binary.Builder, | ||
| ChunkDictPath: "", | ||
| OCIRef: true, | ||
| } | ||
| actualDigests, lowerBootstrap := tool.MergeLayers(t, *ctx, mergeOption, []converter.Layer{ | ||
| { | ||
| Digest: lowerBlobDigest, | ||
| }, | ||
| }) | ||
| require.Equal(t, []digest.Digest{lowerBlobDigest}, actualDigests) | ||
|
|
||
| // Verify lower layer mounted by nydusd | ||
| ctx.Env.BootstrapPath = lowerBootstrap | ||
| tool.Verify(t, *ctx, lowerLayer.FileTree) | ||
| return ctx | ||
| } | ||
|
|
||
| func (ovl_ts *OverlayFsTestSuite) TestSimpleOverlayFs(t *testing.T) { | ||
| ctx := ovl_ts.prepareTestEnv(t) | ||
| fmt.Printf("Workdir is %v\n", ctx.Env.WorkDir) | ||
| //defer ctx.Destroy(t) | ||
|
|
||
| nydusd, err := tool.NewNydusdWithOverlay(tool.NydusdConfig{ | ||
| NydusdPath: ctx.Binary.Nydusd, | ||
| BootstrapPath: ctx.Env.BootstrapPath, | ||
| ConfigPath: filepath.Join(ctx.Env.WorkDir, "nydusd-config.fusedev.json"), | ||
| MountPath: ctx.Env.MountDir, | ||
| APISockPath: filepath.Join(ctx.Env.WorkDir, "nydusd-api.sock"), | ||
| BackendType: "localfs", | ||
| BackendConfig: fmt.Sprintf(`{"dir": "%s"}`, ctx.Env.BlobDir), | ||
| EnablePrefetch: ctx.Runtime.EnablePrefetch, | ||
| BlobCacheDir: ctx.Env.CacheDir, | ||
| CacheType: ctx.Runtime.CacheType, | ||
| CacheCompressed: ctx.Runtime.CacheCompressed, | ||
| RafsMode: ctx.Runtime.RafsMode, | ||
| OvlUpperDir: ctx.Env.OvlUpperDir, | ||
| OvlWorkDir: ctx.Env.OvlWorkDir, | ||
| DigestValidate: false, | ||
| Writable: true, | ||
| }) | ||
| require.NoError(t, err) | ||
|
|
||
| err = nydusd.Mount() | ||
| require.NoError(t, err) | ||
| defer func() { | ||
| if err := nydusd.Umount(); err != nil { | ||
| log.L.WithError(err).Errorf("umount") | ||
| } | ||
| }() | ||
|
|
||
| // Write some file under mounted dir. | ||
| mountedDir := ctx.Env.MountDir | ||
| file := filepath.Join(mountedDir, "test.txt") | ||
| err = os.WriteFile(file, []byte("hello world"), 0644) | ||
| require.NoError(t, err) | ||
|
|
||
| // Read it back | ||
| data, err := os.ReadFile(file) | ||
| require.NoError(t, err) | ||
| require.Equal(t, "hello world", string(data)) | ||
|
|
||
| // Try to read from upper dir. | ||
| upperFile := filepath.Join(ctx.Env.OvlUpperDir, "test.txt") | ||
| data, err = os.ReadFile(upperFile) | ||
| require.NoError(t, err) | ||
| require.Equal(t, "hello world", string(data)) | ||
| } | ||
|
|
||
| func TestOverlayFs(t *testing.T) { | ||
| test.Run(t, &OverlayFsTestSuite{t: t}) | ||
| } |
Oops, something went wrong.