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

chore: change nydus snapshotter work dir #1622

Merged
merged 1 commit into from
Sep 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2127,7 +2127,7 @@ mod tests {
"type": "blobcache",
"compressed": true,
"config": {
"work_dir": "/var/lib/containerd-nydus/cache",
"work_dir": "/var/lib/containerd/io.containerd.snapshotter.v1.nydus/cache",
"disable_indexed_map": false
}
}
Expand Down
2 changes: 1 addition & 1 deletion docs/containerd-env-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ Please refer to the nydusd [doc](./nydusd.md) to learn more options.
Make sure the default nydus snapshotter root directory is clear.

```
sudo rm -rf /var/lib/containerd-nydus
sudo rm -rf /var/lib/containerd/io.containerd.snapshotter.v1.nydus
```

3. Start `containerd-nydus-grpc` (nydus snapshotter):
Expand Down
2 changes: 1 addition & 1 deletion docs/nydus-fscache.md
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ make

```
# make sure the directory exists.
mkdir -p /var/lib/containerd-nydus
mkdir -p /var/lib/containerd/io.containerd.snapshotter.v1.nydus

./bin/containerd-nydus-grpc \
--nydusd-config /etc/nydus/nydusd-config.fscache.json \
Expand Down
2 changes: 1 addition & 1 deletion misc/performance/nydusd_config.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"cache": {
"type": "blobcache",
"config": {
"work_dir": "/var/lib/containerd-nydus/cache"
"work_dir": "/var/lib/containerd/io.containerd.snapshotter.v1.nydus/cache"
}
}
},
Expand Down
2 changes: 1 addition & 1 deletion misc/performance/snapshotter_config.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version = 1
# Snapshotter's own home directory where it stores and creates necessary resources
root = "/var/lib/containerd-nydus"
root = "/var/lib/containerd/io.containerd.snapshotter.v1.nydus"
# The snapshotter's GRPC server socket, containerd will connect to plugin on this socket
address = "/run/containerd-nydus/containerd-nydus-grpc.sock"
daemon_mode = "dedicated"
Expand Down
2 changes: 1 addition & 1 deletion misc/prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if [ "$1" == "takeover_test" ]; then
SNAPSHOTTER_CONFIG="misc/takeover/snapshotter_config.toml"
fi

readonly SNAPSHOTTER_VERSION=0.13.13
readonly SNAPSHOTTER_VERSION=0.14.0
readonly NERDCTL_VERSION=1.7.6
readonly CNI_PLUGINS_VERSION=1.5.0

Expand Down
2 changes: 1 addition & 1 deletion misc/takeover/snapshotter_config.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version = 1
# Snapshotter's own home directory where it stores and creates necessary resources
root = "/var/lib/containerd-nydus"
root = "/var/lib/containerd/io.containerd.snapshotter.v1.nydus"
# The snapshotter's GRPC server socket, containerd will connect to plugin on this socket
address = "/run/containerd-nydus/containerd-nydus-grpc.sock"
daemon_mode = "dedicated"
Expand Down
4 changes: 2 additions & 2 deletions smoke/tests/tool/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -256,11 +256,11 @@ func getContainerBackendMetrics(t *testing.T) (*ContainerMetrics, error) {
return &info, nil
}

// searchAPISockPath search sock filepath in nydusd work dir, default in "/var/lib/containerd-nydus/socket"
// searchAPISockPath search sock filepath in nydusd work dir, default in "/var/lib/containerd/io.containerd.snapshotter.v1.nydus/socket"
func searchAPISockPath(t *testing.T) string {
var apiSockPath string

err := filepath.Walk("/var/lib/containerd-nydus/socket", func(path string, info os.FileInfo, err error) error {
err := filepath.Walk("/var/lib/containerd/io.containerd.snapshotter.v1.nydus/socket", func(path string, info os.FileInfo, err error) error {
if err != nil {
return err
}
Expand Down
Loading