github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

removes empty columns and fixes request details

Browse Source
This commit is contained in:
yue9944882 2020-07-23 14:25:11 +08:00
parent e6ee924f6c
commit 40e3feb7f1
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ func (cfgCtlr *configController) dumpPriorityLevels(w http.ResponseWriter, r *ht
"ExecutingRequests", // 6 "ExecutingRequests", // 6
} }
tabPrint(tabWriter, rowForHeaders(columnHeaders)) tabPrint(tabWriter, rowForHeaders(columnHeaders))
endline(tabWriter) endLine(tabWriter)
for _, plState := range cfgCtlr.priorityLevelStates { for _, plState := range cfgCtlr.priorityLevelStates {
if plState.queues == nil { if plState.queues == nil {
tabPrint(tabWriter, row( tabPrint(tabWriter, row(
@ -69,7 +69,7 @@ func (cfgCtlr *configController) dumpPriorityLevels(w http.ResponseWriter, r *ht
"<none>", // 5 "<none>", // 5
"<none>", // 6 "<none>", // 6
)) ))
endline(tabWriter) endLine(tabWriter)
continue continue
} }
queueSetDigest := plState.queues.Dump(false) queueSetDigest := plState.queues.Dump(false)
@ -88,7 +88,7 @@ func (cfgCtlr *configController) dumpPriorityLevels(w http.ResponseWriter, r *ht
queueSetDigest.Waiting, // 5 queueSetDigest.Waiting, // 5
queueSetDigest.Executing, // 6 queueSetDigest.Executing, // 6
)) ))
endline(tabWriter) endLine(tabWriter)
} }
runtime.HandleError(tabWriter.Flush()) runtime.HandleError(tabWriter.Flush())
} }
@ -105,7 +105,7 @@ func (cfgCtlr *configController) dumpQueues(w http.ResponseWriter, r *http.Reque
"VirtualStart", // 5 "VirtualStart", // 5
} }
tabPrint(tabWriter, rowForHeaders(columnHeaders)) tabPrint(tabWriter, rowForHeaders(columnHeaders))
endline(tabWriter) endLine(tabWriter)
for _, plState := range cfgCtlr.priorityLevelStates { for _, plState := range cfgCtlr.priorityLevelStates {
if plState.queues == nil { if plState.queues == nil {
tabPrint(tabWriter, row( tabPrint(tabWriter, row(
@ -115,7 +115,7 @@ func (cfgCtlr *configController) dumpQueues(w http.ResponseWriter, r *http.Reque
"<none>", // 4 "<none>", // 4
"<none>", // 5 "<none>", // 5
)) ))
endline(tabWriter) endLine(tabWriter)
continue continue
} }
queueSetDigest := plState.queues.Dump(false) queueSetDigest := plState.queues.Dump(false)
@ -127,7 +127,7 @@ func (cfgCtlr *configController) dumpQueues(w http.ResponseWriter, r *http.Reque
q.ExecutingRequests, // 4 q.ExecutingRequests, // 4
q.VirtualStart, // 5 q.VirtualStart, // 5
)) ))
endline(tabWriter) endLine(tabWriter)
} }
} }
runtime.HandleError(tabWriter.Flush()) runtime.HandleError(tabWriter.Flush())
@ -149,6 +149,7 @@ func (cfgCtlr *configController) dumpRequests(w http.ResponseWriter, r *http.Req
"ArriveTime", // 6 "ArriveTime", // 6
})) }))
if includeRequestDetails { if includeRequestDetails {
continueLine(tabWriter)
tabPrint(tabWriter, rowForHeaders([]string{ tabPrint(tabWriter, rowForHeaders([]string{
"UserName", // 7 "UserName", // 7
"Verb", // 8 "Verb", // 8
@ -160,7 +161,7 @@ func (cfgCtlr *configController) dumpRequests(w http.ResponseWriter, r *http.Req
"SubResource", // 14 "SubResource", // 14
})) }))
} }
endline(tabWriter) endLine(tabWriter)
for _, plState := range cfgCtlr.priorityLevelStates { for _, plState := range cfgCtlr.priorityLevelStates {
if plState.queues == nil { if plState.queues == nil {
tabPrint(tabWriter, row( tabPrint(tabWriter, row(
@ -172,6 +173,7 @@ func (cfgCtlr *configController) dumpRequests(w http.ResponseWriter, r *http.Req
"<none>", // 6 "<none>", // 6
)) ))
if includeRequestDetails { if includeRequestDetails {
continueLine(tabWriter)
tabPrint(tabWriter, row( tabPrint(tabWriter, row(
"<none>", // 7 "<none>", // 7
"<none>", // 8 "<none>", // 8
@ -183,7 +185,7 @@ func (cfgCtlr *configController) dumpRequests(w http.ResponseWriter, r *http.Req
"<none>", // 14 "<none>", // 14
)) ))
} }
endline(tabWriter) endLine(tabWriter)
continue continue
} }
queueSetDigest := plState.queues.Dump(includeRequestDetails) queueSetDigest := plState.queues.Dump(includeRequestDetails)
@ -198,6 +200,7 @@ func (cfgCtlr *configController) dumpRequests(w http.ResponseWriter, r *http.Req
r.ArriveTime, // 6 r.ArriveTime, // 6
)) ))
if includeRequestDetails { if includeRequestDetails {
continueLine(tabWriter)
tabPrint(tabWriter, rowForRequestDetails( tabPrint(tabWriter, rowForRequestDetails(
r.UserName, // 7 r.UserName, // 7
r.RequestInfo.Verb, // 8 r.RequestInfo.Verb, // 8
@ -212,7 +215,7 @@ func (cfgCtlr *configController) dumpRequests(w http.ResponseWriter, r *http.Req
r.RequestInfo.Subresource, // 14 r.RequestInfo.Subresource, // 14
)) ))
} }
endline(tabWriter) endLine(tabWriter)
} }
} }
} }
@ -223,7 +226,12 @@ func tabPrint(w io.Writer, row string) {
_, err := fmt.Fprint(w, row) _, err := fmt.Fprint(w, row)
runtime.HandleError(err) runtime.HandleError(err)
} }
func endline(w io.Writer) {
func continueLine(w io.Writer) {
_, err := fmt.Fprint(w, ",\t")
runtime.HandleError(err)
}
func endLine(w io.Writer) {
_, err := fmt.Fprint(w, "\n") _, err := fmt.Fprint(w, "\n")
runtime.HandleError(err) runtime.HandleError(err)
} }
@ -269,9 +277,14 @@ func rowForRequestDetails(username, verb, path, namespace, name, apiVersion, res
username, username,
verb, verb,
path, path,
namespace,
name,
apiVersion,
resource,
subResource,
) )
} }
func row(columns ...string) string { func row(columns ...string) string {
return strings.Join(columns, ",\t") + ",\t" return strings.Join(columns, ",\t")
} }