Skip to content

K
k3s
Commit 01ac9945 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #40689 from deads2k/add-details-to-patch-err

Automatic merge from submit-queue (batch tested with PRs 39169, 40719, 38954, 40808, 40689) add details to patch conflict Adds conflict details to the patch message so we can debug #39471. Seems like this may have general utility since others may also wonder what they conflicted on. @sig-api
parents f316afd3 8a61368a
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
pkg/genericapiserver/endpoints/handlers/rest.go
View file @ 01ac9945
...@@ -663,17 +663,17 @@ func patchResource( ...@@ -663,17 +663,17 @@ func patchResource(
return nil, err return nil, err
} }
if hasConflicts { if hasConflicts {
if glog.V(4) { 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)
glog.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.\n diff1=%v\n, diff2=%v\n", name, diff1, 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 {
return nil, lastConflictErr return nil, lastConflictErr
} }
// Otherwise manufacture one of our own // Otherwise manufacture one of our own
return nil, errors.NewConflict(resource.GroupResource(), name, nil) return nil, errors.NewConflict(resource.GroupResource(), name, patchDiffErr)
} }
objToUpdate := patcher.New() objToUpdate := patcher.New()
......
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