From b9365de47b04414e704cb62a3cfa9753e8c5ec0c Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Wed, 10 Jun 2020 13:10:10 -0700 Subject: [PATCH] fix volume server pprof --- weed/command/server.go | 3 +++ weed/command/volume.go | 21 +++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/weed/command/server.go b/weed/command/server.go index da74f4760..0af583a7f 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -63,6 +63,8 @@ var ( isStartingMsgBroker = cmdServer.Flag.Bool("msgBroker", false, "whether to start message broker") serverWhiteList []string + + False = false ) func init() { @@ -95,6 +97,7 @@ func init() { serverOptions.v.compactionMBPerSecond = cmdServer.Flag.Int("volume.compactionMBps", 0, "limit compaction speed in mega bytes per second") serverOptions.v.fileSizeLimitMB = cmdServer.Flag.Int("volume.fileSizeLimitMB", 256, "limit file size to avoid out of memory") serverOptions.v.publicUrl = cmdServer.Flag.String("volume.publicUrl", "", "publicly accessible address") + serverOptions.v.pprof = &False s3Options.port = cmdServer.Flag.Int("s3.port", 8333, "s3 server http listen port") s3Options.domainName = cmdServer.Flag.String("s3.domainName", "", "suffix of the host name, {bucket}.{domainName}") diff --git a/weed/command/volume.go b/weed/command/volume.go index 31f068f0a..d0fdd2ed1 100644 --- a/weed/command/volume.go +++ b/weed/command/volume.go @@ -11,10 +11,11 @@ import ( "strings" "time" - "github.com/chrislusf/seaweedfs/weed/util/grace" "github.com/spf13/viper" "google.golang.org/grpc" + "github.com/chrislusf/seaweedfs/weed/util/grace" + "github.com/chrislusf/seaweedfs/weed/pb" "github.com/chrislusf/seaweedfs/weed/security" "github.com/chrislusf/seaweedfs/weed/util/httpdown" @@ -33,15 +34,14 @@ var ( ) type VolumeServerOptions struct { - port *int - publicPort *int - folders []string - folderMaxLimits []int - ip *string - publicUrl *string - bindIp *string - masters *string - // pulseSeconds *int + port *int + publicPort *int + folders []string + folderMaxLimits []int + ip *string + publicUrl *string + bindIp *string + masters *string idleConnectionTimeout *int dataCenter *string rack *string @@ -55,6 +55,7 @@ type VolumeServerOptions struct { fileSizeLimitMB *int minFreeSpacePercent []float32 pprof *bool + // pulseSeconds *int } func init() {