Skip to content

OCPBUGS-43994: UPSTREAM: <carry>: kube-apiserver: Only log each HTTP request once #2451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

OCPBUGS-43994: UPSTREAM: <carry>: kube-apiserver: Only log each HTTP request once #2451

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions staging/src/k8s.io/apiserver/pkg/server/httplog/httplog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,16 +131,15 @@ func withLogging(handler http.Handler, stackTracePred StacktracePred, shouldLogR
req = req.WithContext(context.WithValue(ctx, respLoggerContextKey, rl))

var logFunc func()
logFunc = rl.Log
if klog.V(3).Enabled() || (rl.isTerminating && klog.V(1).Enabled()) {
logFunc = rl.Log
}
defer func() {
if logFunc != nil {
logFunc()
}
}()

if klog.V(3).Enabled() || (rl.isTerminating && klog.V(1).Enabled()) {
defer rl.Log()
}
w = responsewriter.WrapForHTTP1Or2(rl)
handler.ServeHTTP(w, req)

Expand All @@ -149,7 +148,7 @@ func withLogging(handler http.Handler, stackTracePred StacktracePred, shouldLogR
// WithRoutine handler in the handler chain (i.e. above handler.ServeHTTP()
// would return request is completely responsed), we want the logging to
// happen in that goroutine too, so we append it to the task.
if routine.AppendTask(ctx, &routine.Task{Func: rl.Log}) {
if logFunc != nil && routine.AppendTask(ctx, &routine.Task{Func: logFunc}) {
logFunc = nil
}
})
Expand Down