chore: change nydus snapshotter work dir

- use /var/lib/containerd/io.containerd.snapshotter.v1.nydus - bump nydusd snapshotter v1.14.0 Signed-off-by: Yadong Ding <ding_yadong@foxmail.com>
dragonflyoss · Sep 16, 2024 · da7956c · da7956c
1 parent 481a63b
commit da7956c
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/api/src/config.rs b/api/src/config.rs
@@ -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
                     }
                 }

diff --git a/docs/containerd-env-setup.md b/docs/containerd-env-setup.md
@@ -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):

diff --git a/docs/nydus-fscache.md b/docs/nydus-fscache.md
@@ -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 \

diff --git a/misc/performance/nydusd_config.json b/misc/performance/nydusd_config.json
@@ -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"
             }
         }
     },

diff --git a/misc/performance/snapshotter_config.toml b/misc/performance/snapshotter_config.toml
@@ -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"

diff --git a/misc/prepare.sh b/misc/prepare.sh
@@ -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
 

diff --git a/misc/takeover/snapshotter_config.toml b/misc/takeover/snapshotter_config.toml
@@ -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"

diff --git a/smoke/tests/tool/container.go b/smoke/tests/tool/container.go
@@ -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
 		}