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

Merge pull request #33349 from madhusudancs/etcd-precond-deref-log

Browse Source 
Automatic merge from submit-queue

Dereference the UID pointer for a readable error message.

cc @nikhiljindal @quinton-hoole @kubernetes/sig-cluster-federation
This commit is contained in:
Kubernetes Submit Queue 2016-09-22 22:42:24 -07:00 committed by GitHub
commit e05e8664d5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -444,7 +444,7 @@ func checkPreconditions(key string, preconditions *storage.Preconditions, out ru
return storage.NewInternalErrorf("can't enforce preconditions %v on un-introspectable object %v, got error: %v", *preconditions, out, err) return storage.NewInternalErrorf("can't enforce preconditions %v on un-introspectable object %v, got error: %v", *preconditions, out, err)
} }
if preconditions.UID != nil && *preconditions.UID != objMeta.UID { if preconditions.UID != nil && *preconditions.UID != objMeta.UID {
errMsg := fmt.Sprintf("Precondition failed: UID in precondition: %v, UID in object meta: %v", preconditions.UID, objMeta.UID) errMsg := fmt.Sprintf("Precondition failed: UID in precondition: %v, UID in object meta: %v", *preconditions.UID, objMeta.UID)
return storage.NewInvalidObjError(key, errMsg) return storage.NewInvalidObjError(key, errMsg)
} }
return nil return nil