Skip to content

Commit 967c3a7

Browse files
itsomriitsomri
authored
Fixed unnecessary string evaluations (#387)
1 parent 241ea6c commit 967c3a7

File tree

7 files changed

+38
-38
lines changed

7 files changed

+38
-38
lines changed

‎pkg/binder/plugins/k8s-plugins/volumebinding/volume_binding.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ func (vb *volumeBindingPlugin) IsRelevant(pod *corev1.Pod) bool {
4949
func (vb *volumeBindingPlugin) PreFilter(ctx context.Context, pod *corev1.Pod, state plugins.State) (error, bool) {
5050
logger := log.FromContext(ctx)
5151
result, status := vb.binding.PreFilter(ctx, state, pod)
52-
logger.V(2).Info(fmt.Sprintf("PreFilter for pod %s/%s. result: %v status code: %v",
53-
pod.Namespace, pod.Name, result, status.Code().String()))
52+
logger.V(2).Info(fmt.Sprintf("PreFilter for pod %s/%s. result: %v status code: %s",
53+
pod.Namespace, pod.Name, result, status.Code()))
5454
return status.AsError(), status.IsSkip()
5555
}
5656

@@ -63,8 +63,8 @@ func (vb *volumeBindingPlugin) Filter(
6363
nodeInfo.SetNode(node)
6464

6565
status := vb.binding.Filter(ctx, state, pod, nodeInfo)
66-
logger.V(2).Info(fmt.Sprintf("Filter for pod %s/%s and node %s. status code: %v",
67-
pod.Namespace, pod.Name, node.Name, status.Code().String()))
66+
logger.V(2).Info(fmt.Sprintf("Filter for pod %s/%s and node %s. status code: %s",
67+
pod.Namespace, pod.Name, node.Name, status.Code()))
6868

6969
return status.AsError()
7070
}
@@ -75,8 +75,8 @@ func (vb *volumeBindingPlugin) Allocate(
7575
) error {
7676
logger := log.FromContext(ctx)
7777
status := vb.binding.Reserve(ctx, state, pod, hostname)
78-
logger.V(2).Info(fmt.Sprintf("Reserve for pod %s/%s and node %s. status code: %v",
79-
pod.Namespace, pod.Name, hostname, status.Code().String()))
78+
logger.V(2).Info(fmt.Sprintf("Reserve for pod %s/%s and node %s. status code: %s",
79+
pod.Namespace, pod.Name, hostname, status.Code()))
8080
return status.AsError()
8181
}
8282

@@ -96,8 +96,8 @@ func (vb *volumeBindingPlugin) Bind(
9696
) error {
9797
logger := log.FromContext(ctx)
9898
status := vb.binding.PreBind(ctx, state, pod, request.Spec.SelectedNode)
99-
logger.V(2).Info(fmt.Sprintf("PreBind for pod %s/%s and node %s. status code: %v",
100-
pod.Namespace, pod.Name, pod.Spec.NodeName, status.Code().String()))
99+
logger.V(2).Info(fmt.Sprintf("PreBind for pod %s/%s and node %s. status code: %s",
100+
pod.Namespace, pod.Name, pod.Spec.NodeName, status.Code()))
101101
return status.AsError()
102102
}
103103

‎pkg/scheduler/api/unschedule_info.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ func GetReclaimMessage(reclaimeeTask *pod_info.PodInfo, reclaimerJob *podgroup_i
100100

101101
func GetReclaimQueueDetailsMessage(queueName string, queueAllocated *resource_info.ResourceRequirements,
102102
queueQuota *resource_info.ResourceRequirements, queueFairShare *resource_info.ResourceRequirements, queuePriority int) string {
103-
return fmt.Sprintf("%s uses <%v> with a quota of <%v>, fair-share of <%v> and queue priority of <%d>.",
104-
queueName, queueAllocated.String(), queueQuota.String(), queueFairShare.String(), queuePriority)
103+
return fmt.Sprintf("%s uses <%s> with a quota of <%s>, fair-share of <%s> and queue priority of <%d>.",
104+
queueName, queueAllocated, queueQuota, queueFairShare, queuePriority)
105105
}
106106

107107
func GetConsolidateMessage(preempteeTask *pod_info.PodInfo) string {

‎pkg/scheduler/plugins/proportion/proportion.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,8 @@ func (pp *proportionPlugin) calculateResourcesProportion(ssn *framework.Session)
202202

203203
pp.setTotalResources(ssn)
204204
pp.createQueueAttributes(ssn)
205-
log.InfraLogger.V(3).Infof("Total allocatable resources are <%v>, number of nodes: <%v>, number of "+
206-
"queues: <%v>", pp.totalResource.String(), len(ssn.Nodes), len(pp.queues))
205+
log.InfraLogger.V(3).Infof("Total allocatable resources are <%s>, number of nodes: <%d>, number of "+
206+
"queues: <%d>", pp.totalResource, len(ssn.Nodes), len(pp.queues))
207207
}
208208

209209
func (pp *proportionPlugin) setTotalResources(ssn *framework.Session) {
@@ -416,7 +416,7 @@ func (pp *proportionPlugin) allocateHandlerFn(ssn *framework.Session) func(event
416416
}
417417

418418
leafQueue := pp.queues[job.Queue]
419-
log.InfraLogger.V(7).Infof("Proportion AllocateFunc: job <%v/%v>, task resources <%v>, "+
419+
log.InfraLogger.V(7).Infof("Proportion AllocateFunc: job <%v/%v>, task resources <%s>, "+
420420
"queue: <%v>, queue allocated resources: <%v>",
421421
job.Namespace, job.Name, taskResources, leafQueue.Name, leafQueue.GetAllocatedShare())
422422
}
@@ -440,9 +440,9 @@ func (pp *proportionPlugin) deallocateHandlerFn(ssn *framework.Session) func(eve
440440
}
441441

442442
leafQueue := pp.queues[job.Queue]
443-
log.InfraLogger.V(7).Infof("Proportion DeallocateFunc: job <%v/%v>, task resources <%v>, "+
443+
log.InfraLogger.V(7).Infof("Proportion DeallocateFunc: job <%v/%v>, task resources <%s>, "+
444444
"queue: <%v>, queue allocated resources: <%v>",
445-
job.Namespace, job.Name, taskResources.String(), leafQueue.Name, leafQueue.GetAllocatedShare())
445+
job.Namespace, job.Name, taskResources, leafQueue.Name, leafQueue.GetAllocatedShare())
446446
}
447447
}
448448

‎pkg/scheduler/plugins/proportion/reclaimable/reclaimable.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@ func (r *Reclaimable) reclaimResourcesFromReclaimees(
8787
for _, reclaimeeResources := range reclaimeeQueueReclaimedResources {
8888
if !strategies.FitsReclaimStrategy(reclaimer.RequiredResources, reclaimerQueue, reclaimeeQueue,
8989
remainingResources) {
90-
log.InfraLogger.V(7).Infof("queue <%s>，shouldn't be reclaimed, for %v resources"+
91-
" remaining reosurces: <%v>, deserved: <%v>, fairShare: <%v>",
90+
log.InfraLogger.V(7).Infof("queue <%s>，shouldn't be reclaimed, for %s resources"+
91+
" remaining reosurces: <%s>, deserved: <%s>, fairShare: <%s>",
9292
reclaimeeQueue.Name, resource_info.StringResourceArray(reclaimeeQueueReclaimedResources),
93-
remainingResources.String(), reclaimeeQueue.GetDeservedShare().String(),
94-
reclaimeeQueue.GetFairShare().String())
93+
remainingResources, reclaimeeQueue.GetDeservedShare(),
94+
reclaimeeQueue.GetFairShare())
9595
return false, nil, nil
9696
}
9797

@@ -178,9 +178,9 @@ func (r *Reclaimable) reclaimingQueuesRemainWithinBoundaries(
178178
if !allocatedNonPreemptible.LessEqual(reclaimingQueue.GetDeservedShare()) {
179179
log.InfraLogger.V(5).Infof("Failed to reclaim resources for: <%s/%s> in queue <%s>. "+
180180
"Queue will have nonpreemtible jobs over quota and reclaimer job is an interactive job. "+
181-
"Queue quota: %v, queue allocated nonpreemtible resources with task: %v",
182-
reclaimer.Namespace, reclaimer.Name, reclaimingQueue.Name, reclaimingQueue.GetDeservedShare().String(),
183-
allocatedNonPreemptible.String())
181+
"Queue quota: %s, queue allocated nonpreemtible resources with task: %s",
182+
reclaimer.Namespace, reclaimer.Name, reclaimingQueue.Name, reclaimingQueue.GetDeservedShare(),
183+
allocatedNonPreemptible)
184184
return false
185185
}
186186
}

‎pkg/scheduler/plugins/proportion/reclaimable/strategies/strategies.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ func (mfss *MaintainFairShareStrategy) Reclaimable(
4646
reclaimeeRemainingShare rs.ResourceQuantities) bool {
4747
// This strategy allows to reclaim if reclaimee is currently over allowed fair share
4848

49-
log.InfraLogger.V(6).Infof("Checking if reclaim is possible for reclaimer <%v> and reclaimee <%v> in order "+
50-
"to maintain fair share. Reclaimee requested: <%v>, deserved: <%v>, fairShare: <%v>, "+
51-
"reclaimeeRemainingShare: <%v>",
52-
reclaimerQueue.Name, reclaimeeQueue.Name, reclaimeeQueue.GetRequestableShare().String(), reclaimeeQueue.GetDeservedShare().String(),
53-
reclaimeeQueue.GetFairShare().String(), reclaimeeRemainingShare.String())
49+
log.InfraLogger.V(6).Infof("Checking if reclaim is possible for reclaimer <%s> and reclaimee <%s> in order "+
50+
"to maintain fair share. Reclaimee requested: <%s>, deserved: <%s>, fairShare: <%s>, "+
51+
"reclaimeeRemainingShare: <%s>",
52+
reclaimerQueue.Name, reclaimeeQueue.Name, reclaimeeQueue.GetRequestableShare(), reclaimeeQueue.GetDeservedShare(),
53+
reclaimeeQueue.GetFairShare(), reclaimeeRemainingShare)
5454

5555
return !reclaimeeRemainingShare.LessEqual(reclaimeeQueue.GetAllocatableShare())
5656
}
@@ -62,13 +62,13 @@ func (gdqs *GuaranteeDeservedQuotaStrategy) Reclaimable(
6262
reclaimeeRemainingShare rs.ResourceQuantities) bool {
6363
// This strategy allows to reclaim if reclaimer is under deserved quota ("starved") and reclaimer is above quota
6464

65-
log.InfraLogger.V(6).Infof("Checking if reclaim is possible for reclaimer <%v> and reclaimee <%v> in order to "+
65+
log.InfraLogger.V(6).Infof("Checking if reclaim is possible for reclaimer <%s> and reclaimee <%s> in order to "+
6666
"Guarantee deserved quota. "+
67-
"Reclaimee requested: <%v>, deserved: <%v>, fairShare: <%v>, reclaimeeRemainingShare: <%v> "+
68-
"Reclaimer requested: <%v>, deserved: <%v>, fairShare: <%v>",
69-
reclaimerQueue.Name, reclaimeeQueue.Name, reclaimeeQueue.GetRequestableShare().String(), reclaimeeQueue.GetDeservedShare().String(),
70-
reclaimeeQueue.GetFairShare().String(), reclaimeeRemainingShare.String(), reclaimerQueue.GetRequestableShare().String(),
71-
reclaimerQueue.GetDeservedShare().String(), reclaimerQueue.GetFairShare().String())
67+
"Reclaimee requested: <%s>, deserved: <%s>, fairShare: <%s>, reclaimeeRemainingShare: <%s> "+
68+
"Reclaimer requested: <%s>, deserved: <%s>, fairShare: <%s>",
69+
reclaimerQueue.Name, reclaimeeQueue.Name, reclaimeeQueue.GetRequestableShare(), reclaimeeQueue.GetDeservedShare(),
70+
reclaimeeQueue.GetFairShare(), reclaimeeRemainingShare, reclaimerQueue.GetRequestableShare(),
71+
reclaimerQueue.GetDeservedShare(), reclaimerQueue.GetFairShare())
7272

7373
// reclaimer has to be under (or equal) deserved quota in all resources (cpu, mem, gpu)
7474
if reclaimerWillGoOverQuota(reclaimerResources, reclaimerQueue) {

‎pkg/scheduler/test_utils/test_utils.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,20 +123,20 @@ func MatchExpectedAndRealTasks(t *testing.T, testNumber int, testMetadata TestTo
123123
var sumOfJobRequestedGPU, sumOfJobRequestedMillisCpu, sumOfJobRequestedMemory, sumOfAcceptedGpus float64
124124
job, found := ssn.PodGroupInfos[common_info.PodGroupID(jobName)]
125125
if !found {
126-
t.Errorf("Test number: %d, name: %v, has failed. Couldn't find job: %v for expected tasks.", testNumber, testMetadata.Name, jobName)
126+
t.Errorf("Test number: %d, name: %s, has failed. Couldn't find job: %s for expected tasks.", testNumber, testMetadata.Name, jobName)
127127
}
128128
for _, taskInfo := range ssn.PodGroupInfos[common_info.PodGroupID(jobName)].GetAllPodsMap() {
129129

130130
if taskInfo.Status != jobExpectedResult.Status {
131-
t.Errorf("Test number: %d, name: %v, has failed. Task name: %v, actual uses status: %v, was expecting status: %v", testNumber, testMetadata.Name, taskInfo.Name, taskInfo.Status, jobExpectedResult.Status.String())
131+
t.Errorf("Test number: %d, name: %s, has failed. Task name: %s, actual uses status: %s, was expecting status: %s", testNumber, testMetadata.Name, taskInfo.Name, taskInfo.Status, jobExpectedResult.Status)
132132
if jobExpectedResult.Status == pod_status.Running {
133133
t.Errorf("%v", job.JobFitErrors)
134134
t.Errorf("%v", job.NodesFitErrors)
135135
}
136136
}
137137

138138
if len(jobExpectedResult.NodeName) > 0 && taskInfo.NodeName != jobExpectedResult.NodeName {
139-
t.Errorf("Test number: %d, name: %v, has failed. Task name: %v, actual uses node: %v, was expecting node: %v", testNumber, testMetadata.Name, taskInfo.Name, taskInfo.NodeName, jobExpectedResult.NodeName)
139+
t.Errorf("Test number: %d, name: %s, has failed. Task name: %s, actual uses node: %s, was expecting node: %s", testNumber, testMetadata.Name, taskInfo.Name, taskInfo.NodeName, jobExpectedResult.NodeName)
140140
}
141141

142142
sumOfJobRequestedGPU += taskInfo.ResReq.GPUs()

‎test/e2e/modules/resources/capacity/validators.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ func SkipIfInsufficientClusterResources(clientset kubernetes.Interface, resource
2929
ginkgo.Skip(
3030
fmt.Sprintf(
3131
"The current cluster doesn't have enough resources to run the test. "+
32-
"Requested resources: %v. Cluster resources: %v",
33-
resourceRequest.String(), clusterMetrics.String(),
32+
"Requested resources: %s. Cluster resources: %s",
33+
resourceRequest, clusterMetrics,
3434
),
3535
)
3636
}

0 commit comments

Comments
 (0)