Skip to content
This repository was archived by the owner on May 25, 2023. It is now read-only.

Commit 3f0dfd8

Browse files
committed
CreationTimestamp field introduced to JobInfo
1 parent e165255 commit 3f0dfd8

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

pkg/scheduler/api/job_info.go

+9-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package api
1818

1919
import (
2020
"fmt"
21-
21+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222
"k8s.io/api/core/v1"
2323
policyv1 "k8s.io/api/policy/v1beta1"
2424
"k8s.io/apimachinery/pkg/types"
@@ -128,6 +128,8 @@ type JobInfo struct {
128128
Allocated *Resource
129129
TotalRequest *Resource
130130

131+
CreationTimestamp metav1.Time
132+
131133
PodGroup *arbcorev1.PodGroup
132134

133135
// TODO(k82cn): keep backward compatbility, removed it when v1alpha1 finalized.
@@ -164,6 +166,7 @@ func (ji *JobInfo) SetPodGroup(pg *arbcorev1.PodGroup) {
164166
ji.Queue = QueueID(pg.Spec.Queue)
165167
}
166168

169+
ji.CreationTimestamp = pg.GetCreationTimestamp()
167170
ji.PodGroup = pg
168171
}
169172

@@ -173,6 +176,7 @@ func (ji *JobInfo) SetPDB(pdb *policyv1.PodDisruptionBudget) {
173176
ji.Namespace = pdb.Namespace
174177
ji.Queue = QueueID(pdb.Namespace)
175178

179+
ji.CreationTimestamp = pdb.GetCreationTimestamp()
176180
ji.PDB = pdb
177181
}
178182

@@ -267,14 +271,16 @@ func (ji *JobInfo) Clone() *JobInfo {
267271
NodeSelector: map[string]string{},
268272
Allocated: ji.Allocated.Clone(),
269273
TotalRequest: ji.TotalRequest.Clone(),
270-
274+
271275
PDB: ji.PDB,
272276
PodGroup: ji.PodGroup,
273-
277+
274278
TaskStatusIndex: map[TaskStatus]tasksMap{},
275279
Tasks: tasksMap{},
276280
}
277281

282+
ji.CreationTimestamp.DeepCopyInto(&info.CreationTimestamp)
283+
278284
for k, v := range ji.NodeSelector {
279285
info.NodeSelector[k] = v
280286
}

pkg/scheduler/plugins/gang/gang.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,11 @@ func (gp *gangPlugin) OnSessionOpen(ssn *framework.Session) {
120120
}
121121

122122
if !lReady && !rReady {
123-
if lv.PodGroup.GetCreationTimestamp().Time.Equal(rv.PodGroup.GetCreationTimestamp().Time) {
123+
if lv.CreationTimestamp.Equal(&rv.CreationTimestamp) {
124124
if lv.UID < rv.UID {
125125
return -1;
126126
}
127-
} else if lv.PodGroup.GetCreationTimestamp().Time.Before(rv.PodGroup.GetCreationTimestamp().Time) {
127+
} else if lv.CreationTimestamp.Before(&rv.CreationTimestamp) {
128128
return -1
129129
}
130130
return 1

0 commit comments

Comments
 (0)