diff options
| author | Chris Lu <chris.lu@uber.com> | 2019-03-15 17:20:24 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@uber.com> | 2019-03-15 17:20:24 -0700 |
| commit | 55bab1b456c3c13a8009a11730e678ca0c48dfb0 (patch) | |
| tree | c7609b465c8444fc7538cb7f9392011840e1b38c /weed/server | |
| parent | cece860bfde443d4f8cddb04b10fb98a998995ed (diff) | |
| download | seaweedfs-55bab1b456c3c13a8009a11730e678ca0c48dfb0.tar.xz seaweedfs-55bab1b456c3c13a8009a11730e678ca0c48dfb0.zip | |
add context.Context
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/volume_grpc_client_to_master.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/weed/server/volume_grpc_client_to_master.go b/weed/server/volume_grpc_client_to_master.go index 38603e4b6..f6ed8ee23 100644 --- a/weed/server/volume_grpc_client_to_master.go +++ b/weed/server/volume_grpc_client_to_master.go @@ -36,7 +36,7 @@ func (vs *VolumeServer) heartbeat() { glog.V(0).Infof("failed to parse master grpc %v", masterGrpcAddress) continue } - newLeader, err = vs.doHeartbeat(master, masterGrpcAddress, grpcDialOption, time.Duration(vs.pulseSeconds)*time.Second) + newLeader, err = vs.doHeartbeat(context.Background(), master, masterGrpcAddress, grpcDialOption, time.Duration(vs.pulseSeconds)*time.Second) if err != nil { glog.V(0).Infof("heartbeat error: %v", err) time.Sleep(time.Duration(vs.pulseSeconds) * time.Second) @@ -45,16 +45,16 @@ func (vs *VolumeServer) heartbeat() { } } -func (vs *VolumeServer) doHeartbeat(masterNode, masterGrpcAddress string, grpcDialOption grpc.DialOption, sleepInterval time.Duration) (newLeader string, err error) { +func (vs *VolumeServer) doHeartbeat(ctx context.Context, masterNode, masterGrpcAddress string, grpcDialOption grpc.DialOption, sleepInterval time.Duration) (newLeader string, err error) { - grpcConection, err := util.GrpcDial(masterGrpcAddress, grpcDialOption) + grpcConection, err := util.GrpcDial(ctx, masterGrpcAddress, grpcDialOption) if err != nil { return "", fmt.Errorf("fail to dial %s : %v", masterNode, err) } defer grpcConection.Close() client := master_pb.NewSeaweedClient(grpcConection) - stream, err := client.SendHeartbeat(context.Background()) + stream, err := client.SendHeartbeat(ctx) if err != nil { glog.V(0).Infof("SendHeartbeat to %s: %v", masterNode, err) return "", err |