diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml index 8a8eaa3d2b1..5214582de3f 100644 --- 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 index e2bc6705352..129a0e6a539 100644 --- 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 index 3abdb555986..ba35f7ef31b 100644 --- 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 index e3691c38400..1f7fd38927b 100644 --- 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 index 5da0af16600..b33f02b6bea 100644 --- 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