diff --git a/cmd/climc/shell/misc/pprof.go b/cmd/climc/shell/misc/pprof.go index 6fda8f81bb..f89e64d49d 100644 --- a/cmd/climc/shell/misc/pprof.go +++ b/cmd/climc/shell/misc/pprof.go @@ -21,6 +21,8 @@ import ( "os" "syscall" + "yunion.io/x/jsonutils" + "yunion.io/x/pkg/errors" "yunion.io/x/pkg/util/signalutils" "yunion.io/x/onecloud/pkg/mcclient" @@ -31,9 +33,10 @@ import ( func init() { type TraceOptions struct { - Second int `help:"pprof seconds" short-token:"s"` + Second int `help:"pprof seconds" short-token:"s" default:"15"` Service string `help:"Service type"` Address string `help:"Service listen address"` + Gc bool `help:"run GC before taking the heap sample"` } downloadToTemp := func(input io.Reader, pattern string) (string, error) { @@ -50,23 +53,31 @@ func init() { pprofRun := func(s *mcclient.ClientSession, opts *TraceOptions, pType string, args ...string) error { var ( - src io.Reader - err error + src io.Reader + err error + svcUrl string ) if len(opts.Service) > 0 { - src, err = modules.GetPProfByType(s, opts.Service, pType, opts.Second) + svcUrl, err = s.GetServiceURL(opts.Service, "") if err != nil { - return err + return errors.Wrapf(err, "get service %s url", opts.Service) } } else if len(opts.Address) > 0 { - src, err = modules.GetNamedAddressPProfByType(s, opts.Address, pType, opts.Second) - if err != nil { - return err - } + svcUrl = opts.Address } else { return fmt.Errorf("no service address provide") } + params := jsonutils.NewDict() + params.Add(jsonutils.NewInt(int64(opts.Second)), "seconds") + if pType == "heap" && opts.Gc { + params.Add(jsonutils.JSONTrue, "gc") + } + src, err = modules.GetNamedAddressPProfByType(s, svcUrl, pType, params) + if err != nil { + return err + } + tempfile, err := downloadToTemp(src, pType) if err != nil { return err @@ -90,14 +101,35 @@ func init() { } R(&TraceOptions{}, "pprof-trace", "pprof trace of backend service", func(s *mcclient.ClientSession, args *TraceOptions) error { + // A trace of execution of the current program return pprofRun(s, args, "trace", "trace") }) - R(&TraceOptions{}, "pprof-profile", "pprof profile of backend service", func(s *mcclient.ClientSession, args *TraceOptions) error { - port, err := netutils2.GetFreePort() - if err != nil { - return err - } - return pprofRun(s, args, "profile", "pprof", fmt.Sprintf("-http=:%d", port)) - }) + for _, kind := range []string{ + // A sampling of all past memory allocations + "allocs", + // Stack traces that led to blocking on synchronization primitives + "block", + // The command line invocation of the current program + "cmdline", + // Stack traces of all current goroutines + "goroutine", + // A sampling of memory allocations of live objects + "heap", + // Stack straces of holders of contended mutexes + "mutex", + // CPU profile + "profile", + // Stack traces that led to the creation of new OS threads + "threadcreate", + } { + pType := kind + R(&TraceOptions{}, fmt.Sprintf("pprof-%s", pType), fmt.Sprintf("pprof %s of backend service", pType), func(s *mcclient.ClientSession, args *TraceOptions) error { + port, err := netutils2.GetFreePort() + if err != nil { + return err + } + return pprofRun(s, args, pType, "pprof", fmt.Sprintf("-http=:%d", port)) + }) + } } diff --git a/pkg/cloudcommon/informer/worker.go b/pkg/cloudcommon/informer/worker.go index 67b1fa6df8..e85bcf5018 100644 --- a/pkg/cloudcommon/informer/worker.go +++ b/pkg/cloudcommon/informer/worker.go @@ -26,7 +26,7 @@ var ( ) func init() { - informerWorkerMan = appsrv.NewWorkerManager("InformerWorkerManager", 1024, 10240, false) + informerWorkerMan = appsrv.NewWorkerManager("InformerWorkerManager", 10, 10240, false) } func run(f func(be IInformerBackend) error) error { diff --git a/pkg/mcclient/mcclient.go b/pkg/mcclient/mcclient.go index fb327e7f9f..fd9073437b 100644 --- a/pkg/mcclient/mcclient.go +++ b/pkg/mcclient/mcclient.go @@ -90,6 +90,10 @@ func (this *Client) SetDebug(debug bool) { this.debug = debug } +func (this *Client) GetDebug() bool { + return this.debug +} + func (this *Client) AuthVersion() string { pos := strings.LastIndexByte(this.authUrl, '/') if pos > 0 { diff --git a/pkg/mcclient/modules/pprof.go b/pkg/mcclient/modules/pprof.go index 3353baa2ff..3dcc9911b0 100644 --- a/pkg/mcclient/modules/pprof.go +++ b/pkg/mcclient/modules/pprof.go @@ -19,6 +19,8 @@ import ( "fmt" "io" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/util/httputils" @@ -28,9 +30,15 @@ func GetPProfByType(s *mcclient.ClientSession, serviceType string, profileType s return modulebase.GetPProfByType(s, serviceType, profileType, seconds) } -func GetNamedAddressPProfByType(s *mcclient.ClientSession, address string, profileType string, seconds int) (io.Reader, error) { - urlStr := fmt.Sprintf("%s%s", address, fmt.Sprintf("/debug/pprof/%s?seconds=%d", profileType, seconds)) - resp, err := httputils.Request(s.GetClient().HttpClient(), context.Background(), "GET", urlStr, s.Header, nil, false) +func GetNamedAddressPProfByType(s *mcclient.ClientSession, address string, profileType string, params *jsonutils.JSONDict) (io.Reader, error) { + urlStr := fmt.Sprintf("%s%s", address, fmt.Sprintf("/debug/pprof/%s", profileType)) + if params != nil { + if queryStr := params.QueryString(); queryStr != "" { + urlStr = fmt.Sprintf("%s?%s", urlStr, queryStr) + } + } + cli := s.GetClient() + resp, err := httputils.Request(cli.HttpClient(), context.Background(), "GET", urlStr, s.Header, nil, cli.GetDebug()) if err != nil { return nil, err }