chore: upgrade nerdctl and cni version in test env

Try to fix errror in TestCommit "failed to create shim task: OCI runtime create failed: runc create failed: unable to start container process: error during container init: error running hook #0: error running hook: exit status 1, stdout: , stderr: time=\"2024-06-03T03:13:32Z\" level=fatal msg=\"failed to call cni. Setup: plugin type=\\\"firewall\\\" failed (add): running [/usr/sbin/iptables -t filter -N CNI-ISOLATION-STAGE-1 --wait]: exit status 4: iptables v1.8.7 (nf_tables): CHAIN_USER_ADD failed (File exists): chain CNI-ISOLATION-STAGE-1\\n\"\nFailed to write to log, write /var/lib/nerdctl/1935db59/containers/default/b66e8c33fdff0da78ceeb34fa2d0aa061961e68260fb13ec8c1210576e94eca1/oci-hook.createRuntime.log: file already closed: unknown" Signed-off-by: Yadong Ding <ding_yadong@foxmail.com>
dragonflyoss · Jun 5, 2024 · 5326130 · 5326130
1 parent 34ab06b
commit 5326130
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
@@ -166,7 +166,7 @@ jobs:
         sudo install -D -m 755 contrib/nydusify/cmd/nydusify /usr/bin/nydus-latest
         sudo install -D -m 755 target/release/nydusd target/release/nydus-image /usr/bin/nydus-latest
         sudo bash misc/prepare.sh
-        
+
         export NYDUS_STABLE_VERSION=$(curl https://api.github.com/repos/Dragonflyoss/nydus/releases/latest | jq -r '.tag_name')
         export NYDUS_STABLE_VERSION_EXPORT="${NYDUS_STABLE_VERSION//./_}"
 

diff --git a/misc/performance/containerd_config.toml b/misc/performance/containerd_config.toml
@@ -6,10 +6,10 @@ oom_score = 0
 [debug]
   level = "debug"
 
-[plugins."io.containerd.grpc.v1.cri"]
-  [plugins."io.containerd.grpc.v1.cri".containerd]
-      snapshotter = "nydus"
-      disable_snapshot_annotations = false
+[plugins."io.containerd.grpc.v1.cri".containerd]
+  snapshotter = "nydus"
+  disable_snapshot_annotations = false
+  discard_unpacked_layers = false
 
 [proxy_plugins]
   [proxy_plugins.nydus]

diff --git a/misc/performance/nydus-snapshotter.service b/misc/performance/nydus-snapshotter.service
@@ -6,7 +6,7 @@ Before=containerd.service
 [Service]
 Type=simple
 Environment=HOME=/root
-ExecStart=/usr/local/bin/containerd-nydus-grpc --config /etc/nydus/config.toml
+ExecStart=/usr/local/bin/containerd-nydus-grpc --config-path /etc/nydus/config.json
 Restart=always
 RestartSec=1
 KillMode=process

diff --git a/misc/performance/nydusd_config.json b/misc/performance/nydusd_config.json
@@ -4,7 +4,11 @@
             "type": "registry",
             "config": {
                 "scheme": "http",
-                "host": "localhost:5000"
+                "host": "localhost:5077",
+                "skip_verify": true,
+                "timeout": 5,
+                "connect_timeout": 5,
+                "retry_limit": 4
             }
         },
         "cache": {

diff --git a/misc/prepare.sh b/misc/prepare.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-SNAPSHOTTER_CONFIG="misc/takeover/snapshotter_config.toml"
+SNAPSHOTTER_CONFIG="misc/performance/snapshotter_config.toml"
 if [ "$1" == "takeover_test" ]; then
     SNAPSHOTTER_CONFIG="misc/takeover/snapshotter_config.toml"
 fi
 
-readonly SNAPSHOTTER_VERSION=0.13.3
-readonly NERDCTL_VERSION=1.7.0
-readonly CNI_PLUGINS_VERSION=1.3.0
+readonly SNAPSHOTTER_VERSION=0.13.13
+readonly NERDCTL_VERSION=1.7.6
+readonly CNI_PLUGINS_VERSION=1.5.0
 
 # setup nerdctl and nydusd env
 sudo install -D -m 755 contrib/nydusify/cmd/nydusify /usr/local/bin