From 8e33a3b2cc97813724b64be36fe977290db3053a Mon Sep 17 00:00:00 2001
From: Abu Kashem <akashem@redhat.com>
Date: Thu, 14 Oct 2021 09:27:54 -0400
Subject: [PATCH] apf: include seat information in request dump

---
 .../util/flowcontrol/apf_controller_debug.go  | 57 +++++++++----------
 .../pkg/util/flowcontrol/debug/dump.go        |  2 +
 .../flowcontrol/fairqueuing/queueset/types.go |  1 +
 3 files changed, 29 insertions(+), 31 deletions(-)

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 ff534236a4f..91c49a4beda 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
@@ -159,18 +159,21 @@ func (cfgCtlr *configController) dumpRequests(w http.ResponseWriter, r *http.Req
 		"RequestIndexInQueue", // 4
 		"FlowDistingsher",     // 5
 		"ArriveTime",          // 6
+		"InitialSeats",        // 7
+		"FinalSeats",          // 8
+		"AdditionalLatency",   // 9
 	}))
 	if includeRequestDetails {
 		continueLine(tabWriter)
 		tabPrint(tabWriter, rowForHeaders([]string{
-			"UserName",    // 7
-			"Verb",        // 8
-			"APIPath",     // 9
-			"Namespace",   // 10
-			"Name",        // 11
-			"APIVersion",  // 12
-			"Resource",    // 13
-			"SubResource", // 14
+			"UserName",    // 10
+			"Verb",        // 11
+			"APIPath",     // 12
+			"Namespace",   // 13
+			"Name",        // 14
+			"APIVersion",  // 15
+			"Resource",    // 16
+			"SubResource", // 17
 		}))
 	}
 	endLine(tabWriter)
@@ -181,28 +184,31 @@ func (cfgCtlr *configController) dumpRequests(w http.ResponseWriter, r *http.Req
 		queueSetDigest := plState.queues.Dump(includeRequestDetails)
 		for iq, q := range queueSetDigest.Queues {
 			for ir, r := range q.Requests {
-				tabPrint(tabWriter, rowForRequest(
+				tabPrint(tabWriter, row(
 					plState.pl.Name,     // 1
 					r.MatchedFlowSchema, // 2
-					iq,                  // 3
-					ir,                  // 4
+					strconv.Itoa(iq),    // 3
+					strconv.Itoa(ir),    // 4
 					r.FlowDistinguisher, // 5
-					r.ArriveTime,        // 6
+					r.ArriveTime.UTC().Format(time.RFC3339Nano),    // 6
+					strconv.Itoa(int(r.WorkEstimate.InitialSeats)), // 7
+					strconv.Itoa(int(r.WorkEstimate.FinalSeats)),   // 8
+					r.WorkEstimate.AdditionalLatency.String(),      // 9
 				))
 				if includeRequestDetails {
 					continueLine(tabWriter)
 					tabPrint(tabWriter, rowForRequestDetails(
-						r.UserName,              // 7
-						r.RequestInfo.Verb,      // 8
-						r.RequestInfo.Path,      // 9
-						r.RequestInfo.Namespace, // 10
-						r.RequestInfo.Name,      // 11
+						r.UserName,              // 10
+						r.RequestInfo.Verb,      // 11
+						r.RequestInfo.Path,      // 12
+						r.RequestInfo.Namespace, // 13
+						r.RequestInfo.Name,      // 14
 						schema.GroupVersion{
 							Group:   r.RequestInfo.APIGroup,
 							Version: r.RequestInfo.APIVersion,
-						}.String(), // 12
-						r.RequestInfo.Resource,    // 13
-						r.RequestInfo.Subresource, // 14
+						}.String(), // 15
+						r.RequestInfo.Resource,    // 16
+						r.RequestInfo.Subresource, // 17
 					))
 				}
 				endLine(tabWriter)
@@ -241,17 +247,6 @@ func rowForPriorityLevel(plName string, activeQueues int, isIdle, isQuiescing bo
 	)
 }
 
-func rowForRequest(plName, fsName string, queueIndex, requestIndex int, flowDistinguisher string, arriveTime time.Time) string {
-	return row(
-		plName,
-		fsName,
-		strconv.Itoa(queueIndex),
-		strconv.Itoa(requestIndex),
-		flowDistinguisher,
-		arriveTime.UTC().Format(time.RFC3339Nano),
-	)
-}
-
 func rowForRequestDetails(username, verb, path, namespace, name, apiVersion, resource, subResource string) string {
 	return row(
 		username,
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 ecc5cf5ff03..b3cdb17bb95 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
@@ -20,6 +20,7 @@ import (
 	"time"
 
 	"k8s.io/apiserver/pkg/endpoints/request"
+	flowcontrolrequest "k8s.io/apiserver/pkg/util/flowcontrol/request"
 )
 
 // QueueSetDump is an instant dump of queue-set.
@@ -51,6 +52,7 @@ type RequestDump struct {
 	FlowDistinguisher string
 	ArriveTime        time.Time
 	StartTime         time.Time
+	WorkEstimate      flowcontrolrequest.WorkEstimate
 	// request details
 	UserName    string
 	RequestInfo request.RequestInfo
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 26bbe5ebab5..d3fbea7eda1 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
@@ -161,6 +161,7 @@ func (q *queue) dump(includeDetails bool) debug.QueueDump {
 		digest[i].FlowDistinguisher = r.flowDistinguisher
 		digest[i].ArriveTime = r.arrivalTime
 		digest[i].StartTime = r.startTime
+		digest[i].WorkEstimate = r.workEstimate.WorkEstimate
 		if includeDetails {
 			userInfo, _ := genericrequest.UserFrom(r.ctx)
 			digest[i].UserName = userInfo.GetName()