MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-19 10:07:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: Ignore logging some tcp routine errors (#5097)

Browse Source
This commit is contained in:
A. Elleuch 2017-11-28 22:51:17 +01:00 committed by Harshavardhana
parent 6923630389
commit 98d07210e7
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/http/listener.go
View File

@ -23,6 +23,7 @@ import (
"io" "io"
"net" "net"
"net/http" "net/http"
"os"
"strings" "strings"
"sync" "sync"
"syscall" "syscall"
@ -89,13 +90,19 @@ type httpListener struct {
errorLogFunc func(error, string, ...interface{}) // function to be called on errors. errorLogFunc func(error, string, ...interface{}) // function to be called on errors.
} }
// ignoreErr returns true if error is due to a network timeout or // isRoutineNetErr returns true if error is due to a network timeout,
// io.EOF and false otherwise // connect reset or io.EOF and false otherwise
func ignoreErr(err error) bool { func isRoutineNetErr(err error) bool {
if nErr, ok := err.(*net.OpError); ok { if nErr, ok := err.(*net.OpError); ok {
// Check if the error is a tcp connection reset
if syscallErr, ok := nErr.Err.(*os.SyscallError); ok {
if errno, ok := syscallErr.Err.(syscall.Errno); ok {
return errno == syscall.ECONNRESET
}
}
// Check if the error is a timeout
return nErr.Timeout() return nErr.Timeout()
} }
return err == io.EOF return err == io.EOF
} }
@ -138,7 +145,7 @@ func (listener *httpListener) start() {
// speed up loading of a web page. Peek may also fail due to network // speed up loading of a web page. Peek may also fail due to network
// saturation on a transport with read timeout set. All other kind of // saturation on a transport with read timeout set. All other kind of
// errors should be logged for further investigation. Thanks @brendanashworth. // errors should be logged for further investigation. Thanks @brendanashworth.
if !ignoreErr(err) { if !isRoutineNetErr(err) {
listener.errorLogFunc(err, listener.errorLogFunc(err,
"Error in reading from new connection %s at server %s", "Error in reading from new connection %s at server %s",
bufconn.RemoteAddr(), bufconn.LocalAddr()) bufconn.RemoteAddr(), bufconn.LocalAddr())
@ -182,7 +189,7 @@ func (listener *httpListener) start() {
// Peek bytes of maximum length of all HTTP methods. // Peek bytes of maximum length of all HTTP methods.
data, err := bufconn.Peek(methodMaxLen) data, err := bufconn.Peek(methodMaxLen)
if err != nil { if err != nil {
if listener.errorLogFunc != nil { if !isRoutineNetErr(err) && listener.errorLogFunc != nil {
listener.errorLogFunc(err, listener.errorLogFunc(err,
"Error in reading from new TLS connection %s at server %s", "Error in reading from new TLS connection %s at server %s",
bufconn.RemoteAddr(), bufconn.LocalAddr()) bufconn.RemoteAddr(), bufconn.LocalAddr())

2
pkg/http/listener_test.go
View File

@ -826,7 +826,7 @@ func TestIgnoreErr(t *testing.T) {
} }
for i, tc := range testCases { for i, tc := range testCases {
if actual := ignoreErr(tc.err); actual != tc.want { if actual := isRoutineNetErr(tc.err); actual != tc.want {
t.Errorf("Test case %d: Expected %v but got %v for %v", i+1, t.Errorf("Test case %d: Expected %v but got %v for %v", i+1,
tc.want, actual, tc.err) tc.want, actual, tc.err)
} }