kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use build-in max and min func to instead of k8s.io/utils/integer funcs 

Kubernetes-commit: eb8f3f194fed16484162aebdaab69168e02f8cb4
This commit is contained in:
weilaaa 2023-12-15 15:09:11 +08:00 committed by Kubernetes Publisher
parent 78157c73d3
commit febd537a31
2 changed files with 4 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/storage/cacher/util.go
View File

@ -44,17 +44,3 @@ func hasPathPrefix(s, pathPrefix string) bool {
} }
return false return false
} }
func max(a, b int) int {
if a > b {
return a
}
return b
}
func min(a, b int) int {
if a < b {
return a
}
return b
}

22
pkg/util/flowcontrol/fairqueuing/queueset/queueset.go
View File

@ -792,11 +792,11 @@ func (qs *queueSet) findDispatchQueueToBoundLocked() (*queue, *request) {
queue := qs.queues[qs.robinIndex] queue := qs.queues[qs.robinIndex]
oldestWaiting, _ := queue.requestsWaiting.Peek() oldestWaiting, _ := queue.requestsWaiting.Peek()
if oldestWaiting != nil { if oldestWaiting != nil {
sMin = ssMin(sMin, queue.nextDispatchR) sMin = min(sMin, queue.nextDispatchR)
sMax = ssMax(sMax, queue.nextDispatchR) sMax = max(sMax, queue.nextDispatchR)
estimatedWorkInProgress := fqrequest.SeatsTimesDuration(float64(queue.seatsInUse), qs.estimatedServiceDuration) estimatedWorkInProgress := fqrequest.SeatsTimesDuration(float64(queue.seatsInUse), qs.estimatedServiceDuration)
dsMin = ssMin(dsMin, queue.nextDispatchR-estimatedWorkInProgress) dsMin = min(dsMin, queue.nextDispatchR-estimatedWorkInProgress)
dsMax = ssMax(dsMax, queue.nextDispatchR-estimatedWorkInProgress) dsMax = max(dsMax, queue.nextDispatchR-estimatedWorkInProgress)
currentVirtualFinish := queue.nextDispatchR + oldestWaiting.totalWork() currentVirtualFinish := queue.nextDispatchR + oldestWaiting.totalWork()
klog.V(11).InfoS("Considering queue to dispatch", "queueSet", qs.qCfg.Name, "queue", qs.robinIndex, "finishR", currentVirtualFinish) klog.V(11).InfoS("Considering queue to dispatch", "queueSet", qs.qCfg.Name, "queue", qs.robinIndex, "finishR", currentVirtualFinish)
if currentVirtualFinish < minVirtualFinish { if currentVirtualFinish < minVirtualFinish {
@ -848,20 +848,6 @@ func (qs *queueSet) findDispatchQueueToBoundLocked() (*queue, *request) {
return minQueue, oldestReqFromMinQueue return minQueue, oldestReqFromMinQueue
} }
func ssMin(a, b fqrequest.SeatSeconds) fqrequest.SeatSeconds {
if a > b {
return b
}
return a
}
func ssMax(a, b fqrequest.SeatSeconds) fqrequest.SeatSeconds {
if a < b {
return b
}
return a
}
// finishRequestAndDispatchAsMuchAsPossible is a convenience method // finishRequestAndDispatchAsMuchAsPossible is a convenience method
// which calls finishRequest for a given request and then dispatches // which calls finishRequest for a given request and then dispatches
// as many requests as possible. This is all of what needs to be done // as many requests as possible. This is all of what needs to be done