github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

show patch error as string not byte slice

Browse Source
This commit is contained in:
deads2k 2017-03-01 08:00:07 -05:00
parent ed479163fa
commit ea887557d3
2 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/rest.go
View File

@ -565,11 +565,12 @@ func patchResource(
namespace := request.NamespaceValue(ctx) namespace := request.NamespaceValue(ctx)
var ( var (
originalObjJS []byte originalObjJS []byte
originalPatchedObjJS []byte originalPatchedObjJS []byte
originalObjMap map[string]interface{} originalObjMap map[string]interface{}
originalPatchMap map[string]interface{} originalPatchMap map[string]interface{}
lastConflictErr error lastConflictErr error
originalResourceVersion string
) )
// applyPatch is called every time GuaranteedUpdate asks for the updated object, // applyPatch is called every time GuaranteedUpdate asks for the updated object,
@ -582,12 +583,18 @@ func patchResource(
return nil, errors.NewNotFound(resource.GroupResource(), name) return nil, errors.NewNotFound(resource.GroupResource(), name)
} }
currentResourceVersion := ""
if currentMetadata, err := meta.Accessor(currentObject); err == nil {
currentResourceVersion = currentMetadata.GetResourceVersion()
}
switch { switch {
case originalObjJS == nil && originalObjMap == nil: case originalObjJS == nil && originalObjMap == nil:
// first time through, // first time through,
// 1. apply the patch // 1. apply the patch
// 2. save the original and patched to detect whether there were conflicting changes on retries // 2. save the original and patched to detect whether there were conflicting changes on retries
originalResourceVersion = currentResourceVersion
objToUpdate := patcher.New() objToUpdate := patcher.New()
// For performance reasons, in case of strategicpatch, we avoid json // For performance reasons, in case of strategicpatch, we avoid json
@ -690,11 +697,12 @@ func patchResource(
if err != nil { if err != nil {
return nil, err return nil, err
} }
if hasConflicts { if hasConflicts {
diff1, _ := json.Marshal(currentPatchMap) diff1, _ := json.Marshal(currentPatchMap)
diff2, _ := json.Marshal(originalPatchMap) diff2, _ := json.Marshal(originalPatchMap)
patchDiffErr := fmt.Errorf("there is a meaningful conflict:\n diff1=%v\n, diff2=%v\n", diff1, diff2) patchDiffErr := fmt.Errorf("there is a meaningful conflict (firstResourceVersion: %q, currentResourceVersion: %q):\n diff1=%v\n, diff2=%v\n", originalResourceVersion, currentResourceVersion, string(diff1), string(diff2))
glog.V(4).Infof("patchResource failed for resource %s, because there is a meaningful conflict.\n diff1=%v\n, diff2=%v\n", name, diff1, diff2) glog.V(4).Infof("patchResource failed for resource %s, because there is a meaningful conflict(firstResourceVersion: %q, currentResourceVersion: %q):\n diff1=%v\n, diff2=%v\n", name, originalResourceVersion, currentResourceVersion, string(diff1), string(diff2))
// Return the last conflict error we got if we have one // Return the last conflict error we got if we have one
if lastConflictErr != nil { if lastConflictErr != nil {

18
test/integration/client/client_test.go
View File

@ -268,14 +268,26 @@ func TestPatch(t *testing.T) {
pb := patchBodies[c.Core().RESTClient().APIVersion()] pb := patchBodies[c.Core().RESTClient().APIVersion()]
execPatch := func(pt types.PatchType, body []byte) error { execPatch := func(pt types.PatchType, body []byte) error {
return c.Core().RESTClient().Patch(pt). result := c.Core().RESTClient().Patch(pt).
Resource(resource). Resource(resource).
Namespace(ns.Name). Namespace(ns.Name).
Name(name). Name(name).
Body(body). Body(body).
Do(). Do()
Error() if result.Error() != nil {
return result.Error()
}
// trying to chase flakes, this should give us resource versions of objects as we step through
jsonObj, err := result.Raw()
if err != nil {
t.Log(err)
} else {
t.Logf("%v", string(jsonObj))
}
return nil
} }
for k, v := range pb { for k, v := range pb {
// add label // add label
err := execPatch(k, v.AddLabelBody) err := execPatch(k, v.AddLabelBody)