aarifullin/neoneo-go
1
0
Fork 0
forked from TrueCloudLab/neoneo-go
Code Pull requests Activity

network: don't log transport errors on exit

Browse source 
Fix data race

==================
WARNING: DATA RACE
Read at 0x00c00012cca3 by goroutine 208:
  testing.(*common).logDepth()
      /usr/local/go/src/testing/testing.go:727 +0xa4
  testing.(*common).log()
      /usr/local/go/src/testing/testing.go:720 +0x8f
  testing.(*common).Logf()
      /usr/local/go/src/testing/testing.go:766 +0x21
  testing.(*T).Logf()
      <autogenerated>:1 +0x75
  go.uber.org/zap/zaptest.testingWriter.Write()
      /go/pkg/mod/go.uber.org/zap@v1.10.0/zaptest/logger.go:130 +0x11f
  go.uber.org/zap/zaptest.(*testingWriter).Write()
      <autogenerated>:1 +0xa9
  go.uber.org/zap/zapcore.(*ioCore).Write()
      /go/pkg/mod/go.uber.org/zap@v1.10.0/zapcore/core.go:90 +0x1c3
  go.uber.org/zap/zapcore.(*CheckedEntry).Write()
      /go/pkg/mod/go.uber.org/zap@v1.10.0/zapcore/entry.go:215 +0x1e7
  go.uber.org/zap.(*Logger).Warn()
      /go/pkg/mod/go.uber.org/zap@v1.10.0/logger.go:195 +0x95
  github.com/nspcc-dev/neo-go/pkg/network.(*TCPTransport).Accept()
      /go/src/github.com/nspcc-dev/neo-go/pkg/network/tcp_transport.go:59 +0x8da

Previous write at 0x00c00012cca3 by goroutine 168:
  testing.tRunner.func1()
      /usr/local/go/src/testing/testing.go:1036 +0x467
  testing.tRunner()
      /usr/local/go/src/testing/testing.go:1054 +0x20d

Goroutine 208 (running) created at:
  github.com/nspcc-dev/neo-go/pkg/network.(*Server).Start()
      /go/src/github.com/nspcc-dev/neo-go/pkg/network/server.go:274 +0x391

Goroutine 168 (running) created at:
  testing.(*T).Run()
      /usr/local/go/src/testing/testing.go:1095 +0x537
  testing.runTests.func1()
      /usr/local/go/src/testing/testing.go:1339 +0xa6
  testing.tRunner()
      /usr/local/go/src/testing/testing.go:1050 +0x1eb
  testing.runTests()
      /usr/local/go/src/testing/testing.go:1337 +0x594
  testing.(*M).Run()
      /usr/local/go/src/testing/testing.go:1252 +0x2ff
  main.main()
      _testmain.go:90 +0x223
==================
This commit is contained in:
Roman Khimov 2021-07-07 20:59:01 +03:00
parent 23fb5dd420
commit c2d444ace7
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pkg/network/tcp_transport.go
View file

@ -16,6 +16,7 @@ type TCPTransport struct {
listener net.Listener listener net.Listener
bindAddr string bindAddr string
lock sync.RWMutex lock sync.RWMutex
quit bool
} }
var reClosedNetwork = regexp.MustCompile(".* use of closed network connection") var reClosedNetwork = regexp.MustCompile(".* use of closed network connection")
@ -50,16 +51,24 @@ func (t *TCPTransport) Accept() {
} }
t.lock.Lock() t.lock.Lock()
if t.quit {
t.lock.Unlock()
l.Close()
return
}
t.listener = l t.listener = l
t.lock.Unlock() t.lock.Unlock()
for { for {
conn, err := l.Accept() conn, err := l.Accept()
if err != nil { if err != nil {
t.log.Warn("TCP accept error", zap.Error(err)) t.lock.Lock()
if t.isCloseError(err) { quit := t.quit
t.lock.Unlock()
if t.isCloseError(err) && quit {
break break
} }
t.log.Warn("TCP accept error", zap.Error(err))
continue continue
} }
p := NewTCPPeer(conn, t.server) p := NewTCPPeer(conn, t.server)
@ -83,6 +92,7 @@ func (t *TCPTransport) Close() {
if t.listener != nil { if t.listener != nil {
t.listener.Close() t.listener.Close()
} }
t.quit = true
t.lock.Unlock() t.lock.Unlock()
} }