adding a apiserver log message when patch fails because a meaningful conflict

pull/6/head
Chao Xu 2016-02-22 16:41:34 -08:00
parent 6a199706cb
commit 78fc311f1f
1 changed files with 1 additions and 0 deletions

View File

@ -589,6 +589,7 @@ func patchResource(ctx api.Context, admit updateAdmissionFunc, timeout time.Dura
return nil, err
}
if hasConflicts {
glog.V(4).Infof("patchResource failed for resource %s, becauase there is a meaningful conflict.\n diff1=%v\n, diff2=%v\n", name, diff1, diff2)
return updateObject, updateErr
}