gRpc for master~volume heartbeat

1 files changed, 25 insertions, 3 deletions

diff --git a/weed/command/server.go b/weed/command/server.go
index 87146940f..5bde22517 100644
--- a/weed/command/server.go
+++ b/weed/command/server.go
@@ -11,10 +11,14 @@ import (
 	"time"
 
 	"github.com/chrislusf/seaweedfs/weed/glog"
+	"github.com/chrislusf/seaweedfs/weed/pb"
 	"github.com/chrislusf/seaweedfs/weed/server"
 	"github.com/chrislusf/seaweedfs/weed/storage"
 	"github.com/chrislusf/seaweedfs/weed/util"
 	"github.com/gorilla/mux"
+	"github.com/soheilhy/cmux"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/reflection"
 )
 
 type ServerOptions struct {
@@ -51,7 +55,7 @@ var (
 	serverIp                      = cmdServer.Flag.String("ip", "localhost", "ip or server name")
 	serverBindIp                  = cmdServer.Flag.String("ip.bind", "0.0.0.0", "ip address to bind to")
 	serverMaxCpu                  = cmdServer.Flag.Int("maxCpu", 0, "maximum number of CPUs. 0 means all available CPUs")
-	serverTimeout                 = cmdServer.Flag.Int("idleTimeout", 10, "connection idle seconds")
+	serverTimeout                 = cmdServer.Flag.Int("idleTimeout", 30, "connection idle seconds")
 	serverDataCenter              = cmdServer.Flag.String("dataCenter", "", "current volume server's data center name")
 	serverRack                    = cmdServer.Flag.String("rack", "", "current volume server's rack name")
 	serverWhiteListOption         = cmdServer.Flag.String("whiteList", "", "comma separated Ip addresses having write permission. No limit if empty.")
@@ -230,9 +234,27 @@ func runServer(cmd *Command, args []string) bool {
 		}()
 
 		raftWaitForMaster.Done()
-		if e := http.Serve(masterListener, r); e != nil {
-			glog.Fatalf("Master Fail to serve:%s", e.Error())
+
+		// start grpc and http server
+		m := cmux.New(masterListener)
+
+		grpcL := m.Match(cmux.HTTP2HeaderField("content-type", "application/grpc"))
+		httpL := m.Match(cmux.Any())
+
+		// Create your protocol servers.
+		grpcS := grpc.NewServer()
+		pb.RegisterSeaweedServer(grpcS, ms)
+		reflection.Register(grpcS)
+
+		httpS := &http.Server{Handler: r}
+
+		go grpcS.Serve(grpcL)
+		go httpS.Serve(httpL)
+
+		if err := m.Serve(); err != nil {
+			glog.Fatalf("master server failed to serve: %v", err)
 		}
+
 	}()
 
 	volumeWait.Wait()