github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 18:00:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #25068 from hongchaodeng/fix

Browse Source 
Automatic merge from submit-queue

etcd3/store: userUpdate error should be returned

Minor fix.
The userUpdate error should be returned.
This commit is contained in:
k8s-merge-robot 2016-05-04 03:07:01 -07:00
commit 72c7dd4b95
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/storage/etcd3/store.go
View File

@ -375,6 +375,9 @@ func (s *store) getState(getResp *clientv3.GetResponse, key string, v reflect.Va
func (s *store) updateState(st *objState, userUpdate storage.UpdateFunc) (runtime.Object, uint64, error) { func (s *store) updateState(st *objState, userUpdate storage.UpdateFunc) (runtime.Object, uint64, error) {
ret, ttlPtr, err := userUpdate(st.obj, *st.meta) ret, ttlPtr, err := userUpdate(st.obj, *st.meta)
if err != nil {
return nil, 0, err
}
version, err := s.versioner.ObjectResourceVersion(ret) version, err := s.versioner.ObjectResourceVersion(ret)
if err != nil { if err != nil {