Quiet down TCP RST packet error on read operation
This commit is contained in:
parent
ab8d7d2e78
commit
89dc466b23
3 changed files with 58 additions and 2 deletions
|
@ -1,9 +1,11 @@
|
||||||
package tcp
|
package tcp
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"io"
|
"io"
|
||||||
"net"
|
"net"
|
||||||
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/pires/go-proxyproto"
|
"github.com/pires/go-proxyproto"
|
||||||
|
@ -74,7 +76,14 @@ func (p *Proxy) ServeTCP(conn WriteCloser) {
|
||||||
|
|
||||||
err = <-errChan
|
err = <-errChan
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.WithoutContext().Errorf("Error during connection: %v", err)
|
// Treat connection reset error during a read operation with a lower log level.
|
||||||
|
// This allows to not report an RST packet sent by the peer as an error,
|
||||||
|
// as it is an abrupt but possible end for the TCP session
|
||||||
|
if isReadConnResetError(err) {
|
||||||
|
log.WithoutContext().Debugf("Error during connection: %v", err)
|
||||||
|
} else {
|
||||||
|
log.WithoutContext().Errorf("Error during connection: %v", err)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
<-errChan
|
<-errChan
|
||||||
|
@ -101,9 +110,18 @@ func (p Proxy) connCopy(dst, src WriteCloser, errCh chan error) {
|
||||||
_, err := io.Copy(dst, src)
|
_, err := io.Copy(dst, src)
|
||||||
errCh <- err
|
errCh <- err
|
||||||
|
|
||||||
|
// Ends the connection with the dst connection peer.
|
||||||
|
// It corresponds to sending a FIN packet to gracefully end the TCP session.
|
||||||
errClose := dst.CloseWrite()
|
errClose := dst.CloseWrite()
|
||||||
if errClose != nil {
|
if errClose != nil {
|
||||||
log.WithoutContext().Debugf("Error while terminating connection: %v", errClose)
|
// Calling CloseWrite() on a connection which have a socket which is "not connected" is expected to fail.
|
||||||
|
// It happens notably when the dst connection has ended receiving an RST packet from the peer (within the other connCopy call).
|
||||||
|
// In that case, logging the error is superfluous,
|
||||||
|
// as in the first place we should not have needed to call CloseWrite.
|
||||||
|
if !isSocketNotConnectedError(errClose) {
|
||||||
|
log.WithoutContext().Debugf("Error while terminating connection: %v", errClose)
|
||||||
|
}
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -114,3 +132,9 @@ func (p Proxy) connCopy(dst, src WriteCloser, errCh chan error) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// isSocketNotConnectedError reports whether err is a socket not connected error.
|
||||||
|
func isSocketNotConnectedError(err error) bool {
|
||||||
|
var oerr *net.OpError
|
||||||
|
return errors.As(err, &oerr) && errors.Is(err, syscall.ENOTCONN)
|
||||||
|
}
|
||||||
|
|
16
pkg/tcp/proxy_unix.go
Normal file
16
pkg/tcp/proxy_unix.go
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
//go:build !windows
|
||||||
|
// +build !windows
|
||||||
|
|
||||||
|
package tcp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"net"
|
||||||
|
"syscall"
|
||||||
|
)
|
||||||
|
|
||||||
|
// isReadConnResetError reports whether err is a connection reset error during a read operation.
|
||||||
|
func isReadConnResetError(err error) bool {
|
||||||
|
var oerr *net.OpError
|
||||||
|
return errors.As(err, &oerr) && oerr.Op == "read" && errors.Is(err, syscall.ECONNRESET)
|
||||||
|
}
|
16
pkg/tcp/proxy_windows.go
Normal file
16
pkg/tcp/proxy_windows.go
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
//go:build windows
|
||||||
|
// +build windows
|
||||||
|
|
||||||
|
package tcp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"net"
|
||||||
|
"syscall"
|
||||||
|
)
|
||||||
|
|
||||||
|
// isReadConnResetError reports whether err is a connection reset error during a read operation.
|
||||||
|
func isReadConnResetError(err error) bool {
|
||||||
|
var oerr *net.OpError
|
||||||
|
return errors.As(err, &oerr) && oerr.Op == "read" && errors.Is(err, syscall.WSAECONNRESET)
|
||||||
|
}
|
Loading…
Reference in a new issue