Skip to content

Commit c0e0cbf

Browse files
committed
fixup: pass in context if possible
1 parent 2242c3f commit c0e0cbf

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

pkg/coscheduling/core/core.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ const (
5454
type Manager interface {
5555
PreFilter(context.Context, *corev1.Pod) error
5656
Permit(context.Context, *corev1.Pod) Status
57-
GetPodGroup(*corev1.Pod) (string, *v1alpha1.PodGroup)
57+
GetPodGroup(context.Context, *corev1.Pod) (string, *v1alpha1.PodGroup)
5858
GetCreationTimestamp(*corev1.Pod, time.Time) time.Time
5959
DeletePermittedPodGroup(string)
6060
CalculateAssignedPods(string, string) int
@@ -143,7 +143,7 @@ func (pgMgr *PodGroupManager) ActivateSiblings(pod *corev1.Pod, state *framework
143143
// that is required to be scheduled.
144144
func (pgMgr *PodGroupManager) PreFilter(ctx context.Context, pod *corev1.Pod) error {
145145
klog.V(5).InfoS("Pre-filter", "pod", klog.KObj(pod))
146-
pgFullName, pg := pgMgr.GetPodGroup(pod)
146+
pgFullName, pg := pgMgr.GetPodGroup(ctx, pod)
147147
if pg == nil {
148148
return nil
149149
}
@@ -194,7 +194,7 @@ func (pgMgr *PodGroupManager) PreFilter(ctx context.Context, pod *corev1.Pod) er
194194

195195
// Permit permits a pod to run, if the minMember match, it would send a signal to chan.
196196
func (pgMgr *PodGroupManager) Permit(ctx context.Context, pod *corev1.Pod) Status {
197-
pgFullName, pg := pgMgr.GetPodGroup(pod)
197+
pgFullName, pg := pgMgr.GetPodGroup(ctx, pod)
198198
if pgFullName == "" {
199199
return PodGroupNotSpecified
200200
}
@@ -231,13 +231,13 @@ func (pgMgr *PodGroupManager) DeletePermittedPodGroup(pgFullName string) {
231231
}
232232

233233
// GetPodGroup returns the PodGroup that a Pod belongs to in cache.
234-
func (pgMgr *PodGroupManager) GetPodGroup(pod *corev1.Pod) (string, *v1alpha1.PodGroup) {
234+
func (pgMgr *PodGroupManager) GetPodGroup(ctx context.Context, pod *corev1.Pod) (string, *v1alpha1.PodGroup) {
235235
pgName := util.GetPodGroupLabel(pod)
236236
if len(pgName) == 0 {
237237
return "", nil
238238
}
239239
var pg v1alpha1.PodGroup
240-
if err := pgMgr.client.Get(context.Background(), types.NamespacedName{Namespace: pod.Namespace, Name: pgName}, &pg); err != nil {
240+
if err := pgMgr.client.Get(ctx, types.NamespacedName{Namespace: pod.Namespace, Name: pgName}, &pg); err != nil {
241241
return fmt.Sprintf("%v/%v", pod.Namespace, pgName), nil
242242
}
243243
return fmt.Sprintf("%v/%v", pod.Namespace, pgName), &pg

pkg/coscheduling/coscheduling.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ func (cs *Coscheduling) PreFilter(ctx context.Context, state *framework.CycleSta
147147
// PostFilter is used to reject a group of pods if a pod does not pass PreFilter or Filter.
148148
func (cs *Coscheduling) PostFilter(ctx context.Context, state *framework.CycleState, pod *v1.Pod,
149149
filteredNodeStatusMap framework.NodeToStatusMap) (*framework.PostFilterResult, *framework.Status) {
150-
pgName, pg := cs.pgMgr.GetPodGroup(pod)
150+
pgName, pg := cs.pgMgr.GetPodGroup(ctx, pod)
151151
if pg == nil {
152152
klog.V(4).InfoS("Pod does not belong to any group", "pod", klog.KObj(pod))
153153
return &framework.PostFilterResult{}, framework.NewStatus(framework.Unschedulable, "can not find pod group")
@@ -209,7 +209,7 @@ func (cs *Coscheduling) Permit(ctx context.Context, state *framework.CycleState,
209209
return framework.NewStatus(framework.Unschedulable, "PodGroup not found"), 0
210210
case core.Wait:
211211
klog.InfoS("Pod is waiting to be scheduled to node", "pod", klog.KObj(pod), "nodeName", nodeName)
212-
_, pg := cs.pgMgr.GetPodGroup(pod)
212+
_, pg := cs.pgMgr.GetPodGroup(ctx, pod)
213213
if wait := util.GetWaitTimeDuration(pg, cs.scheduleTimeout); wait != 0 {
214214
waitTime = wait
215215
}
@@ -239,7 +239,7 @@ func (cs *Coscheduling) Reserve(ctx context.Context, state *framework.CycleState
239239

240240
// Unreserve rejects all other Pods in the PodGroup when one of the pods in the group times out.
241241
func (cs *Coscheduling) Unreserve(ctx context.Context, state *framework.CycleState, pod *v1.Pod, nodeName string) {
242-
pgName, pg := cs.pgMgr.GetPodGroup(pod)
242+
pgName, pg := cs.pgMgr.GetPodGroup(ctx, pod)
243243
if pg == nil {
244244
return
245245
}

pkg/coscheduling/coscheduling_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ func TestPodGroupBackoffTime(t *testing.T) {
163163
t.Errorf("expected %v, got %v", tt.want, code.Code())
164164
return
165165
}
166-
pgFullName, _ := pgMgr.GetPodGroup(tt.pods[0])
166+
pgFullName, _ := pgMgr.GetPodGroup(ctx, tt.pods[0])
167167
if code.Reasons()[0] != fmt.Sprintf("podGroup %v failed recently", pgFullName) {
168168
t.Errorf("expected %v, got %v", pgFullName, code.Reasons()[0])
169169
return

0 commit comments

Comments
 (0)