Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
internal/poll: fix the intermittent build failures with pipe pool
Correlative CL 308089

Fixes #45059

Change-Id: I1ff9fbf64e6620d651f287ba2a28d40f964d78a3
Reviewed-on: https://go-review.googlesource.com/c/go/+/308329
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Trust: Emmanuel Odeke <emmanuel@orijtech.com>
  • Loading branch information
panjf2000 authored and odeke-em committed Apr 10, 2021
1 parent 52bf14e commit 6382ec1
Showing 1 changed file with 24 additions and 14 deletions.
38 changes: 24 additions & 14 deletions src/internal/poll/splice_linux_test.go
Expand Up @@ -6,6 +6,7 @@ package poll_test

import (
"internal/poll"
"internal/syscall/unix"
"runtime"
"syscall"
"testing"
Expand All @@ -16,8 +17,8 @@ import (
func checkPipes(fds []int) bool {
for _, fd := range fds {
// Check if each pipe fd has been closed.
err := syscall.FcntlFlock(uintptr(fd), syscall.F_GETFD, nil)
if err == nil {
_, _, errno := syscall.Syscall(unix.FcntlSyscall, uintptr(fd), syscall.F_GETPIPE_SZ, 0)
if errno == 0 {
return false
}
}
Expand All @@ -37,28 +38,37 @@ func TestSplicePipePool(t *testing.T) {
if err != nil {
t.Skip("failed to create pipe, skip this test")
}
prfd, pwfd := poll.GetPipeFds(p)
fds = append(fds, prfd, pwfd)
_, pwfd := poll.GetPipeFds(p)
fds = append(fds, pwfd)
ps = append(ps, p)
}
for _, p = range ps {
poll.PutPipe(p)
}
ps = nil

var ok bool
// Trigger garbage collection to free the pipes in sync.Pool and check whether or not
// those pipe buffers have been closed as we expected.
for i := 0; i < 5; i++ {
// Exploit the timeout of "go test" as a timer for the subsequent verification.
timeout := 5 * time.Minute
if deadline, ok := t.Deadline(); ok {
timeout = deadline.Sub(time.Now())
timeout -= timeout / 10 // Leave 10% headroom for cleanup.
}
expiredTime := time.NewTimer(timeout)
defer expiredTime.Stop()

// Trigger garbage collection repeatedly, waiting for all pipes in sync.Pool
// to either be deallocated and closed, or to time out.
for {
runtime.GC()
time.Sleep(time.Duration(i*100+10) * time.Millisecond)
if ok = checkPipes(fds); ok {
time.Sleep(10 * time.Millisecond)
if checkPipes(fds) {
break
}
}

if !ok {
t.Fatal("at least one pipe is still open")
select {
case <-expiredTime.C:
t.Fatal("at least one pipe is still open")
default:
}
}
}

Expand Down

0 comments on commit 6382ec1

Please sign in to comment.