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

Merge pull request #40689 from deads2k/add-details-to-patch-err
01ac9945 · Kubernetes Submit Queue · GitHub · f316afd3 · 8a61368a · 01ac9945
Commit 01ac9945 authored Feb 02, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

rest.go pkg/genericapiserver/endpoints/handlers/rest.go +6 -6

No files found.
--- a/pkg/genericapiserver/endpoints/handlers/rest.go
+++ b/pkg/genericapiserver/endpoints/handlers/rest.go
@@ -663,17 +663,17 @@ func patchResource(
 				return nil, err
 			}
 			if hasConflicts {
-				if glog.V(4) {
-					diff1, _ := json.Marshal(currentPatchMap)
-					diff2, _ := json.Marshal(originalPatchMap)
-					glog.Infof("patchResource failed for resource %s, because there is a meaningful conflict.\n diff1=%v\n, diff2=%v\n", name, diff1, diff2)
-				}
+				diff1, _ := json.Marshal(currentPatchMap)
+				diff2, _ := json.Marshal(originalPatchMap)
+				patchDiffErr := fmt.Errorf("there is a meaningful conflict:\n diff1=%v\n, diff2=%v\n", 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
 				if lastConflictErr != nil {
 					return nil, lastConflictErr
 				}
 				// 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()