Merge pull request kubernetes#4263 from smarterclayton/simplify_apise…

…rver Remove layers of indirection between apiinstaller and resthandler
duda · Feb 12, 2015 · 0a2d713 · 0a2d713
2 parents 371349f + e6fdac1
commit 0a2d713
Show file tree

Hide file tree

Showing 31 changed files with 1,121 additions and 939 deletions.
diff --git a/pkg/api/errors/errors.go b/pkg/api/errors/errors.go
@@ -29,6 +29,12 @@ import (
 const (
 	StatusUnprocessableEntity = 422
 	StatusTooManyRequests     = 429
+	// HTTP recommendations are for servers to define 5xx error codes
+	// for scenarios not covered by behavior. In this case, TryAgainLater
+	// is an indication that a transient server error has occured and the
+	// client *should* retry, with an optional Retry-After header to specify
+	// the back off window.
+	StatusTryAgainLater = 504
 )
 
 // StatusError is an error intended for consumption by a REST API server; it can also be
@@ -202,6 +208,17 @@ func NewInternalError(err error) error {
 	}}
 }
 
+// NewTimeoutError returns an error indicating that a timeout occurred before the request
+// could be completed.  Clients may retry, but the operation may still complete.
+func NewTimeoutError(message string) error {
+	return &StatusError{api.Status{
+		Status:  api.StatusFailure,
+		Code:    StatusTryAgainLater,
+		Reason:  api.StatusReasonTimeout,
+		Message: fmt.Sprintf("Timeout: %s", message),
+	}}
+}
+
 // IsNotFound returns true if the specified error was created by NewNotFoundErr.
 func IsNotFound(err error) bool {
 	return reasonForError(err) == api.StatusReasonNotFound

diff --git a/pkg/api/rest/resttest/resttest.go b/pkg/api/rest/resttest/resttest.go
@@ -85,12 +85,12 @@ func (t *Tester) TestCreateResetsUserData(valid runtime.Object) {
 	objectMeta.UID = "bad-uid"
 	objectMeta.CreationTimestamp = now
 
-	channel, err := t.storage.(apiserver.RESTCreater).Create(api.NewDefaultContext(), valid)
+	obj, err := t.storage.(apiserver.RESTCreater).Create(api.NewDefaultContext(), valid)
 	if err != nil {
 		t.Fatalf("Unexpected error: %v", err)
 	}
-	if obj := <-channel; obj.Object == nil {
-		t.Fatalf("Unexpected object from channel: %#v", obj)
+	if obj == nil {
+		t.Fatalf("Unexpected object from result: %#v", obj)
 	}
 	if objectMeta.UID == "bad-uid" || objectMeta.CreationTimestamp == now {
 		t.Errorf("ObjectMeta did not reset basic fields: %#v", objectMeta)
@@ -111,12 +111,12 @@ func (t *Tester) TestCreateHasMetadata(valid runtime.Object) {
 		context = api.NewContext()
 	}
 
-	channel, err := t.storage.(apiserver.RESTCreater).Create(context, valid)
+	obj, err := t.storage.(apiserver.RESTCreater).Create(context, valid)
 	if err != nil {
 		t.Fatalf("Unexpected error: %v", err)
 	}
-	if obj := <-channel; obj.Object == nil {
-		t.Fatalf("Unexpected object from channel: %#v", obj)
+	if obj == nil {
+		t.Fatalf("Unexpected object from result: %#v", obj)
 	}
 	if !api.HasObjectMetaSystemFieldValues(objectMeta) {
 		t.Errorf("storage did not populate object meta field values")
@@ -148,12 +148,8 @@ func (t *Tester) TestCreateGeneratesNameReturnsTryAgain(valid runtime.Object) {
 
 	objectMeta.GenerateName = "test-"
 	t.withStorageError(errors.NewAlreadyExists("kind", "thing"), func() {
-		ch, err := t.storage.(apiserver.RESTCreater).Create(api.NewDefaultContext(), valid)
-		if err != nil {
-			t.Fatalf("Unexpected error: %v", err)
-		}
-		res := <-ch
-		if err := errors.FromObject(res.Object); err == nil || !errors.IsTryAgainLater(err) {
+		_, err := t.storage.(apiserver.RESTCreater).Create(api.NewDefaultContext(), valid)
+		if err == nil || !errors.IsTryAgainLater(err) {
 			t.Fatalf("Unexpected error: %v", err)
 		}
 	})