Unwrap network errors (#10934)

Alternative to #10927

Instead of having an upstream fix, do unwrap when checking network errors.

'As' will also work when destination is an interface as checked by the tests.

cmd/rest/client_test.go

@@ -0,0 +1,68 @@
+/*
+ * MinIO Cloud Storage, (C) 2020 MinIO, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package rest
+
+import (
+	"errors"
+	"net"
+	"net/url"
+	"testing"
+)
+
+func TestNetworkError_Unwrap(t *testing.T) {
+	tests := []struct {
+		name   string
+		err    error
+		target interface{}
+		want   bool
+	}{
+		{
+			name:   "url.Error",
+			err:    &url.Error{Op: "PUT", URL: "http://localhost/1234", Err: restError("remote server offline")},
+			target: &url.Error{},
+			want:   true,
+		},
+		{
+			name: "net.Error",
+			err:  &url.Error{Op: "PUT", URL: "http://localhost/1234", Err: restError("remote server offline")},
+			want: true,
+		},
+		{
+			name: "net.Error-unmatched",
+			err:  errors.New("something"),
+			want: false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Wrap error
+			n := &NetworkError{
+				Err: tt.err,
+			}
+			if tt.target == nil {
+				var netErrInterface net.Error
+				if errors.As(n, &netErrInterface) != tt.want {
+					t.Errorf("errors.As(n, &tt.target) != tt.want, n: %#v, target: %#v, want:%v, got: %v", n, tt.target, tt.want, !tt.want)
+				}
+			} else {
+				if errors.As(n, &tt.target) != tt.want {
+					t.Errorf("errors.As(n, &tt.target) != tt.want, n: %#v, target: %#v, want:%v, got: %v", n, tt.target, tt.want, !tt.want)
+				}
+			}
+		})
+	}
+}

pkg/net/url.go

@@ -141,7 +141,7 @@ func ParseURL(s string) (u *URL, err error) {
 }
 
 // IsNetworkOrHostDown - if there was a network error or if the host is down.
-// expectTimeouts indicates that context timeouts are expected and does not
+// expectTimeouts indicates that *context* timeouts are expected and does not
 // indicate a downed host. Other timeouts still returns down.
 func IsNetworkOrHostDown(err error, expectTimeouts bool) bool {
 	if err == nil {
@@ -158,37 +158,37 @@ func IsNetworkOrHostDown(err error, expectTimeouts bool) bool {
 
 	// We need to figure if the error either a timeout
 	// or a non-temporary error.
-	e, ok := err.(net.Error)
+	urlErr := &url.Error{}
-	if ok {
+	if errors.As(err, &urlErr) {
-		if urlErr, ok := e.(*url.Error); ok {
+		switch urlErr.Err.(type) {
-			switch urlErr.Err.(type) {
+		case *net.DNSError, *net.OpError, net.UnknownNetworkError:
-			case *net.DNSError, *net.OpError, net.UnknownNetworkError:
+			return true
-				return true
-			}
 		}
+	}
 
+	var e net.Error
+	if errors.As(err, &e) {
 		if e.Timeout() {
 			return true
 		}
-
 	}
 
-	ok = false
 	// Fallback to other mechanisms.
-	if strings.Contains(err.Error(), "Connection closed by foreign host") {
+	switch {
-		ok = true
+	case strings.Contains(err.Error(), "Connection closed by foreign host"):
-	} else if strings.Contains(err.Error(), "TLS handshake timeout") {
+		return true
+	case strings.Contains(err.Error(), "TLS handshake timeout"):
 		// If error is - tlsHandshakeTimeoutError.
-		ok = true
+		return true
-	} else if strings.Contains(err.Error(), "i/o timeout") {
+	case strings.Contains(err.Error(), "i/o timeout"):
 		// If error is - tcp timeoutError.
-		ok = true
+		return true
-	} else if strings.Contains(err.Error(), "connection timed out") {
+	case strings.Contains(err.Error(), "connection timed out"):
 		// If err is a net.Dial timeout.
-		ok = true
+		return true
-	} else if strings.Contains(strings.ToLower(err.Error()), "503 service unavailable") {
+	case strings.Contains(strings.ToLower(err.Error()), "503 service unavailable"):
 		// Denial errors
-		ok = true
+		return true
 	}
-	return ok
+	return false
 }