github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apf: change QueueDump to use SeatSeconds

Browse Source
This commit is contained in:
Abu Kashem
2021-10-13 10:22:41 -04:00
parent 87c7401eb8
commit 3ef5752edf
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller_debug.go
View File

@@ -103,7 +103,7 @@ func (cfgCtlr *configController) dumpQueues(w http.ResponseWriter, r *http.Reque
"Index", // 2 "Index", // 2
"PendingRequests", // 3 "PendingRequests", // 3
"ExecutingRequests", // 4 "ExecutingRequests", // 4
"VirtualStart", // 5 "NextDispatchR", // 5
"InitialSeatsSum", // 6 "InitialSeatsSum", // 6
"MaxSeatsSum", // 7 "MaxSeatsSum", // 7
"TotalWorkSum", // 8 "TotalWorkSum", // 8
@@ -132,7 +132,7 @@ func (cfgCtlr *configController) dumpQueues(w http.ResponseWriter, r *http.Reque
i, // 2 i, // 2
len(q.Requests), // 3 len(q.Requests), // 3
q.ExecutingRequests, // 4 q.ExecutingRequests, // 4
q.VirtualStart, // 5 q.NextDispatchR, // 5
q.QueueSum, // 6, 7, 8 q.QueueSum, // 6, 7, 8
)) ))
endLine(tabWriter) endLine(tabWriter)
@@ -237,13 +237,13 @@ func rowForPriorityLevel(plName string, activeQueues int, isIdle, isQuiescing bo
) )
} }
func rowForQueue(plName string, index, waitingRequests, executingRequests int, virtualStart float64, sum debug.QueueSum) string { func rowForQueue(plName string, index, waitingRequests, executingRequests int, nextDispatchR string, sum debug.QueueSum) string {
return row( return row(
plName, plName,
strconv.Itoa(index), strconv.Itoa(index),
strconv.Itoa(waitingRequests), strconv.Itoa(waitingRequests),
strconv.Itoa(executingRequests), strconv.Itoa(executingRequests),
fmt.Sprintf("%.4f", virtualStart), nextDispatchR,
strconv.Itoa(sum.InitialSeatsSum), strconv.Itoa(sum.InitialSeatsSum),
strconv.Itoa(sum.MaxSeatsSum), strconv.Itoa(sum.MaxSeatsSum),
sum.TotalWorkSum, sum.TotalWorkSum,

2
staging/src/k8s.io/apiserver/pkg/util/flowcontrol/debug/dump.go
View File

@@ -34,7 +34,7 @@ type QueueSetDump struct {
type QueueDump struct { type QueueDump struct {
QueueSum QueueSum QueueSum QueueSum
Requests []RequestDump Requests []RequestDump
VirtualStart float64 NextDispatchR string
ExecutingRequests int ExecutingRequests int
SeatsInUse int SeatsInUse int
} }

2
staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/types.go
View File

@@ -181,7 +181,7 @@ func (q *queue) dump(includeDetails bool) debug.QueueDump {
} }
return debug.QueueDump{ return debug.QueueDump{
VirtualStart: q.nextDispatchR.ToFloat(), // TODO: change QueueDump to use SeatSeconds NextDispatchR: q.nextDispatchR.String(),
Requests: digest, Requests: digest,
ExecutingRequests: q.requestsExecuting, ExecutingRequests: q.requestsExecuting,
SeatsInUse: q.seatsInUse, SeatsInUse: q.seatsInUse,