Making all operations synchronous

2015-01-21 21:20:57 -08:00
parent 790a78415e
commit de60600608
15 changed files with 117 additions and 527 deletions
--- a/pkg/apiserver/operation.go
+++ b/pkg/apiserver/operation.go
@@ -199,9 +199,8 @@ func (op *Operation) StatusOrResult() (description RESTResult, finished bool) {

 	if op.finished == nil {
 		return RESTResult{Object: &api.Status{
-			Status:  api.StatusWorking,
-			Reason:  api.StatusReasonWorking,
-			Details: &api.StatusDetails{ID: op.ID, Kind: "operation"},
+			Status: api.StatusFailure,
+			Reason: api.StatusReasonTimeout,
 		}}, false
 	}
 	return op.result, true