diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-01-10 14:15:45 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-01-10 14:15:45 +0000 |
| commit | 3f0461acf7cf2da9677c9208da2a2731dc72758e (patch) | |
| tree | 805ade0dc6c9551c9280a686c3ff45ed07d12985 /pkg | |
| parent | d09b1da02d67a8a51f1b41e0a8e9026218ffa20a (diff) | |
| parent | dacd349d6fb4fc7453b1fbf694158fd25496ed42 (diff) | |
Merge release-20191213.0-97-gdacd349 (automated)
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/tcpip/transport/tcp/snd.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/pkg/tcpip/transport/tcp/snd.go b/pkg/tcpip/transport/tcp/snd.go index 79f2d274b..fdff7ed81 100644 --- a/pkg/tcpip/transport/tcp/snd.go +++ b/pkg/tcpip/transport/tcp/snd.go @@ -442,6 +442,13 @@ func (s *sender) retransmitTimerExpired() bool { return true } + // TODO(b/147297758): Band-aid fix, retransmitTimer can fire in some edge cases + // when writeList is empty. Remove this once we have a proper fix for this + // issue. + if s.writeList.Front() == nil { + return true + } + s.ep.stack.Stats().TCP.Timeouts.Increment() s.ep.stats.SendErrors.Timeouts.Increment() |