Skip to content

Commit a7ad94f

Browse files
macskomacsko
committed
Unexport podRef in scheduling queue's nominator
1 parent e303808 commit a7ad94f

File tree

3 files changed

+36
-36
lines changed

3 files changed

+36
-36
lines changed

‎pkg/scheduler/internal/queue/nominator.go‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ type nominator struct {
4646
// nominatedPods is a map keyed by a node name and the value is a list of
4747
// pods which are nominated to run on the node. These are pods which can be in
4848
// the activeQ or unschedulablePods.
49-
nominatedPods map[string][]PodRef
49+
nominatedPods map[string][]podRef
5050
// nominatedPodToNode is map keyed by a Pod UID to the node name where it is
5151
// nominated.
5252
nominatedPodToNode map[types.UID]string
@@ -55,7 +55,7 @@ type nominator struct {
5555
func newPodNominator(podLister listersv1.PodLister) *nominator {
5656
return &nominator{
5757
podLister: podLister,
58-
nominatedPods: make(map[string][]PodRef),
58+
nominatedPods: make(map[string][]podRef),
5959
nominatedPodToNode: make(map[types.UID]string),
6060
}
6161
}
@@ -100,12 +100,12 @@ func (npm *nominator) addNominatedPodUnlocked(logger klog.Logger, pi *framework.
100100

101101
npm.nominatedPodToNode[pi.Pod.UID] = nodeName
102102
for _, np := range npm.nominatedPods[nodeName] {
103-
if np.UID == pi.Pod.UID {
104-
logger.V(4).Info("Pod already exists in the nominator", "pod", np.UID)
103+
if np.uid == pi.Pod.UID {
104+
logger.V(4).Info("Pod already exists in the nominator", "pod", np.uid)
105105
return
106106
}
107107
}
108-
npm.nominatedPods[nodeName] = append(npm.nominatedPods[nodeName], PodToRef(pi.Pod))
108+
npm.nominatedPods[nodeName] = append(npm.nominatedPods[nodeName], podToRef(pi.Pod))
109109
}
110110

111111
// UpdateNominatedPod updates the <oldPod> with <newPod>.
@@ -148,7 +148,7 @@ func (npm *nominator) deleteUnlocked(p *v1.Pod) {
148148
return
149149
}
150150
for i, np := range npm.nominatedPods[nnn] {
151-
if np.UID == p.UID {
151+
if np.uid == p.UID {
152152
npm.nominatedPods[nnn] = append(npm.nominatedPods[nnn][:i], npm.nominatedPods[nnn][i+1:]...)
153153
if len(npm.nominatedPods[nnn]) == 0 {
154154
delete(npm.nominatedPods, nnn)
@@ -159,7 +159,7 @@ func (npm *nominator) deleteUnlocked(p *v1.Pod) {
159159
delete(npm.nominatedPodToNode, p.UID)
160160
}
161161

162-
func (npm *nominator) nominatedPodsForNode(nodeName string) []PodRef {
162+
func (npm *nominator) nominatedPodsForNode(nodeName string) []podRef {
163163
npm.nLock.RLock()
164164
defer npm.nLock.RUnlock()
165165
return slices.Clone(npm.nominatedPods[nodeName])
@@ -170,26 +170,26 @@ func nominatedNodeName(pod *v1.Pod) string {
170170
return pod.Status.NominatedNodeName
171171
}
172172

173-
type PodRef struct {
174-
Name string
175-
Namespace string
176-
UID types.UID
173+
type podRef struct {
174+
name string
175+
namespace string
176+
uid types.UID
177177
}
178178

179-
func PodToRef(pod *v1.Pod) PodRef {
180-
return PodRef{
181-
Name: pod.Name,
182-
Namespace: pod.Namespace,
183-
UID: pod.UID,
179+
func podToRef(pod *v1.Pod) podRef {
180+
return podRef{
181+
name: pod.Name,
182+
namespace: pod.Namespace,
183+
uid: pod.UID,
184184
}
185185
}
186186

187-
func (np PodRef) ToPod() *v1.Pod {
187+
func (np podRef) toPod() *v1.Pod {
188188
return &v1.Pod{
189189
ObjectMeta: metav1.ObjectMeta{
190-
Name: np.Name,
191-
Namespace: np.Namespace,
192-
UID: np.UID,
190+
Name: np.name,
191+
Namespace: np.namespace,
192+
UID: np.uid,
193193
},
194194
}
195195
}

‎pkg/scheduler/internal/queue/scheduling_queue.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1174,8 +1174,8 @@ func (p *PriorityQueue) PendingPods() ([]*v1.Pod, string) {
11741174
}
11751175

11761176
// Note: this function assumes the caller locks both p.lock.RLock and p.activeQ.getLock().RLock.
1177-
func (p *PriorityQueue) nominatedPodToInfo(np PodRef) *framework.PodInfo {
1178-
pod := np.ToPod()
1177+
func (p *PriorityQueue) nominatedPodToInfo(np podRef) *framework.PodInfo {
1178+
pod := np.toPod()
11791179
pInfoLookup := newQueuedPodInfoForLookup(pod)
11801180

11811181
queuedPodInfo, exists := p.activeQ.unlocked().Get(pInfoLookup)

‎pkg/scheduler/internal/queue/scheduling_queue_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ var (
8383
)
8484

8585
nominatorCmpOpts = []cmp.Option{
86-
cmp.AllowUnexported(nominator{}),
86+
cmp.AllowUnexported(nominator{}, podRef{}),
8787
cmpopts.IgnoreFields(nominator{}, "podLister", "nLock"),
8888
}
8989

@@ -129,8 +129,8 @@ func TestPriorityQueue_Add(t *testing.T) {
129129
medPriorityPodInfo.Pod.UID: "node1",
130130
unschedulablePodInfo.Pod.UID: "node1",
131131
},
132-
nominatedPods: map[string][]PodRef{
133-
"node1": {PodToRef(medPriorityPodInfo.Pod), PodToRef(unschedulablePodInfo.Pod)},
132+
nominatedPods: map[string][]podRef{
133+
"node1": {podToRef(medPriorityPodInfo.Pod), podToRef(unschedulablePodInfo.Pod)},
134134
},
135135
}
136136
if diff := cmp.Diff(q.nominator, expectedNominatedPods, nominatorCmpOpts...); diff != "" {
@@ -2118,10 +2118,10 @@ func TestPriorityQueue_UpdateNominatedPodForNode(t *testing.T) {
21182118
highPriorityPodInfo.Pod.UID: "node2",
21192119
unschedulablePodInfo.Pod.UID: "node5",
21202120
},
2121-
nominatedPods: map[string][]PodRef{
2122-
"node1": {PodToRef(medPriorityPodInfo.Pod)},
2123-
"node2": {PodToRef(highPriorityPodInfo.Pod)},
2124-
"node5": {PodToRef(unschedulablePodInfo.Pod)},
2121+
nominatedPods: map[string][]podRef{
2122+
"node1": {podToRef(medPriorityPodInfo.Pod)},
2123+
"node2": {podToRef(highPriorityPodInfo.Pod)},
2124+
"node5": {podToRef(unschedulablePodInfo.Pod)},
21252125
},
21262126
}
21272127
if diff := cmp.Diff(q.nominator, expectedNominatedPods, nominatorCmpOpts...); diff != "" {
@@ -2143,10 +2143,10 @@ func TestPriorityQueue_UpdateNominatedPodForNode(t *testing.T) {
21432143
highPriorityPodInfo.Pod.UID: "node4",
21442144
unschedulablePodInfo.Pod.UID: "node5",
21452145
},
2146-
nominatedPods: map[string][]PodRef{
2147-
"node1": {PodToRef(medPriorityPodInfo.Pod)},
2148-
"node4": {PodToRef(highPriorityPodInfo.Pod)},
2149-
"node5": {PodToRef(unschedulablePodInfo.Pod)},
2146+
nominatedPods: map[string][]podRef{
2147+
"node1": {podToRef(medPriorityPodInfo.Pod)},
2148+
"node4": {podToRef(highPriorityPodInfo.Pod)},
2149+
"node5": {podToRef(unschedulablePodInfo.Pod)},
21502150
},
21512151
}
21522152
if diff := cmp.Diff(q.nominator, expectedNominatedPods, nominatorCmpOpts...); diff != "" {
@@ -2176,9 +2176,9 @@ func TestPriorityQueue_UpdateNominatedPodForNode(t *testing.T) {
21762176
medPriorityPodInfo.Pod.UID: "node1",
21772177
unschedulablePodInfo.Pod.UID: "node5",
21782178
},
2179-
nominatedPods: map[string][]PodRef{
2180-
"node1": {PodToRef(medPriorityPodInfo.Pod)},
2181-
"node5": {PodToRef(unschedulablePodInfo.Pod)},
2179+
nominatedPods: map[string][]podRef{
2180+
"node1": {podToRef(medPriorityPodInfo.Pod)},
2181+
"node5": {podToRef(unschedulablePodInfo.Pod)},
21822182
},
21832183
}
21842184
if diff := cmp.Diff(q.nominator, expectedNominatedPods, nominatorCmpOpts...); diff != "" {

0 commit comments

Comments
 (0)