aboutsummaryrefslogtreecommitdiff
path: root/weed/command/master.go
diff options
context:
space:
mode:
Diffstat (limited to 'weed/command/master.go')
-rw-r--r--weed/command/master.go15
1 files changed, 3 insertions, 12 deletions
diff --git a/weed/command/master.go b/weed/command/master.go
index 09089a4f9..8c5efbb9f 100644
--- a/weed/command/master.go
+++ b/weed/command/master.go
@@ -4,7 +4,6 @@ import (
"net/http"
"os"
"runtime"
- "runtime/pprof"
"strconv"
"strings"
"time"
@@ -48,6 +47,7 @@ var (
masterWhiteListOption = cmdMaster.Flag.String("whiteList", "", "comma separated Ip addresses having write permission. No limit if empty.")
masterSecureKey = cmdMaster.Flag.String("secure.secret", "", "secret to encrypt Json Web Token(JWT)")
masterCpuProfile = cmdMaster.Flag.String("cpuprofile", "", "cpu profile output file")
+ masterMemProfile = cmdMaster.Flag.String("memprofile", "", "memory profile output file")
masterWhiteList []string
)
@@ -57,17 +57,8 @@ func runMaster(cmd *Command, args []string) bool {
*mMaxCpu = runtime.NumCPU()
}
runtime.GOMAXPROCS(*mMaxCpu)
- if *masterCpuProfile != "" {
- f, err := os.Create(*masterCpuProfile)
- if err != nil {
- glog.Fatal(err)
- }
- pprof.StartCPUProfile(f)
- defer pprof.StopCPUProfile()
- OnInterrupt(func() {
- pprof.StopCPUProfile()
- })
- }
+ util.SetupProfiling(*masterCpuProfile, *masterMemProfile)
+
if err := util.TestFolderWritable(*metaFolder); err != nil {
glog.Fatalf("Check Meta Folder (-mdir) Writable %s : %s", *metaFolder, err)
}