diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller_debug.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller_debug.go index 8d2bc7b36db..fbf48e836dd 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller_debug.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/apf_controller_debug.go @@ -103,7 +103,7 @@ func (cfgCtlr *configController) dumpQueues(w http.ResponseWriter, r *http.Reque "Index", // 2 "PendingRequests", // 3 "ExecutingRequests", // 4 - "VirtualStart", // 5 + "NextDispatchR", // 5 "InitialSeatsSum", // 6 "MaxSeatsSum", // 7 "TotalWorkSum", // 8 @@ -132,7 +132,7 @@ func (cfgCtlr *configController) dumpQueues(w http.ResponseWriter, r *http.Reque i, // 2 len(q.Requests), // 3 q.ExecutingRequests, // 4 - q.VirtualStart, // 5 + q.NextDispatchR, // 5 q.QueueSum, // 6, 7, 8 )) 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( plName, strconv.Itoa(index), strconv.Itoa(waitingRequests), strconv.Itoa(executingRequests), - fmt.Sprintf("%.4f", virtualStart), + nextDispatchR, strconv.Itoa(sum.InitialSeatsSum), strconv.Itoa(sum.MaxSeatsSum), sum.TotalWorkSum, diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/debug/dump.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/debug/dump.go index 3cac2730905..ecc5cf5ff03 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/debug/dump.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/debug/dump.go @@ -34,7 +34,7 @@ type QueueSetDump struct { type QueueDump struct { QueueSum QueueSum Requests []RequestDump - VirtualStart float64 + NextDispatchR string ExecutingRequests int SeatsInUse int } diff --git a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/types.go b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/types.go index 6c3cf2b1f89..26bbe5ebab5 100644 --- a/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/types.go +++ b/staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/types.go @@ -181,7 +181,7 @@ func (q *queue) dump(includeDetails bool) debug.QueueDump { } return debug.QueueDump{ - VirtualStart: q.nextDispatchR.ToFloat(), // TODO: change QueueDump to use SeatSeconds + NextDispatchR: q.nextDispatchR.String(), Requests: digest, ExecutingRequests: q.requestsExecuting, SeatsInUse: q.seatsInUse,