Commit 862785f0 authored by Kirill Smelkov's avatar Kirill Smelkov

Merge branch 'master' into y/nodefs-cancel

* master:
  nodefs: Skip TestNodeParallelLookup on kernels that don't have CAP_PARALLEL_DIROPS
  Travis CI: Exercise tests both GOMAXPROCS=`nproc` and GOMAXPROCS=1
  Travis CI += Go 1.14, Go1.15
parents 8c439061 3a8e4783
...@@ -11,8 +11,15 @@ go: ...@@ -11,8 +11,15 @@ go:
- 1.11.x - 1.11.x
- 1.12.x - 1.12.x
- 1.13.x - 1.13.x
- 1.14.x
- 1.15.x
- master - master
env:
- GOMAXPROCS=1
# vvv = native `nproc`
- GOMAXPROCS=
matrix: matrix:
fast_finish: true fast_finish: true
allow_failures: allow_failures:
......
...@@ -98,6 +98,11 @@ func TestNodeParallelLookup(t *testing.T) { ...@@ -98,6 +98,11 @@ func TestNodeParallelLookup(t *testing.T) {
} }
}() }()
// the test will deadlock if the client cannot issue several lookups simultaneously
if srv.KernelSettings().Flags & fuse.CAP_PARALLEL_DIROPS == 0 {
t.Skip("Kernel serializes dir lookups")
}
// spawn 2 threads to access the files in parallel // spawn 2 threads to access the files in parallel
// this will deadlock if nodefs does not allow simultaneous Lookups to be handled. // this will deadlock if nodefs does not allow simultaneous Lookups to be handled.
// see https://github.com/hanwen/go-fuse/commit/d0fca860 for context. // see https://github.com/hanwen/go-fuse/commit/d0fca860 for context.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment