Merge pull request #7302 from Ady0333/fix/graceful-eviction-optimistic-lock

karmada-bot · web-flow · commit 3424bc71d1bd · 2026-03-19T19:56:12.000+08:00
gracefuleviction: use optimistic lock in MergeFrom patch
diff --git a/pkg/controllers/gracefuleviction/crb_graceful_eviction_controller.go b/pkg/controllers/gracefuleviction/crb_graceful_eviction_controller.go
@@ -88,7 +88,7 @@ func (c *CRBGracefulEvictionController) syncBinding(ctx context.Context, binding
 		return nextRetry(keptTask, c.GracefulEvictionTimeout, metav1.Now().Time), nil
 	}
 
-	objPatch := client.MergeFrom(binding)
+	objPatch := client.MergeFromWithOptions(binding, client.MergeFromWithOptimisticLock{})
 	modifiedObj := binding.DeepCopy()
 	modifiedObj.Spec.GracefulEvictionTasks = keptTask
 	err := c.Client.Patch(ctx, modifiedObj, objPatch)
diff --git a/pkg/controllers/gracefuleviction/rb_graceful_eviction_controller.go b/pkg/controllers/gracefuleviction/rb_graceful_eviction_controller.go
@@ -88,7 +88,7 @@ func (c *RBGracefulEvictionController) syncBinding(ctx context.Context, binding
 		return nextRetry(keptTask, c.GracefulEvictionTimeout, metav1.Now().Time), nil
 	}
 
-	objPatch := client.MergeFrom(binding)
+	objPatch := client.MergeFromWithOptions(binding, client.MergeFromWithOptimisticLock{})
 	modifiedObj := binding.DeepCopy()
 	modifiedObj.Spec.GracefulEvictionTasks = keptTask
 	err := c.Client.Patch(ctx, modifiedObj, objPatch)

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func (c *CRBGracefulEvictionController) syncBinding(ctx context.Context, binding`
`88`	`88`	`return nextRetry(keptTask, c.GracefulEvictionTimeout, metav1.Now().Time), nil`
`89`	`89`	`}`
`90`	`90`
`91`		`- objPatch := client.MergeFrom(binding)`
	`91`	`+ objPatch := client.MergeFromWithOptions(binding, client.MergeFromWithOptimisticLock{})`
`92`	`92`	`modifiedObj := binding.DeepCopy()`
`93`	`93`	`modifiedObj.Spec.GracefulEvictionTasks = keptTask`
`94`	`94`	`err := c.Client.Patch(ctx, modifiedObj, objPatch)`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func (c *RBGracefulEvictionController) syncBinding(ctx context.Context, binding`
`88`	`88`	`return nextRetry(keptTask, c.GracefulEvictionTimeout, metav1.Now().Time), nil`
`89`	`89`	`}`
`90`	`90`
`91`		`- objPatch := client.MergeFrom(binding)`
	`91`	`+ objPatch := client.MergeFromWithOptions(binding, client.MergeFromWithOptimisticLock{})`
`92`	`92`	`modifiedObj := binding.DeepCopy()`
`93`	`93`	`modifiedObj.Spec.GracefulEvictionTasks = keptTask`
`94`	`94`	`err := c.Client.Patch(ctx, modifiedObj, objPatch)`