Merge pull request #66616 from smarterclayton/timeout_error

Automatic merge from submit-queue (batch tested with PRs 66554, 66616, 66695, 66681). 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>. Make the timeout error more specific so users can find it

Merge pull request #66616 from smarterclayton/timeout_error
090cafad · Kubernetes Submit Queue · GitHub · 1dd4f8d8 · 8a2d037b · 090cafad
Unverified Commit 090cafad authored Jul 27, 2018 by Kubernetes Submit Queue Committed by GitHub Jul 27, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

rest.go staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go +1 -1

webhook.go test/e2e/apimachinery/webhook.go +1 -1

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go
+++ b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go
@@ -202,7 +202,7 @@ func finishRequest(timeout time.Duration, fn resultFunc) (result runtime.Object,
 	case p := <-panicCh:
 		panic(p)
 	case <-time.After(timeout):
-		return nil, errors.NewTimeoutError("request did not complete within allowed duration", 0)
+		return nil, errors.NewTimeoutError(fmt.Sprintf("request did not complete within requested timeout %s", timeout), 0)
 	}
 }


--- a/test/e2e/apimachinery/webhook.go
+++ b/test/e2e/apimachinery/webhook.go
@@ -576,7 +576,7 @@ func testWebhook(f *framework.Framework) {
 	pod = hangingPod(f)
 	_, err = client.CoreV1().Pods(f.Namespace.Name).Create(pod)
 	Expect(err).NotTo(BeNil())
-	expectedTimeoutErr := "request did not complete within allowed duration"
+	expectedTimeoutErr := "Timeout: request did not complete within requested timeout 30s"
 	if !strings.Contains(err.Error(), expectedTimeoutErr) {
 		framework.Failf("expect timeout error %q, got %q", expectedTimeoutErr, err.Error())
 	}