keep alive for gRpc calls

4 files changed, 4 insertions, 8 deletions

diff --git a/weed/command/filer.go b/weed/command/filer.go
index 2d4696828..e5a3e379a 100644
--- a/weed/command/filer.go
+++ b/weed/command/filer.go
@@ -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)
diff --git a/weed/command/filer_copy.go b/weed/command/filer_copy.go
index 3d4e5db9f..9937bc9d6 100644
--- a/weed/command/filer_copy.go
+++ b/weed/command/filer_copy.go
@@ -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)
 	}
diff --git a/weed/command/master.go b/weed/command/master.go
index 8abec2a3d..c1b9cf5ae 100644
--- a/weed/command/master.go
+++ b/weed/command/master.go
@@ -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)
 
diff --git a/weed/command/server.go b/weed/command/server.go
index 606845199..485dea7ac 100644
--- a/weed/command/server.go
+++ b/weed/command/server.go
@@ -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)