apf: include seats in use in queue dump

This commit is contained in:
Abu Kashem 2021-10-13 10:39:37 -04:00
parent 3ef5752edf
commit edf657a33a
No known key found for this signature in database
GPG Key ID: 33A4FA7088DB68A9

View File

@ -19,7 +19,6 @@ package flowcontrol
import (
"fmt"
"io"
"k8s.io/apiserver/pkg/util/flowcontrol/debug"
"net/http"
"strconv"
"strings"
@ -103,10 +102,11 @@ func (cfgCtlr *configController) dumpQueues(w http.ResponseWriter, r *http.Reque
"Index", // 2
"PendingRequests", // 3
"ExecutingRequests", // 4
"NextDispatchR", // 5
"InitialSeatsSum", // 6
"MaxSeatsSum", // 7
"TotalWorkSum", // 8
"SeatsInUse", // 5
"NextDispatchR", // 6
"InitialSeatsSum", // 7
"MaxSeatsSum", // 8
"TotalWorkSum", // 9
}
tabPrint(tabWriter, rowForHeaders(columnHeaders))
endLine(tabWriter)
@ -121,19 +121,23 @@ func (cfgCtlr *configController) dumpQueues(w http.ResponseWriter, r *http.Reque
"<none>", // 6
"<none>", // 7
"<none>", // 8
"<none>", // 9
))
endLine(tabWriter)
continue
}
queueSetDigest := plState.queues.Dump(false)
for i, q := range queueSetDigest.Queues {
tabPrint(tabWriter, rowForQueue(
plState.pl.Name, // 1
i, // 2
len(q.Requests), // 3
q.ExecutingRequests, // 4
q.NextDispatchR, // 5
q.QueueSum, // 6, 7, 8
tabPrint(tabWriter, row(
plState.pl.Name, // 1 - "PriorityLevelName"
strconv.Itoa(i), // 2 - "Index"
strconv.Itoa(len(q.Requests)), // 3 - "PendingRequests"
strconv.Itoa(q.ExecutingRequests), // 4 - "ExecutingRequests"
strconv.Itoa(q.SeatsInUse), // 5 - "SeatsInUse"
q.NextDispatchR, // 6 - "NextDispatchR"
strconv.Itoa(q.QueueSum.InitialSeatsSum), // 7 - "InitialSeatsSum"
strconv.Itoa(q.QueueSum.MaxSeatsSum), // 8 - "MaxSeatsSum"
q.QueueSum.TotalWorkSum, // 9 - "TotalWorkSum"
))
endLine(tabWriter)
}
@ -237,19 +241,6 @@ func rowForPriorityLevel(plName string, activeQueues int, isIdle, isQuiescing bo
)
}
func rowForQueue(plName string, index, waitingRequests, executingRequests int, nextDispatchR string, sum debug.QueueSum) string {
return row(
plName,
strconv.Itoa(index),
strconv.Itoa(waitingRequests),
strconv.Itoa(executingRequests),
nextDispatchR,
strconv.Itoa(sum.InitialSeatsSum),
strconv.Itoa(sum.MaxSeatsSum),
sum.TotalWorkSum,
)
}
func rowForRequest(plName, fsName string, queueIndex, requestIndex int, flowDistinguisher string, arriveTime time.Time) string {
return row(
plName,