Skip to content

Commit 8abd329

Browse files
committed
Arrange setPodGroup for subGroups
1 parent cc5f790 commit 8abd329

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

pkg/scheduler/api/podgroup_info/job_info.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,20 +164,19 @@ func (pgi *PodGroupInfo) SetPodGroup(pg *enginev2alpha2.PodGroup) {
164164
pgi.Name = pg.Name
165165
pgi.Namespace = pg.Namespace
166166
pgi.NamespacedName = fmt.Sprintf("%s/%s", pgi.Namespace, pgi.Name)
167+
pgi.Queue = common_info.QueueID(pg.Spec.Queue)
168+
pgi.CreationTimestamp = pg.GetCreationTimestamp()
169+
pgi.PodGroup = pg
170+
pgi.PodGroupUID = pg.UID
171+
167172
if len(pg.Spec.SubGroups) == 0 {
168173
if pgi.SubGroups == nil {
169174
pgi.SubGroups = map[string]*SubGroupInfo{}
170175
}
171-
172176
if _, exists := pgi.SubGroups[DefaultSubGroup]; !exists {
173177
pgi.SubGroups[DefaultSubGroup] = NewSubGroupInfo(DefaultSubGroup, max(pg.Spec.MinMember, 1))
174178
}
175179
}
176-
pgi.Queue = common_info.QueueID(pg.Spec.Queue)
177-
pgi.CreationTimestamp = pg.GetCreationTimestamp()
178-
pgi.PodGroup = pg
179-
pgi.PodGroupUID = pg.UID
180-
181180
for _, sg := range pg.Spec.SubGroups {
182181
subGroupInfo := FromSubGroup(&sg)
183182
pgi.SubGroups[subGroupInfo.name] = subGroupInfo

pkg/scheduler/cache/cluster_info/cluster_info_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -980,7 +980,9 @@ func TestSnapshotPodGroups(t *testing.T) {
980980
Queue: "queue-0",
981981
SubGroups: map[string]*podgroup_info.SubGroupInfo{
982982
podgroup_info.DefaultSubGroup: podgroup_info.NewSubGroupInfo(podgroup_info.DefaultSubGroup, 1).WithPodInfos(pod_info.PodsMap{
983-
"test-pod": {},
983+
"test-pod": {
984+
UID: "test-pod",
985+
},
984986
}),
985987
},
986988
},

0 commit comments

Comments
 (0)