github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #16807 from smarterclayton/server_backpressure_on_etcd_down

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-11-05 21:19:30 -08:00
parent 5b4c92fe94 3da15535b6
commit 6b7115067d
8 changed files with 103 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/registry/generic/etcd/etcd.go
View File

@@ -184,10 +184,7 @@ func (e *Etcd) ListPredicate(ctx api.Context, m generic.Matcher, options *api.Li
trace.Step("About to read single object")
err := e.Storage.GetToList(ctx, key, filterFunc, list)
trace.Step("Object extracted")
if err != nil {
return nil, err
}
return list, nil
return list, etcderr.InterpretListError(err, e.EndpointName)
}
// if we cannot extract a key based on the current context, the optimization is skipped
}
@@ -202,10 +199,7 @@ func (e *Etcd) ListPredicate(ctx api.Context, m generic.Matcher, options *api.Li
}
err = e.Storage.List(ctx, e.KeyRootFunc(ctx), version, filterFunc, list)
trace.Step("List extracted")
if err != nil {
return nil, err
}
return list, nil
return list, etcderr.InterpretListError(err, e.EndpointName)
}
// Create inserts a new item according to the unique key from the object.