Skip to content

OCPBUGS-90541: Don't set Progressing=False until all pods available #3034

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

Open
mdbooth wants to merge 1 commit into
base: master
Choose a base branch
from
+708 −22
Open

OCPBUGS-90541: Don't set Progressing=False until all pods available #3034

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
42 changes: 33 additions & 9 deletions pkg/controller/statusmanager/pod_status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,19 @@ func (status *StatusManager) SetFromPods() {
} else if ds.Status.UpdatedNumberScheduled < ds.Status.CurrentNumberScheduled {
progressing = append(progressing, fmt.Sprintf("DaemonSet %q update is rolling out (%d out of %d updated)", dsName.String(), ds.Status.UpdatedNumberScheduled, ds.Status.CurrentNumberScheduled))
dsProgressing = true
} else if ds.Status.NumberUnavailable > 0 {
if dsRolloutActive {
} else if ds.Status.NumberUnavailable > 0 && (hadState || dsRolloutActive) {
// Rollout in progress: either continuing a tracked rollout or a new/initial rollout
if hadState {
progressing = append(progressing, fmt.Sprintf("DaemonSet %q rollout is waiting for %d pods to become available", dsName.String(), ds.Status.NumberUnavailable))
} else {
progressing = append(progressing, fmt.Sprintf("DaemonSet %q is not available (awaiting %d nodes)", dsName.String(), ds.Status.NumberUnavailable))
dsProgressing = true
}
dsProgressing = true
if !isNonCritical(ds) {
clbo = append(clbo, status.CheckCrashLoopBackOffPods(dsName, ds.Spec.Selector.MatchLabels, "DaemonSet")...)
}
} else if ds.Status.NumberUnavailable > 0 {
// Reboot churn: unavailable pods but no active rollout and no tracked state
if !isNonCritical(ds) {
clbo = append(clbo, status.CheckCrashLoopBackOffPods(dsName, ds.Spec.Selector.MatchLabels, "DaemonSet")...)
}
Expand Down Expand Up @@ -161,15 +169,23 @@ func (status *StatusManager) SetFromPods() {
} else if ss.Status.UpdatedReplicas < ss.Status.Replicas {
progressing = append(progressing, fmt.Sprintf("StatefulSet %q update is rolling out (%d out of %d updated)", ssName.String(), ss.Status.UpdatedReplicas, ss.Status.Replicas))
ssProgressing = true
} else if ss.Status.ReadyReplicas > 0 && ss.Status.ReadyReplicas < ss.Status.Replicas {
if ssRolloutActive {
} else if ss.Status.ReadyReplicas < ss.Status.Replicas && (hadState || ssRolloutActive) {
// Rollout in progress: either continuing a tracked rollout or a new/initial rollout
if hadState {
progressing = append(progressing, fmt.Sprintf("StatefulSet %q rollout is waiting for %d pods to become available", ssName.String(), (ss.Status.Replicas-ss.Status.ReadyReplicas)))
} else {
progressing = append(progressing, fmt.Sprintf("StatefulSet %q is not available (awaiting %d nodes)", ssName.String(), (ss.Status.Replicas-ss.Status.ReadyReplicas)))
ssProgressing = true
}
ssProgressing = true
// Check for any pods in CrashLoopBackOff state and mark the operator as degraded if so.
if !isNonCritical(ss) {
clbo = append(clbo, status.CheckCrashLoopBackOffPods(ssName, ss.Spec.Selector.MatchLabels, "StatefulSet")...)
}
} else if ss.Status.ReadyReplicas < ss.Status.Replicas {
// Reboot churn: unavailable pods but no active rollout and no tracked state
if !isNonCritical(ss) {
clbo = append(clbo, status.CheckCrashLoopBackOffPods(ssName, ss.Spec.Selector.MatchLabels, "StatefulSet")...)
}
} else if ss.Status.AvailableReplicas == 0 && ssRolloutActive {
progressing = append(progressing, fmt.Sprintf("StatefulSet %q is not yet scheduled on any nodes", ssName.String()))
ssProgressing = true
Expand Down Expand Up @@ -218,15 +234,23 @@ func (status *StatusManager) SetFromPods() {
} else if dep.Status.UpdatedReplicas < dep.Status.Replicas {
progressing = append(progressing, fmt.Sprintf("Deployment %q update is rolling out (%d out of %d updated)", depName.String(), dep.Status.UpdatedReplicas, dep.Status.Replicas))
depProgressing = true
} else if dep.Status.UnavailableReplicas > 0 {
if depRolloutActive {
} else if dep.Status.UnavailableReplicas > 0 && (hadState || depRolloutActive) {
// Rollout in progress: either continuing a tracked rollout or a new/initial rollout
if hadState {
progressing = append(progressing, fmt.Sprintf("Deployment %q rollout is waiting for %d pods to become available", depName.String(), dep.Status.UnavailableReplicas))
} else {
progressing = append(progressing, fmt.Sprintf("Deployment %q is not available (awaiting %d nodes)", depName.String(), dep.Status.UnavailableReplicas))
depProgressing = true
}
depProgressing = true
// Check for any pods in CrashLoopBackOff state and mark the operator as degraded if so.
if !isNonCritical(dep) {
clbo = append(clbo, status.CheckCrashLoopBackOffPods(depName, dep.Spec.Selector.MatchLabels, "Deployment")...)
}
} else if dep.Status.UnavailableReplicas > 0 {
// Reboot churn: unavailable pods but no active rollout and no tracked state
if !isNonCritical(dep) {
clbo = append(clbo, status.CheckCrashLoopBackOffPods(depName, dep.Spec.Selector.MatchLabels, "Deployment")...)
}
} else if dep.Status.AvailableReplicas == 0 && depRolloutActive {
progressing = append(progressing, fmt.Sprintf("Deployment %q is not yet scheduled on any nodes", depName.String()))
depProgressing = true
Expand Down
Loading