Skip to content
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

Jump to bottom

cmd/serve: pprof cpu and memory profile dumps to disk #4560

Merged
merged 9 commits into from
Aug 7, 2018
Merged

cmd/serve: pprof cpu and memory profile dumps to disk #4560

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
96ec67f
cmd/serve: pprof memory profile dumps to disk (usefull for #4450)
xor-gate Jul 30, 2018
4808ca3
cmd/serve: Allow pprof per-key
xor-gate Jul 30, 2018
8893394
cmd/serve: Add setting for PPROF_DATA_PATH and break pprof code into …
xor-gate Aug 1, 2018
3c19346
Process last review comments
xor-gate Aug 5, 2018
0eaa416
Merge branch 'master' into issue-4450
xor-gate Aug 5, 2018
da76139
cmd/serv: Fix typo
xor-gate Aug 5, 2018
0ce9b27
Merge branch 'issue-4450' of github.com:xor-gate/gitea into issue-4450
xor-gate Aug 5, 2018
5159a19
Merge branch 'master' into issue-4450
lunny Aug 7, 2018
0ab3e63
Merge branch 'master' into issue-4450
techknowlogick Aug 7, 2018
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
22 changes: 22 additions & 0 deletions cmd/serv.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,12 @@ package cmd
import (
"encoding/json"
"fmt"
"io/ioutil"
"os"
"os/exec"
"path/filepath"
"runtime"
"runtime/pprof"
"strings"
"time"

Expand Down Expand Up @@ -42,6 +45,9 @@ var CmdServ = cli.Command{
Value: "custom/conf/app.ini",
Usage: "Custom configuration file path",
},
cli.BoolFlag{
Name: "enable-pprof",
},
},
}

Expand Down Expand Up @@ -93,6 +99,18 @@ func fail(userMessage, logMessage string, args ...interface{}) {
os.Exit(1)
}

func pprofDumpMemProfileForUsername(username string) {
f, err := ioutil.TempFile("", fmt.Sprintf("gitea_serve_pprof_%s_", username))
if err != nil {
log.GitLogger.Fatal(4, "Could not create memory profile: %v", err)
}
runtime.GC() // get up-to-date statistics
if err := pprof.WriteHeapProfile(f); err != nil {
log.GitLogger.Fatal(4, "Could not write memory profile: %v", err)
}
f.Close()
}

func runServ(c *cli.Context) error {
if c.IsSet("config") {
setting.CustomConf = c.String("config")
Expand Down Expand Up @@ -143,6 +161,10 @@ func runServ(c *cli.Context) error {
username := strings.ToLower(rr[0])
reponame := strings.ToLower(strings.TrimSuffix(rr[1], ".git"))

if setting.EnablePprof || c.Bool("enable-pprof") {
defer pprofDumpMemProfileForUsername(username)
}

isWiki := false
unitType := models.UnitTypeCode
if strings.HasSuffix(reponame, ".wiki") {
Expand Down
4 changes: 4 additions & 0 deletions custom/conf/app.ini.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,10 @@ STATIC_ROOT_PATH =
APP_DATA_PATH = data
; Application level GZIP support
ENABLE_GZIP = false
; Application profiling (memory and cpu)
; For "web" command it listens on localhost:6060
; For "serve" command it dumps to disk at $TMPDIR/gitea_serve_pprof_<username>_id
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to define this path as a setting? If not that's fine.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thats a nice addition, I will name it PPROF_FILE_PATH. Good? Should we only allow absolute paths or also expand e.g $TMPDIR ? Absolute paths are much easier to implement.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it should be treated same as other paths in Gitea

ENABLE_PPROF = false
; Landing page, can be "home", "explore", or "organizations"
LANDING_PAGE = home
; Enables git-lfs support. true or false, default is false.
Expand Down