From bd1f800efe6f4f3c5d12ead75b53fdc4131629aa Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sun, 12 Sep 2021 02:19:10 -0700 Subject: [PATCH] custom grpc port: master --- weed/command/master.go | 4 +++- weed/command/server.go | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/weed/command/master.go b/weed/command/master.go index 2605f6f4b..bf7a5d420 100644 --- a/weed/command/master.go +++ b/weed/command/master.go @@ -27,6 +27,7 @@ var ( type MasterOptions struct { port *int + portGrpc *int ip *string ipBind *string metaFolder *string @@ -46,6 +47,7 @@ type MasterOptions struct { func init() { cmdMaster.Run = runMaster // break init cycle m.port = cmdMaster.Flag.Int("port", 9333, "http listen port") + m.portGrpc = cmdMaster.Flag.Int("port.grpc", 19333, "grpc listen port") m.ip = cmdMaster.Flag.String("ip", util.DetectedHostAddress(), "master | address, also used as identifier") m.ipBind = cmdMaster.Flag.String("ip.bind", "", "ip address to bind to") m.metaFolder = cmdMaster.Flag.String("mdir", os.TempDir(), "data directory to store meta data") @@ -130,7 +132,7 @@ func startMaster(masterOption MasterOptions, masterWhiteList []string) { ms.SetRaftServer(raftServer) r.HandleFunc("/cluster/status", raftServer.StatusHandler).Methods("GET") // starting grpc server - grpcPort := *masterOption.port + 10000 + grpcPort := *masterOption.portGrpc grpcL, err := util.NewListener(util.JoinHostPort(*masterOption.ipBind, grpcPort), 0) if err != nil { glog.Fatalf("master failed to listen on grpc port %d: %v", grpcPort, err) diff --git a/weed/command/server.go b/weed/command/server.go index b32d9d51e..0e42227f0 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -85,6 +85,7 @@ func init() { serverOptions.debugPort = cmdServer.Flag.Int("debug.port", 6060, "http port for debugging") masterOptions.port = cmdServer.Flag.Int("master.port", 9333, "master server http listen port") + masterOptions.portGrpc = cmdServer.Flag.Int("master.port.grpc", 19333, "master server grpc listen port") masterOptions.metaFolder = cmdServer.Flag.String("master.dir", "", "data directory to store meta data, default to same as -dir specified") masterOptions.peers = cmdServer.Flag.String("master.peers", "", "all master nodes in comma separated ip:masterPort list") masterOptions.volumeSizeLimitMB = cmdServer.Flag.Uint("master.volumeSizeLimitMB", 30*1000, "Master stops directing writes to oversized volumes.")