github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-17 11:28:58 +00:00
Code Issues Projects Releases Wiki Activity

skip setting condition to False if it was True

Browse Source 
Signed-off-by: helayoty <heelayot@microsoft.com>
This commit is contained in:
helayoty
2026-03-16 23:42:26 +00:00
parent 3e9c4966ff
commit b728516811
2 changed files with 102 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
pkg/scheduler/schedule_one_podgroup.go
View File

@@ -491,6 +491,15 @@ func (sched *Scheduler) submitPodGroupAlgorithmResult(ctx context.Context, sched
}
}
logger := klog.FromContext(ctx)
// If the PodGroup was already successfully scheduled, don't regress the
// condition back to False on a subsequent cycle for extra pods.
alreadyScheduled := false
if pg, err := sched.podGroupLister.PodGroups(podGroupInfo.Namespace).Get(podGroupInfo.Name); err == nil {
existing := apimeta.FindStatusCondition(pg.Status.Conditions, schedulingapi.PodGroupScheduled)
alreadyScheduled = existing != nil && existing.Status == metav1.ConditionTrue
}
var condition *metav1.Condition
switch {
case podGroupResult.status.IsSuccess():
@@ -504,11 +513,13 @@ func (sched *Scheduler) submitPodGroupAlgorithmResult(ctx context.Context, sched
metrics.PodGroupScheduled(schedFwk.ProfileName(), metrics.SinceInSeconds(start))
case podGroupResult.status.IsRejected():
condition = &metav1.Condition{
Type: schedulingapi.PodGroupScheduled,
Status: metav1.ConditionFalse,
Reason: schedulingapi.PodGroupReasonUnschedulable,
Message: podGroupResult.status.Message(),
if !alreadyScheduled {
condition = &metav1.Condition{
Type: schedulingapi.PodGroupScheduled,
Status: metav1.ConditionFalse,
Reason: schedulingapi.PodGroupReasonUnschedulable,
Message: podGroupResult.status.Message(),
}
}
if podGroupResult.waitingOnPreemption {
logger.V(2).Info("Pod group is waiting for preemption", "podGroup", klog.KObj(podGroupInfo), "unschedulablePods", unschedulablePods)
@@ -519,16 +530,20 @@ func (sched *Scheduler) submitPodGroupAlgorithmResult(ctx context.Context, sched
}
default:
condition = &metav1.Condition{
Type: schedulingapi.PodGroupScheduled,
Status: metav1.ConditionFalse,
Reason: schedulingapi.PodGroupReasonSchedulerError,
Message: podGroupResult.status.AsError().Error(),
if !alreadyScheduled {
condition = &metav1.Condition{
Type: schedulingapi.PodGroupScheduled,
Status: metav1.ConditionFalse,
Reason: schedulingapi.PodGroupReasonSchedulerError,
Message: podGroupResult.status.AsError().Error(),
}
}
utilruntime.HandleErrorWithContext(ctx, podGroupResult.status.AsError(), "Error scheduling pod group", "podGroup", klog.KObj(podGroupInfo), "errorPods", len(podGroupInfo.QueuedPodInfos))
metrics.PodGroupScheduleError(schedFwk.ProfileName(), metrics.SinceInSeconds(start))
}
sched.updatePodGroupCondition(ctx, podGroupInfo, condition)
if condition != nil {
sched.updatePodGroupCondition(ctx, podGroupInfo, condition)
}
}
// updatePodGroupCondition patches the given condition on a PodGroup.

78
pkg/scheduler/schedule_one_podgroup_test.go
View File

@@ -931,6 +931,7 @@ func TestSubmitPodGroupAlgorithmResult(t *testing.T) {
tests := []struct {
name string
existingPodGroup *schedulingv1alpha2.PodGroup
algorithmResult podGroupAlgorithmResult
expectBound sets.Set[string]
expectPreempting sets.Set[string]
@@ -1287,6 +1288,75 @@ func TestSubmitPodGroupAlgorithmResult(t *testing.T) {
Message: "",
},
},
{
name: "Already Scheduled, rejected cycle does not regress condition",
existingPodGroup: &schedulingv1alpha2.PodGroup{
ObjectMeta: metav1.ObjectMeta{Name: "pg", Namespace: "default"},
Status: schedulingv1alpha2.PodGroupStatus{
Conditions: []metav1.Condition{{
Type: schedulingapi.PodGroupScheduled,
Status: metav1.ConditionTrue,
Reason: "Scheduled",
Message: "All pods scheduled",
LastTransitionTime: metav1.Now(),
}},
},
},
algorithmResult: podGroupAlgorithmResult{
status: fwk.NewStatus(fwk.Unschedulable, "extra pods could not be placed"),
podResults: []algorithmResult{{
scheduleResult: ScheduleResult{SuggestedHost: "", nominatingInfo: clearNominatedNode},
status: fwk.NewStatus(fwk.Unschedulable),
}, {
scheduleResult: ScheduleResult{SuggestedHost: "", nominatingInfo: clearNominatedNode},
status: fwk.NewStatus(fwk.Unschedulable),
}, {
scheduleResult: ScheduleResult{SuggestedHost: "", nominatingInfo: clearNominatedNode},
status: fwk.NewStatus(fwk.Unschedulable),
}},
},
expectFailed: sets.New("p1", "p2", "p3"),
expectCondition: &metav1.Condition{
Type: schedulingapi.PodGroupScheduled,
Status: metav1.ConditionTrue,
Reason: "Scheduled",
Message: "All pods scheduled",
},
},
{
name: "Already Scheduled, error cycle does not regress condition",
existingPodGroup: &schedulingv1alpha2.PodGroup{
ObjectMeta: metav1.ObjectMeta{Name: "pg", Namespace: "default"},
Status: schedulingv1alpha2.PodGroupStatus{
Conditions: []metav1.Condition{{
Type: schedulingapi.PodGroupScheduled,
Status: metav1.ConditionTrue,
Reason: "Scheduled",
Message: "All pods scheduled",
LastTransitionTime: metav1.Now(),
}},
},
},
algorithmResult: podGroupAlgorithmResult{
status: fwk.NewStatus(fwk.Error),
podResults: []algorithmResult{{
scheduleResult: ScheduleResult{SuggestedHost: "node1"},
status: nil,
permitStatus: nil,
}, {
scheduleResult: ScheduleResult{SuggestedHost: "", nominatingInfo: clearNominatedNode},
status: fwk.NewStatus(fwk.Error),
}},
},
expectBound: sets.New[string](),
expectFailed: sets.New("p1", "p2", "p3"),
expectCondition: &metav1.Condition{
Type: schedulingapi.PodGroupScheduled,
Status: metav1.ConditionTrue,
Reason: "Scheduled",
Message: "All pods scheduled",
},
},
}
for _, tt := range tests {
@@ -1298,7 +1368,11 @@ func TestSubmitPodGroupAlgorithmResult(t *testing.T) {
preemptingPods := sets.New[string]()
failedPods := sets.New[string]()
client := clientsetfake.NewClientset(testNode, testPodGroup)
pg := testPodGroup
if tt.existingPodGroup != nil {
pg = tt.existingPodGroup
}
client := clientsetfake.NewClientset(testNode, pg)
client.PrependReactor("create", "pods", func(action clienttesting.Action) (bool, runtime.Object, error) {
if action.GetSubresource() != "binding" {
return false, nil, nil
@@ -1341,7 +1415,7 @@ func TestSubmitPodGroupAlgorithmResult(t *testing.T) {
cache.AddNode(klog.FromContext(ctx), testNode)
informerFactory := informers.NewSharedInformerFactory(client, 0)
if err := informerFactory.Scheduling().V1alpha2().PodGroups().Informer().GetStore().Add(testPodGroup); err != nil {
if err := informerFactory.Scheduling().V1alpha2().PodGroups().Informer().GetStore().Add(pg); err != nil {
t.Fatalf("Failed to add PodGroup to informer store: %v", err)
}