github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-29 16:57:18 +00:00
Code Issues Projects Releases Wiki Activity

virtiofsd: Do not use posix lock.

Browse Source 
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 <salvador.fuentes@intel.com>
This commit is contained in:
Salvador Fuentes 2019-10-07 16:00:13 -05:00
parent 23a5dc7ff8
commit ad1563196e
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
virtcontainers/qemu.go
View File

@ -612,7 +612,7 @@ func (q *qemu) virtiofsdArgs(fd uintptr) []string {
fmt.Sprintf("--fd=%v", fd), fmt.Sprintf("--fd=%v", fd),
"-o", "source=" + sourcePath, "-o", "source=" + sourcePath,
"-o", "cache=" + q.config.VirtioFSCache, "-o", "cache=" + q.config.VirtioFSCache,
"--syslog"} "--syslog", "-o", "no_posix_lock"}
if q.config.Debug { if q.config.Debug {
args = append(args, "-d") args = append(args, "-d")
} else { } else {

4
virtcontainers/qemu_test.go
View File

@ -502,12 +502,12 @@ func TestQemuVirtiofsdArgs(t *testing.T) {
kataHostSharedDir = savedKataHostSharedDir 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) args := q.virtiofsdArgs(123)
assert.Equal(strings.Join(args, " "), result) assert.Equal(strings.Join(args, " "), result)
q.config.Debug = false 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) args = q.virtiofsdArgs(123)
assert.Equal(strings.Join(args, " "), result) assert.Equal(strings.Join(args, " "), result)
} }