Skip to content

Not using summerized MinAvailable for PodGroup, but look per SubGroup #443

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
merged 6 commits into from
Aug 31, 2025
Merged

Not using summerized MinAvailable for PodGroup, but look per SubGroup #443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf137a2
IsElastic
omer-dayan Aug 26, 2025
284f0b8
IsGangSatisfied
omer-dayan Aug 26, 2025
d921718
ShouldPipeline
omer-dayan Aug 26, 2025
6a07ee0
OrderJob Elastic
omer-dayan Aug 26, 2025
7cf50be
SplitVictimTasks
omer-dayan Aug 26, 2025
c4e46c2
MinRuntime
omer-dayan Aug 26, 2025
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
41 changes: 24 additions & 17 deletions pkg/scheduler/api/podgroup_info/job_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,12 @@ func (pgi *PodGroupInfo) IsReadyForScheduling() bool {
}

func (pgi *PodGroupInfo) IsElastic() bool {
return pgi.GetDefaultMinAvailable() < int32(len(pgi.GetAllPodsMap()))
for _, subGroup := range pgi.GetSubGroups() {
if subGroup.IsElastic() {
return true
}
}
return false
}

func (pgi *PodGroupInfo) IsStale() bool {
Expand All @@ -424,10 +429,6 @@ func (pgi *PodGroupInfo) IsStale() bool {
}

func (pgi *PodGroupInfo) IsGangSatisfied() bool {
numActiveTasks := pgi.GetNumActiveUsedTasks()
if numActiveTasks < int(pgi.GetDefaultMinAvailable()) {
return false
}
for _, subGroup := range pgi.SubGroups {
if !subGroup.IsGangSatisfied() {
return false
Expand All @@ -437,20 +438,26 @@ func (pgi *PodGroupInfo) IsGangSatisfied() bool {
}

func (pgi *PodGroupInfo) ShouldPipelineJob() bool {
hasPipelinedTask := false
activeAllocatedTasksCount := 0
for _, task := range pgi.GetAllPodsMap() {
if task.Status == pod_status.Pipelined {
log.InfraLogger.V(7).Infof("task: <%v/%v> was pipelined to node: <%v>",
task.Namespace, task.Name, task.NodeName)
hasPipelinedTask = true
} else if pod_status.IsActiveAllocatedStatus(task.Status) {
activeAllocatedTasksCount += 1
for _, subGroup := range pgi.SubGroups {
hasPipelinedTask := false
activeAllocatedTasksCount := 0
for _, task := range subGroup.GetPodInfos() {
if task.Status == pod_status.Pipelined {
log.InfraLogger.V(7).Infof("task: <%v/%v> was pipelined to node: <%v>",
task.Namespace, task.Name, task.NodeName)
hasPipelinedTask = true
} else if pod_status.IsActiveAllocatedStatus(task.Status) {
activeAllocatedTasksCount += 1
}
}

if hasPipelinedTask && activeAllocatedTasksCount < int(subGroup.GetMinAvailable()) {
log.InfraLogger.V(7).Infof("Subgroup: <%v/%v> has pipelined tasks, and not enough allocated pods for minAvailable <%v>. Pipeline all.",
pgi.UID, subGroup.GetName(), subGroup.GetMinAvailable())
return true
}
}
// If the job has already MinAvailable tasks active allocated (but not pipelined),
// then we shouldn't convert non-pipelined tasks to pipeline.
return hasPipelinedTask && activeAllocatedTasksCount < int(pgi.GetDefaultMinAvailable())
return false
}

func (pgi *PodGroupInfo) Clone() *PodGroupInfo {
Expand Down
4 changes: 4 additions & 0 deletions pkg/scheduler/api/podgroup_info/subgroup_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,10 @@ func (sgi *SubGroupInfo) IsGangSatisfied() bool {
return numActiveTasks >= int(sgi.minAvailable)
}

func (sgi *SubGroupInfo) IsElastic() bool {
return sgi.GetMinAvailable() < int32(len(sgi.GetPodInfos()))
}

func (sgi *SubGroupInfo) GetNumActiveAllocatedTasks() int {
return sgi.numActiveAllocatedTasks
}
Expand Down
46 changes: 46 additions & 0 deletions pkg/scheduler/api/podgroup_info/subgroup_info_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,52 @@ func TestGetNumPendingTasks(t *testing.T) {
}
}

func TestIsElastic(t *testing.T) {
tests := []struct {
name string
pods []*pod_info.PodInfo
expected bool
}{
{
name: "satisfied with exact minimum",
pods: []*pod_info.PodInfo{
{UID: "1", Status: pod_status.Running},
{UID: "2", Status: pod_status.Running},
},
expected: false,
},
{
name: "not satisfied with insufficient pods",
pods: []*pod_info.PodInfo{
{UID: "1", Status: pod_status.Pending},
},
expected: false,
},
{
name: "satisfied with above minimum pods",
pods: []*pod_info.PodInfo{
{UID: "1", Status: pod_status.Pending},
{UID: "2", Status: pod_status.Running},
{UID: "3", Status: pod_status.Pending},
{UID: "4", Status: pod_status.Gated},
{UID: "5", Status: pod_status.Pending},
},
expected: true,
},
}

for _, test := range tests {
sgi := NewSubGroupInfo("test", 2)
for _, pod := range test.pods {
sgi.AssignTask(pod)
}

if got := sgi.IsElastic(); got != test.expected {
t.Errorf("Name: %v, IsElastic() = %v, want %v", test.name, got, test.expected)
}
}
}

func TestGetNumActiveAllocatedTasks(t *testing.T) {
tests := []struct {
name string
Expand Down
26 changes: 20 additions & 6 deletions pkg/scheduler/plugins/elastic/elastic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,22 @@ func JobOrderFn(l, r interface{}) int {
lv := l.(*podgroup_info.PodGroupInfo)
rv := r.(*podgroup_info.PodGroupInfo)

lvAllocatedCount := int32(lv.GetActiveAllocatedTasksCount())
rvAllocatedCount := int32(rv.GetActiveAllocatedTasksCount())
lvBelowMinAvailable, lvAboveMinAvailable, lvExactlyAtMinAvailable := minAvailableState(lv)
rvBelowMinAvailable, rvAboveMinAvailable, rvExactlyAtMinAvailable := minAvailableState(rv)

if lvAllocatedCount < lv.GetDefaultMinAvailable() && rvAllocatedCount >= rv.GetDefaultMinAvailable() {
if lvBelowMinAvailable && !rvBelowMinAvailable {
return -1
}

if lvAllocatedCount == lv.GetDefaultMinAvailable() && rvAllocatedCount > rv.GetDefaultMinAvailable() {
if lvExactlyAtMinAvailable && rvAboveMinAvailable {
return -1
}

if lvAllocatedCount >= lv.GetDefaultMinAvailable() && rvAllocatedCount < rv.GetDefaultMinAvailable() {
if !lvBelowMinAvailable && rvBelowMinAvailable {
return 1
}

if lvAllocatedCount > lv.GetDefaultMinAvailable() && rvAllocatedCount == rv.GetDefaultMinAvailable() {
if lvAboveMinAvailable && rvExactlyAtMinAvailable {
return 1
}

Expand All @@ -53,4 +53,18 @@ func JobOrderFn(l, r interface{}) int {
return 0
}

func minAvailableState(pgi *podgroup_info.PodGroupInfo) (bool, bool, bool) {
exactlyAtMinAvailable := true
for _, subGroup := range pgi.SubGroups {
numAllocatedTasks := int32(subGroup.GetNumActiveAllocatedTasks())
if numAllocatedTasks < subGroup.GetMinAvailable() {
return true, false, false
}
if numAllocatedTasks > subGroup.GetMinAvailable() {
exactlyAtMinAvailable = false
}
}
return false, !exactlyAtMinAvailable, exactlyAtMinAvailable
}

func (pp *elasticPlugin) OnSessionClose(_ *framework.Session) {}
28 changes: 28 additions & 0 deletions pkg/scheduler/plugins/elastic/elastic_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ func TestJobOrderFn(t *testing.T) {
},
lPods: []*pod_info.PodInfo{
{
UID: "pod-a-1",
Name: "pod-a-1",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
Expand All @@ -74,6 +75,7 @@ func TestJobOrderFn(t *testing.T) {
},
rPods: []*pod_info.PodInfo{
{
UID: "pod-a-2",
Name: "pod-a-2",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
Expand All @@ -94,6 +96,7 @@ func TestJobOrderFn(t *testing.T) {
},
lPods: []*pod_info.PodInfo{
{
UID: "pod-a-1",
Name: "pod-a-1",
Status: pod_status.Allocated,
ResReq: resource_info.EmptyResourceRequirements(),
Expand All @@ -108,6 +111,7 @@ func TestJobOrderFn(t *testing.T) {
},
rPods: []*pod_info.PodInfo{
{
UID: "pod-a-2",
Name: "pod-a-2",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
Expand All @@ -128,6 +132,7 @@ func TestJobOrderFn(t *testing.T) {
},
lPods: []*pod_info.PodInfo{
{
UID: "pod-a-1",
Name: "pod-a-1",
Status: pod_status.Bound,
ResReq: resource_info.EmptyResourceRequirements(),
Expand All @@ -142,6 +147,7 @@ func TestJobOrderFn(t *testing.T) {
},
rPods: []*pod_info.PodInfo{
{
UID: "pod-a-2",
Name: "pod-a-2",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
Expand All @@ -162,6 +168,7 @@ func TestJobOrderFn(t *testing.T) {
},
lPods: []*pod_info.PodInfo{
{
UID: "pod-a-1",
Name: "pod-a-1",
Status: pod_status.Releasing,
ResReq: resource_info.EmptyResourceRequirements(),
Expand All @@ -176,6 +183,7 @@ func TestJobOrderFn(t *testing.T) {
},
rPods: []*pod_info.PodInfo{
{
UID: "pod-a-2",
Name: "pod-a-2",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
Expand All @@ -196,6 +204,7 @@ func TestJobOrderFn(t *testing.T) {
},
lPods: []*pod_info.PodInfo{
{
UID: "pod-a-1",
Name: "pod-a-1",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
Expand All @@ -222,6 +231,7 @@ func TestJobOrderFn(t *testing.T) {
},
lPods: []*pod_info.PodInfo{
{
UID: "pod-a-1",
Name: "pod-a-1",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
Expand All @@ -236,11 +246,13 @@ func TestJobOrderFn(t *testing.T) {
},
rPods: []*pod_info.PodInfo{
{
UID: "pod-a-2",
Name: "pod-a-2",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
},
{
UID: "pod-b-2",
Name: "pod-b-2",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
Expand All @@ -261,6 +273,7 @@ func TestJobOrderFn(t *testing.T) {
},
lPods: []*pod_info.PodInfo{
{
UID: "pod-a-1",
Name: "pod-a-1",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
Expand All @@ -275,16 +288,19 @@ func TestJobOrderFn(t *testing.T) {
},
rPods: []*pod_info.PodInfo{
{
UID: "pod-a-2",
Name: "pod-a-2",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
},
{
UID: "pod-b-2",
Name: "pod-b-2",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
},
{
UID: "pod-b-3",
Name: "pod-b-3",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
Expand All @@ -305,6 +321,7 @@ func TestJobOrderFn(t *testing.T) {
},
lPods: []*pod_info.PodInfo{
{
UID: "pod-a-1",
Name: "pod-a-1",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
Expand All @@ -319,11 +336,13 @@ func TestJobOrderFn(t *testing.T) {
},
rPods: []*pod_info.PodInfo{
{
UID: "pod-a-2",
Name: "pod-a-2",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
},
{
UID: "pod-b-2",
Name: "pod-b-2",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
Expand All @@ -344,6 +363,7 @@ func TestJobOrderFn(t *testing.T) {
},
lPods: []*pod_info.PodInfo{
{
UID: "pod-a-1",
Name: "pod-a-1",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
Expand All @@ -358,11 +378,13 @@ func TestJobOrderFn(t *testing.T) {
},
rPods: []*pod_info.PodInfo{
{
UID: "pod-a-2",
Name: "pod-a-2",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
},
{
UID: "pod-b-2",
Name: "pod-b-2",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
Expand All @@ -383,11 +405,13 @@ func TestJobOrderFn(t *testing.T) {
},
lPods: []*pod_info.PodInfo{
{
UID: "pod-a-1",
Name: "pod-a-1",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
},
{
UID: "pod-a-2",
Name: "pod-a-2",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
Expand All @@ -402,6 +426,7 @@ func TestJobOrderFn(t *testing.T) {
},
rPods: []*pod_info.PodInfo{
{
UID: "pod-a-2",
Name: "pod-a-2",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
Expand All @@ -422,11 +447,13 @@ func TestJobOrderFn(t *testing.T) {
},
lPods: []*pod_info.PodInfo{
{
UID: "pod-a-1",
Name: "pod-a-1",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
},
{
UID: "pod-a-2",
Name: "pod-a-2",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
Expand All @@ -441,6 +468,7 @@ func TestJobOrderFn(t *testing.T) {
},
rPods: []*pod_info.PodInfo{
{
UID: "pod-a-2",
Name: "pod-a-2",
Status: pod_status.Running,
ResReq: resource_info.EmptyResourceRequirements(),
Expand Down
Loading
Loading