Skip to content

K
k3s
Commit b94e15d6 authored by Chao Xu's avatar Chao Xu
Browse files
Options

Merge pull request #21723 from caesarxuchao/log-in-patch

Adding an apiserver log entry when Patch fails because of a meaningful conflict
parents 63feac0a 78fc311f
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
pkg/apiserver/resthandler.go
View file @ b94e15d6
...@@ -589,6 +589,7 @@ func patchResource(ctx api.Context, admit updateAdmissionFunc, timeout time.Dura ...@@ -589,6 +589,7 @@ func patchResource(ctx api.Context, admit updateAdmissionFunc, timeout time.Dura
return nil, err return nil, err
} }
if hasConflicts { 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 return updateObject, updateErr
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment