gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #831 from PapaYofen/fix-823

Browse source 
Set rpc dial timeout to 5s
This commit is contained in:
Chris Lu 2019-01-12 17:25:16 -08:00 committed by GitHub
parent 8613e4f558 80cf99db1b
commit fc3c38d0b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
weed/server/volume_grpc_client_to_master.go
View file

@ -40,7 +40,7 @@ func (vs *VolumeServer) doHeartbeat(masterNode string, sleepInterval time.Durati
grpcConection, err := util.GrpcDial(masterNode) grpcConection, err := util.GrpcDial(masterNode)
if err != nil { if err != nil {
return "", fmt.Errorf("fail to dial: %v", err) return "", fmt.Errorf("fail to dial %s : %v", masterNode, err)
} }
defer grpcConection.Close() defer grpcConection.Close()

3
weed/util/grpc_client_server.go
View file

@ -25,7 +25,8 @@ func NewGrpcServer() *grpc.Server {
} }
func GrpcDial(address string, opts ...grpc.DialOption) (*grpc.ClientConn, error) { func GrpcDial(address string, opts ...grpc.DialOption) (*grpc.ClientConn, error) {
opts = append(opts, grpc.WithBlock())
opts = append(opts, grpc.WithTimeout(time.Duration(5*time.Second)))
opts = append(opts, grpc.WithInsecure()) opts = append(opts, grpc.WithInsecure())
opts = append(opts, grpc.WithKeepaliveParams(keepalive.ClientParameters{ opts = append(opts, grpc.WithKeepaliveParams(keepalive.ClientParameters{
Time: 30 * time.Second, // client ping server if no activity for this long Time: 30 * time.Second, // client ping server if no activity for this long