mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-26 21:17:23 +00:00
Merge pull request #63777 from hzxuzhonghu/dynamic-logging-verbosity
Automatic merge from submit-queue (batch tested with PRs 59938, 63777, 64577, 63999, 64431). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Support dynamiclly set glog.logging.verbosity Support dynamically set glog logging level, which is convenient for debug. **Release note**: ```release-note Expose `/debug/flags/v` to allow dynamically set glog logging level, if want to change glog level to 3, you only have to send a PUT request with like `curl -X PUT http://127.0.0.1:8080/debug/flags/v -d "3"`. ```
This commit is contained in:
commit
b706e6612a
@ -65,6 +65,7 @@ import (
|
|||||||
openapicommon "k8s.io/kube-openapi/pkg/common"
|
openapicommon "k8s.io/kube-openapi/pkg/common"
|
||||||
|
|
||||||
// install apis
|
// install apis
|
||||||
|
"github.com/golang/glog"
|
||||||
_ "k8s.io/apiserver/pkg/apis/apiserver/install"
|
_ "k8s.io/apiserver/pkg/apis/apiserver/install"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -574,6 +575,16 @@ func installAPI(s *GenericAPIServer, c *Config) {
|
|||||||
if c.EnableContentionProfiling {
|
if c.EnableContentionProfiling {
|
||||||
goruntime.SetBlockProfileRate(1)
|
goruntime.SetBlockProfileRate(1)
|
||||||
}
|
}
|
||||||
|
// so far, only logging related endpoints are considered valid to add for these debug flags.
|
||||||
|
routes.DebugFlags{}.Install(s.Handler.NonGoRestfulMux, "v", routes.StringFlagPutHandler(
|
||||||
|
routes.StringFlagSetterFunc(func(val string) (string, error) {
|
||||||
|
var level glog.Level
|
||||||
|
if err := level.Set(val); err != nil {
|
||||||
|
return "", fmt.Errorf("failed set glog.logging.verbosity %s: %v", val, err)
|
||||||
|
}
|
||||||
|
return "successfully set glog.logging.verbosity to " + val, nil
|
||||||
|
}),
|
||||||
|
))
|
||||||
}
|
}
|
||||||
if c.EnableMetrics {
|
if c.EnableMetrics {
|
||||||
if c.EnableProfiling {
|
if c.EnableProfiling {
|
||||||
@ -582,6 +593,7 @@ func installAPI(s *GenericAPIServer, c *Config) {
|
|||||||
routes.DefaultMetrics{}.Install(s.Handler.NonGoRestfulMux)
|
routes.DefaultMetrics{}.Install(s.Handler.NonGoRestfulMux)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
routes.Version{Version: c.Version}.Install(s.Handler.GoRestfulContainer)
|
routes.Version{Version: c.Version}.Install(s.Handler.GoRestfulContainer)
|
||||||
|
|
||||||
if c.EnableDiscovery {
|
if c.EnableDiscovery {
|
||||||
|
@ -423,6 +423,7 @@ func TestNotRestRoutesHaveAuth(t *testing.T) {
|
|||||||
{"/"},
|
{"/"},
|
||||||
{"/swagger-ui/"},
|
{"/swagger-ui/"},
|
||||||
{"/debug/pprof/"},
|
{"/debug/pprof/"},
|
||||||
|
{"/debug/flags/"},
|
||||||
{"/version"},
|
{"/version"},
|
||||||
} {
|
} {
|
||||||
resp := httptest.NewRecorder()
|
resp := httptest.NewRecorder()
|
||||||
|
@ -9,6 +9,7 @@ go_library(
|
|||||||
name = "go_default_library",
|
name = "go_default_library",
|
||||||
srcs = [
|
srcs = [
|
||||||
"doc.go",
|
"doc.go",
|
||||||
|
"flags.go",
|
||||||
"index.go",
|
"index.go",
|
||||||
"metrics.go",
|
"metrics.go",
|
||||||
"openapi.go",
|
"openapi.go",
|
||||||
|
126
staging/src/k8s.io/apiserver/pkg/server/routes/flags.go
Normal file
126
staging/src/k8s.io/apiserver/pkg/server/routes/flags.go
Normal file
@ -0,0 +1,126 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2018 The Kubernetes Authors.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package routes
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"html/template"
|
||||||
|
"io/ioutil"
|
||||||
|
"net/http"
|
||||||
|
"path"
|
||||||
|
"sync"
|
||||||
|
|
||||||
|
"github.com/golang/glog"
|
||||||
|
|
||||||
|
"k8s.io/apiserver/pkg/server/mux"
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
lock = &sync.RWMutex{}
|
||||||
|
registeredFlags = map[string]debugFlag{}
|
||||||
|
)
|
||||||
|
|
||||||
|
// DebugFlags adds handlers for flags under /debug/flags.
|
||||||
|
type DebugFlags struct {
|
||||||
|
}
|
||||||
|
|
||||||
|
// Install registers the APIServer's flags handler.
|
||||||
|
func (f DebugFlags) Install(c *mux.PathRecorderMux, flag string, handler func(http.ResponseWriter, *http.Request)) {
|
||||||
|
c.UnlistedHandle("/debug/flags", http.HandlerFunc(f.Index))
|
||||||
|
c.UnlistedHandlePrefix("/debug/flags/", http.HandlerFunc(f.Index))
|
||||||
|
|
||||||
|
url := path.Join("/debug/flags", flag)
|
||||||
|
c.UnlistedHandleFunc(url, handler)
|
||||||
|
|
||||||
|
f.addFlag(flag)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Index responds with the `/debug/flags` request.
|
||||||
|
// For example, "/debug/flags/v" serves the "--v" flag.
|
||||||
|
// Index responds to a request for "/debug/flags/" with an HTML page
|
||||||
|
// listing the available flags.
|
||||||
|
func (f DebugFlags) Index(w http.ResponseWriter, r *http.Request) {
|
||||||
|
lock.RLock()
|
||||||
|
defer lock.RUnlock()
|
||||||
|
if err := indexTmpl.Execute(w, registeredFlags); err != nil {
|
||||||
|
glog.Error(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var indexTmpl = template.Must(template.New("index").Parse(`<html>
|
||||||
|
<head>
|
||||||
|
<title>/debug/flags/</title>
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
/debug/flags/<br>
|
||||||
|
<br>
|
||||||
|
flags:<br>
|
||||||
|
<table>
|
||||||
|
{{range .}}
|
||||||
|
<tr>{{.Flag}}<br>
|
||||||
|
{{end}}
|
||||||
|
</table>
|
||||||
|
<br>
|
||||||
|
full flags configurable<br>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
`))
|
||||||
|
|
||||||
|
type debugFlag struct {
|
||||||
|
Flag string
|
||||||
|
}
|
||||||
|
|
||||||
|
func (f DebugFlags) addFlag(flag string) {
|
||||||
|
lock.Lock()
|
||||||
|
defer lock.Unlock()
|
||||||
|
registeredFlags[flag] = debugFlag{flag}
|
||||||
|
}
|
||||||
|
|
||||||
|
// StringFlagSetterFunc is a func used for setting string type flag.
|
||||||
|
type StringFlagSetterFunc func(string) (string, error)
|
||||||
|
|
||||||
|
// StringFlagPutHandler wraps an http Handler to set string type flag.
|
||||||
|
func StringFlagPutHandler(setter StringFlagSetterFunc) http.HandlerFunc {
|
||||||
|
return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
|
||||||
|
switch {
|
||||||
|
case req.Method == "PUT":
|
||||||
|
body, err := ioutil.ReadAll(req.Body)
|
||||||
|
if err != nil {
|
||||||
|
writePlainText(http.StatusBadRequest, "error reading request body: "+err.Error(), w)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
defer req.Body.Close()
|
||||||
|
response, err := setter(string(body))
|
||||||
|
if err != nil {
|
||||||
|
writePlainText(http.StatusBadRequest, err.Error(), w)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
writePlainText(http.StatusOK, response, w)
|
||||||
|
return
|
||||||
|
default:
|
||||||
|
writePlainText(http.StatusNotAcceptable, "unsupported http method", w)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
// writePlainText renders a simple string response.
|
||||||
|
func writePlainText(statusCode int, text string, w http.ResponseWriter) {
|
||||||
|
w.Header().Set("Content-Type", "text/plain")
|
||||||
|
w.WriteHeader(statusCode)
|
||||||
|
fmt.Fprintln(w, text)
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user