Merge pull request #60504 from shyamjvs/include-eof-errors-in-retry

Automatic merge from submit-queue (batch tested with PRs 60470, 59149, 56075, 60280, 60504). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Include connection EOF errors also as retryable errors Ref https://github.com/kubernetes/kubernetes/issues/55860#issuecomment-368897475 /cc @wojtek-t - Does this SRTY? ```release-note NONE ```

Merge pull request #60504 from shyamjvs/include-eof-errors-in-retry
a1e58a7f · Kubernetes Submit Queue · GitHub · e2cbda00 · b16a1b5f · a1e58a7f
Unverified Commit a1e58a7f authored Feb 28, 2018 by Kubernetes Submit Queue Committed by GitHub Feb 28, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

util.go test/e2e/framework/util.go +2 -1

BUILD test/utils/BUILD +1 -0

create_resources.go test/utils/create_resources.go +2 -1

No files found.
--- a/test/e2e/framework/util.go
+++ b/test/e2e/framework/util.go
@@ -62,6 +62,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
+	utilnet "k8s.io/apimachinery/pkg/util/net"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -5110,7 +5111,7 @@ func DumpDebugInfo(c clientset.Interface, ns string) {
 // TODO: Get rid of this duplicate function in favour of the one in test/utils.
 func IsRetryableAPIError(err error) bool {
-	return apierrs.IsTimeout(err) || apierrs.IsServerTimeout(err) || apierrs.IsTooManyRequests(err)
+	return apierrs.IsTimeout(err) || apierrs.IsServerTimeout(err) || apierrs.IsTooManyRequests(err) || utilnet.IsProbableEOF(err)
 }
 // DsFromManifest reads a .json/yaml file and returns the daemonset in it.

--- a/test/utils/BUILD
+++ b/test/utils/BUILD
@@ -42,6 +42,7 @@ go_library(
        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/net:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",

--- a/test/utils/create_resources.go
+++ b/test/utils/create_resources.go
@@ -26,6 +26,7 @@ import (
 	"k8s.io/api/core/v1"
 	extensions "k8s.io/api/extensions/v1beta1"
 	apierrs "k8s.io/apimachinery/pkg/api/errors"
+	utilnet "k8s.io/apimachinery/pkg/util/net"
 	"k8s.io/apimachinery/pkg/util/wait"
 	clientset "k8s.io/client-go/kubernetes"
 )
@@ -50,7 +51,7 @@ func RetryWithExponentialBackOff(fn wait.ConditionFunc) error {
 }
 func IsRetryableAPIError(err error) bool {
-	return apierrs.IsTimeout(err) || apierrs.IsServerTimeout(err) || apierrs.IsTooManyRequests(err)
+	return apierrs.IsTimeout(err) || apierrs.IsServerTimeout(err) || apierrs.IsTooManyRequests(err) || utilnet.IsProbableEOF(err)
 }
 func CreatePodWithRetries(c clientset.Interface, namespace string, obj *v1.Pod) error {