github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

add pprof endpoint (#370)

Browse Source 
Add pprof endpoint

Signed-off-by: zhangzhenhao <zhangzhenhao@outlook.com>
This commit is contained in:
Zhenhao Zhang 2017-11-03 02:41:37 +08:00 committed by Lantao Liu
parent 1117430076
commit 0c1839047c
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/cri-containerd/cri_containerd.go
View File

@ -19,6 +19,9 @@ package main
import ( import (
"flag" "flag"
"fmt" "fmt"
"net"
"net/http"
"net/http/pprof"
"os" "os"
"os/signal" "os/signal"
"path/filepath" "path/filepath"
@ -129,6 +132,12 @@ func main() {
glog.V(0).Infof("Run cri-containerd %+v", o) glog.V(0).Infof("Run cri-containerd %+v", o)
// Start profiling server if enable.
if o.EnableProfiling {
glog.V(2).Info("Start profiling server")
go startProfilingServer(o.ProfilingAddress, o.ProfilingPort)
}
glog.V(2).Infof("Run cri-containerd grpc server on socket %q", o.SocketPath) glog.V(2).Infof("Run cri-containerd grpc server on socket %q", o.SocketPath)
s, err := server.NewCRIContainerdService(o.Config) s, err := server.NewCRIContainerdService(o.Config)
if err != nil { if err != nil {
@ -182,3 +191,16 @@ func dumpStacks() {
} }
glog.V(0).Infof("=== BEGIN goroutine stack dump ===\n%s\n=== END goroutine stack dump ===", buf) glog.V(0).Infof("=== BEGIN goroutine stack dump ===\n%s\n=== END goroutine stack dump ===", buf)
} }
// startProfilingServer start http server to profiling via web interface
func startProfilingServer(host string, port string) {
endpoint := net.JoinHostPort(host, port)
mux := http.NewServeMux()
mux.HandleFunc("/debug/pprof/", pprof.Index)
mux.HandleFunc("/debug/pprof/profile", pprof.Profile)
mux.HandleFunc("/debug/pprof/symbol", pprof.Symbol)
mux.HandleFunc("/debug/pprof/trace", pprof.Trace)
if err := http.ListenAndServe(endpoint, mux); err != nil {
glog.Errorf("Failed to start profiling server: %v", err)
}
}

15
cmd/cri-containerd/options/options.go
View File

@ -90,6 +90,12 @@ type Config struct {
SystemdCgroup bool `toml:"systemd_cgroup"` SystemdCgroup bool `toml:"systemd_cgroup"`
// OOMScore adjust the cri-containerd's oom score // OOMScore adjust the cri-containerd's oom score
OOMScore int `toml:"oom_score"` OOMScore int `toml:"oom_score"`
// EnableProfiling is used for enable profiling via host:port/debug/pprof/
EnableProfiling bool `toml:"profiling"`
// ProfilingPort is the port for profiling via host:port/debug/pprof/
ProfilingPort string `toml:"profiling_port"`
// ProfilingAddress is address for profiling via host:port/debug/pprof/
ProfilingAddress string `toml:"profiling_addr"`
} }
// CRIContainerdOptions contains cri-containerd command line and toml options. // CRIContainerdOptions contains cri-containerd command line and toml options.
@ -146,6 +152,12 @@ func (c *CRIContainerdOptions) AddFlags(fs *pflag.FlagSet) {
defaults.SystemdCgroup, "Enables systemd cgroup support. By default not enabled.") defaults.SystemdCgroup, "Enables systemd cgroup support. By default not enabled.")
fs.IntVar(&c.OOMScore, "oom-score", fs.IntVar(&c.OOMScore, "oom-score",
defaults.OOMScore, "Adjust the cri-containerd's oom score.") defaults.OOMScore, "Adjust the cri-containerd's oom score.")
fs.BoolVar(&c.EnableProfiling, "profiling",
defaults.EnableProfiling, "Enable profiling via web interface host:port/debug/pprof/.")
fs.StringVar(&c.ProfilingPort, "profiling-port",
defaults.ProfilingPort, "Profiling port for web interface host:port/debug/pprof/.")
fs.StringVar(&c.ProfilingAddress, "profiling-addr",
defaults.ProfilingAddress, "Profiling address for web interface host:port/debug/pprof/.")
} }
// InitFlags load configurations from config file, and then overwrite with flags. // InitFlags load configurations from config file, and then overwrite with flags.
@ -213,5 +225,8 @@ func defaultConfig() Config {
StatsCollectPeriod: 10, StatsCollectPeriod: 10,
SystemdCgroup: false, SystemdCgroup: false,
OOMScore: -999, OOMScore: -999,
EnableProfiling: true,
ProfilingPort: "10011",
ProfilingAddress: "127.0.0.1",
} }
} }