lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-12-17 17:51:20 +08:00
Code Issues Actions 32 Packages Projects Releases Wiki Activity

keep alive for gRpc calls

Browse Source
This commit is contained in:
Chris Lu
2018-07-03 19:07:55 -07:00
parent 28e5f20c8e
commit 77fc8c5914
8 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
weed/command/filer.go
View File

@@ -10,7 +10,6 @@ import (
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/server"
"github.com/chrislusf/seaweedfs/weed/util"
"google.golang.org/grpc"
"google.golang.org/grpc/reflection"
"strings"
)
@@ -129,7 +128,7 @@ func (fo *FilerOptions) start() {
if err != nil {
glog.Fatalf("failed to listen on grpc port %d: %v", grpcPort, err)
}
grpcS := grpc.NewServer()
grpcS := util.NewGrpcServer()
filer_pb.RegisterSeaweedFilerServer(grpcS, fs)
reflection.Register(grpcS)
go grpcS.Serve(grpcL)

3
weed/command/filer_copy.go
View File

@@ -16,7 +16,6 @@ import (
"strconv"
"io"
"time"
"google.golang.org/grpc"
"context"
"github.com/chrislusf/seaweedfs/weed/util"
)
@@ -340,7 +339,7 @@ func detectMimeType(f *os.File) string {
func withFilerClient(filerAddress string, fn func(filer_pb.SeaweedFilerClient) error) error {
grpcConnection, err := grpc.Dial(filerAddress, grpc.WithInsecure())
grpcConnection, err := util.GrpcDial(filerAddress)
if err != nil {
return fmt.Errorf("fail to dial %s: %v", filerAddress, err)
}

3
weed/command/master.go
View File

@@ -14,7 +14,6 @@ import (
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/gorilla/mux"
"github.com/soheilhy/cmux"
"google.golang.org/grpc"
"google.golang.org/grpc/reflection"
)
@@ -103,7 +102,7 @@ func runMaster(cmd *Command, args []string) bool {
httpL := m.Match(cmux.Any())
// Create your protocol servers.
grpcS := grpc.NewServer()
grpcS := util.NewGrpcServer()
master_pb.RegisterSeaweedServer(grpcS, ms)
reflection.Register(grpcS)

3
weed/command/server.go
View File

@@ -17,7 +17,6 @@ import (
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/gorilla/mux"
"github.com/soheilhy/cmux"
"google.golang.org/grpc"
"google.golang.org/grpc/reflection"
)
@@ -208,7 +207,7 @@ func runServer(cmd *Command, args []string) bool {
httpL := m.Match(cmux.Any())
// Create your protocol servers.
grpcS := grpc.NewServer()
grpcS := util.NewGrpcServer()
master_pb.RegisterSeaweedServer(grpcS, ms)
reflection.Register(grpcS)