From 395645e1ce374c8b4f067cc95adb1cf72af6ca0f Mon Sep 17 00:00:00 2001 From: Jianyong Wu Date: Thu, 2 Mar 2023 16:41:46 +0800 Subject: [PATCH 1/2] runtime: hybrid-mode cause error in the latest nydusd When update the nydusd to 2.2, the argument "--hybrid-mode" cause the following error: thread 'main' panicked at 'ArgAction::SetTrue / ArgAction::SetFalse is defaulted' Maybe we should remove it to upgrad nydusd Fixes: #6407 Signed-off-by: Jianyong Wu --- src/runtime/virtcontainers/nydusd.go | 2 +- src/runtime/virtcontainers/nydusd_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/runtime/virtcontainers/nydusd.go b/src/runtime/virtcontainers/nydusd.go index 9a2e1a638b..3c42e4cdeb 100644 --- a/src/runtime/virtcontainers/nydusd.go +++ b/src/runtime/virtcontainers/nydusd.go @@ -157,7 +157,7 @@ func (nd *nydusd) args() ([]string, error) { logLevel = "debug" } args := []string{ - "virtiofs", "--hybrid-mode", + "virtiofs", "--log-level", logLevel, "--apisock", nd.apiSockPath, "--sock", nd.sockPath, diff --git a/src/runtime/virtcontainers/nydusd_test.go b/src/runtime/virtcontainers/nydusd_test.go index 481866ffcc..a8ec6dc9b1 100644 --- a/src/runtime/virtcontainers/nydusd_test.go +++ b/src/runtime/virtcontainers/nydusd_test.go @@ -99,13 +99,13 @@ func TestNydusdArgs(t *testing.T) { apiSockPath: "/var/lib/api.sock", debug: true, } - expected := "virtiofs --hybrid-mode --log-level debug --apisock /var/lib/api.sock --sock /var/lib/vhost-user.sock" + expected := "virtiofs --log-level debug --apisock /var/lib/api.sock --sock /var/lib/vhost-user.sock" args, err := nd.args() assert.NoError(err) assert.Equal(expected, strings.Join(args, " ")) nd.debug = false - expected = "virtiofs --hybrid-mode --log-level info --apisock /var/lib/api.sock --sock /var/lib/vhost-user.sock" + expected = "virtiofs --log-level info --apisock /var/lib/api.sock --sock /var/lib/vhost-user.sock" args, err = nd.args() assert.NoError(err) assert.Equal(expected, strings.Join(args, " ")) From 3443f558a61ae4c79472837c057f551315557fca Mon Sep 17 00:00:00 2001 From: Jianyong Wu Date: Thu, 2 Mar 2023 16:49:51 +0800 Subject: [PATCH 2/2] nydus: upgrad nydus to v2.2.0 Use the latest nydus, we may let nydus work on arm64. Fixes: #6407 Signed-off-by: Jianyong Wu --- versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.yaml b/versions.yaml index 174162b99a..b738594f67 100644 --- a/versions.yaml +++ b/versions.yaml @@ -254,7 +254,7 @@ externals: nydus: description: "Nydus image acceleration service" url: "https://github.com/dragonflyoss/image-service" - version: "v2.1.1" + version: "v2.2.0" nydus-snapshotter: description: "Snapshotter for Nydus image acceleration service"