apf: calculation of dR/dt should use seats in use
Kubernetes-commit: 6203d4fc6af36b1fd60177e8a88b8d4d45acb029
This commit is contained in:
parent
922627e1e3
commit
e9708ba84d
|
|
@ -413,9 +413,9 @@ func (qs *queueSet) syncTimeLocked() {
|
||||||
// been advancing, according to the logic in `doc.go`.
|
// been advancing, according to the logic in `doc.go`.
|
||||||
func (qs *queueSet) getVirtualTimeRatioLocked() float64 {
|
func (qs *queueSet) getVirtualTimeRatioLocked() float64 {
|
||||||
activeQueues := 0
|
activeQueues := 0
|
||||||
reqs := 0
|
seatsInUse := 0
|
||||||
for _, queue := range qs.queues {
|
for _, queue := range qs.queues {
|
||||||
reqs += queue.requestsExecuting
|
seatsInUse += queue.seatsInUse
|
||||||
if queue.requests.Length() > 0 || queue.requestsExecuting > 0 {
|
if queue.requests.Length() > 0 || queue.requestsExecuting > 0 {
|
||||||
activeQueues++
|
activeQueues++
|
||||||
}
|
}
|
||||||
|
|
@ -423,7 +423,7 @@ func (qs *queueSet) getVirtualTimeRatioLocked() float64 {
|
||||||
if activeQueues == 0 {
|
if activeQueues == 0 {
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
return math.Min(float64(reqs), float64(qs.dCfg.ConcurrencyLimit)) / float64(activeQueues)
|
return math.Min(float64(seatsInUse), float64(qs.dCfg.ConcurrencyLimit)) / float64(activeQueues)
|
||||||
}
|
}
|
||||||
|
|
||||||
// timeoutOldRequestsAndRejectOrEnqueueLocked encapsulates the logic required
|
// timeoutOldRequestsAndRejectOrEnqueueLocked encapsulates the logic required
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue