Skip to content

[Bug] fix count ready podset condition #1518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jeffwan merged 1 commit into from
Aug 29, 2025
Merged

[Bug] fix count ready podset condition #1518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion pkg/controller/roleset/podset_rollsyncer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ func getRolePodSets(ctx context.Context, cli client.Client, namespace, roleSetNa
func filterActivePodSets(allPodSets []*orchestrationv1alpha1.PodSet) ([]*orchestrationv1alpha1.PodSet, []*orchestrationv1alpha1.PodSet) {
var active, inactive []*orchestrationv1alpha1.PodSet
for _, podSet := range allPodSets {
if podSet.DeletionTimestamp == nil && podSet.Status.Phase != orchestrationv1alpha1.PodSetPhaseFailed {
if isPodSetActive(podSet) {
active = append(active, podSet)
} else {
inactive = append(inactive, podSet)
Expand Down Expand Up @@ -496,6 +496,11 @@ func isPodSetReady(podSet *orchestrationv1alpha1.PodSet) bool {
return podSet.Status.Phase == orchestrationv1alpha1.PodSetPhaseReady
}

// isPodSetActive checks if a PodSet is active
func isPodSetActive(podSet *orchestrationv1alpha1.PodSet) bool {
return podSet.DeletionTimestamp == nil && podSet.Status.Phase != orchestrationv1alpha1.PodSetPhaseFailed
}

// createPodSetsInBatch creates multiple PodSets
func createPodSetsInBatch(ctx context.Context, cli client.Client, podSets []*orchestrationv1alpha1.PodSet) (int, error) {
for _, podSet := range podSets {
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/roleset/sync.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,14 @@ func (r *RoleSetReconciler) calculateStatusFromPodSets(ctx context.Context, rs *

for _, podSet := range podSetList.Items {
totalReplicas++
if podSet.DeletionTimestamp == nil && podSet.Status.Phase != orchestrationv1alpha1.PodSetPhaseFailed {
if isPodSetActive(&podSet) && isPodSetReady(&podSet) {
readyReplicas++
}

// Check if PodSet is updated (has current template hash)
if podSet.Labels[constants.RoleTemplateHashLabelKey] == currentHash {
updatedReplicas++
if podSet.Status.Phase == orchestrationv1alpha1.PodSetPhaseReady {
if isPodSetReady(&podSet) {
updatedReadyReplicas++
}
}
Expand Down