fix: workload info status add terminating replicas

youngLiuHY · zoumo · commit 94f26b3457c3 · 2025-12-18T15:51:43.000+08:00
diff --git a/pkg/controllers/scalerun/executor/batch.go b/pkg/controllers/scalerun/executor/batch.go
@@ -262,7 +262,7 @@ func (e *batchExecutor) checkScaledReady(info *workload.Info, scaledFrom, scaled
 	}
 
 	if scaledFrom >= scaledTo {
-		return info.Status.CurrentReplicas <= info.Status.Replicas
+		return info.Status.CurrentReplicas <= info.Status.Replicas && info.Status.TerminatingReplicas == 0
 	} else {
 		return info.Status.AvailableReplicas >= info.Status.Replicas
 	}
diff --git a/pkg/workload/info.go b/pkg/workload/info.go
@@ -63,6 +63,8 @@ type InfoStatus struct {
 	UpdatedReadyReplicas int32
 	// UpdatedAvailableReplicas is the number of service available pods targeted by workload that have the updated template spec.
 	UpdatedAvailableReplicas int32
+	// TerminatingReplicas is the number of pods which is marked deletion timestamp
+	TerminatingReplicas int32
 }
 
 func NewInfo(cluster string, gvk schema.GroupVersionKind, obj client.Object, status InfoStatus) *Info {

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ func (e batchExecutor) checkScaledReady(info workload.Info, scaledFrom, scaled`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`if scaledFrom >= scaledTo {`
`265`		`- return info.Status.CurrentReplicas <= info.Status.Replicas`
	`265`	`+ return info.Status.CurrentReplicas <= info.Status.Replicas && info.Status.TerminatingReplicas == 0`
`266`	`266`	`} else {`
`267`	`267`	`return info.Status.AvailableReplicas >= info.Status.Replicas`
`268`	`268`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,8 @@ type InfoStatus struct {`
`63`	`63`	`UpdatedReadyReplicas int32`
`64`	`64`	`// UpdatedAvailableReplicas is the number of service available pods targeted by workload that have the updated template spec.`
`65`	`65`	`UpdatedAvailableReplicas int32`
	`66`	`+ // TerminatingReplicas is the number of pods which is marked deletion timestamp`
	`67`	`+ TerminatingReplicas int32`
`66`	`68`	`}`
`67`	`69`
`68`	`70`	`func NewInfo(cluster string, gvk schema.GroupVersionKind, obj client.Object, status InfoStatus) *Info {`