Merge pull request kubernetes#133334 from macsko/fix_potential_race_in_patchpodstatus_api_call_implementation

k8s-ci-robot · web-flow · commit b37978f22681 · 2025-08-01T02:47:45.000-07:00
Fix potential race in PodStatusPatchCall implementation
diff --git a/pkg/scheduler/framework/api_calls/pod_status_patch.go b/pkg/scheduler/framework/api_calls/pod_status_patch.go
@@ -127,11 +127,12 @@ func (psuc *PodStatusPatchCall) Sync(obj metav1.Object) (metav1.Object, error) {
 		// because otherwise it's irrelevant and might race.
 		psuc.podStatus = pod.Status.DeepCopy()
 	}
+	newCondition := psuc.newCondition.DeepCopy()
 	psuc.lock.Unlock()
 
 	podCopy := pod.DeepCopy()
 	// Sync passed pod's status with the call's condition and nominatingInfo.
-	synced := syncStatus(&podCopy.Status, psuc.newCondition, psuc.nominatingInfo)
+	synced := syncStatus(&podCopy.Status, newCondition, psuc.nominatingInfo)
 	if !synced {
 		return pod, nil
 	}

Original file line number	Diff line number	Diff line change
`@@ -127,11 +127,12 @@ func (psuc *PodStatusPatchCall) Sync(obj metav1.Object) (metav1.Object, error) {`
`127`	`127`	`// because otherwise it's irrelevant and might race.`
`128`	`128`	`psuc.podStatus = pod.Status.DeepCopy()`
`129`	`129`	`}`
	`130`	`+ newCondition := psuc.newCondition.DeepCopy()`
`130`	`131`	`psuc.lock.Unlock()`
`131`	`132`
`132`	`133`	`podCopy := pod.DeepCopy()`
`133`	`134`	`// Sync passed pod's status with the call's condition and nominatingInfo.`
`134`		`- synced := syncStatus(&podCopy.Status, psuc.newCondition, psuc.nominatingInfo)`
	`135`	`+ synced := syncStatus(&podCopy.Status, newCondition, psuc.nominatingInfo)`
`135`	`136`	`if !synced {`
`136`	`137`	`return pod, nil`
`137`	`138`	`}`