fix #844 When updating statefullset, the total number of pods being updated may exceed the expected value (#845)

hzyfox · FillZpp · commit 7b3fce375b28 · 2021-12-16T11:47:31.000+08:00
Signed-off-by: 孤月 &lt;guyue.hzy@alibaba-inc.com&gt;
diff --git a/pkg/controller/statefulset/stateful_set_control.go b/pkg/controller/statefulset/stateful_set_control.go
@@ -858,10 +858,10 @@ func (ssc *defaultStatefulSetControl) inPlaceUpdatePod(
 			}
 
 			if res.UpdateErr == nil {
+				updateExpectations.ExpectUpdated(getStatefulSetKey(set), updateRevision.Name, pod)
 				ssc.recorder.Eventf(set, v1.EventTypeNormal, "SuccessfulUpdatePodInPlace", "successfully update pod %s in-place(revision %v)", pod.Name, updateRevision.Name)
 				return res.InPlaceUpdate, nil
 			}
-
 			ssc.recorder.Eventf(set, v1.EventTypeWarning, "FailedUpdatePodInPlace", "failed to update pod %s in-place(revision %v): %v", pod.Name, updateRevision.Name, res.UpdateErr)
 			return res.InPlaceUpdate, res.UpdateErr
 		}

Original file line number	Diff line number	Diff line change
`@@ -858,10 +858,10 @@ func (ssc *defaultStatefulSetControl) inPlaceUpdatePod(`
`858`	`858`	`}`
`859`	`859`
`860`	`860`	`if res.UpdateErr == nil {`
	`861`	`+ updateExpectations.ExpectUpdated(getStatefulSetKey(set), updateRevision.Name, pod)`
`861`	`862`	`ssc.recorder.Eventf(set, v1.EventTypeNormal, "SuccessfulUpdatePodInPlace", "successfully update pod %s in-place(revision %v)", pod.Name, updateRevision.Name)`
`862`	`863`	`return res.InPlaceUpdate, nil`
`863`	`864`	`}`
`864`		`-`
`865`	`865`	`ssc.recorder.Eventf(set, v1.EventTypeWarning, "FailedUpdatePodInPlace", "failed to update pod %s in-place(revision %v): %v", pod.Name, updateRevision.Name, res.UpdateErr)`
`866`	`866`	`return res.InPlaceUpdate, res.UpdateErr`
`867`	`867`	`}`