From ad1563196e29a24ccccaf6ea7a4e02ac7994ecea Mon Sep 17 00:00:00 2001 From: Salvador Fuentes Date: Mon, 7 Oct 2019 16:00:13 -0500 Subject: [PATCH] virtiofsd: Do not use posix lock. We have some issues trying to run `apt upgrade` on a container that uses virtiofsd with `-o posix_lock`. Add virtiofsd `-o no_posix_lock` argument to not use the posix lock. Signed-off-by: Salvador Fuentes --- virtcontainers/qemu.go | 2 +- virtcontainers/qemu_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/virtcontainers/qemu.go b/virtcontainers/qemu.go index 7500c0ae6e..948feba80b 100644 --- a/virtcontainers/qemu.go +++ b/virtcontainers/qemu.go @@ -612,7 +612,7 @@ func (q *qemu) virtiofsdArgs(fd uintptr) []string { fmt.Sprintf("--fd=%v", fd), "-o", "source=" + sourcePath, "-o", "cache=" + q.config.VirtioFSCache, - "--syslog"} + "--syslog", "-o", "no_posix_lock"} if q.config.Debug { args = append(args, "-d") } else { diff --git a/virtcontainers/qemu_test.go b/virtcontainers/qemu_test.go index 7a4a7b6f53..1f0d988b71 100644 --- a/virtcontainers/qemu_test.go +++ b/virtcontainers/qemu_test.go @@ -502,12 +502,12 @@ func TestQemuVirtiofsdArgs(t *testing.T) { kataHostSharedDir = savedKataHostSharedDir }() - result := "--fd=123 -o source=test-share-dir/foo -o cache=none --syslog -d" + result := "--fd=123 -o source=test-share-dir/foo -o cache=none --syslog -o no_posix_lock -d" args := q.virtiofsdArgs(123) assert.Equal(strings.Join(args, " "), result) q.config.Debug = false - result = "--fd=123 -o source=test-share-dir/foo -o cache=none --syslog -f" + result = "--fd=123 -o source=test-share-dir/foo -o cache=none --syslog -o no_posix_lock -f" args = q.virtiofsdArgs(123) assert.Equal(strings.Join(args, " "), result) }