From 42cb05c088cea142d1e0019c7a282915df66ecaa Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Fri, 15 Mar 2019 17:23:02 -0700 Subject: [PATCH] add context.Context --- weed/wdclient/masterclient.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/weed/wdclient/masterclient.go b/weed/wdclient/masterclient.go index 34069b3c3..1686ad5ff 100644 --- a/weed/wdclient/masterclient.go +++ b/weed/wdclient/masterclient.go @@ -53,9 +53,9 @@ func (mc *MasterClient) KeepConnectedToMaster() { func (mc *MasterClient) tryAllMasters() { for _, master := range mc.masters { glog.V(0).Infof("Connecting to master %v", master) - gprcErr := withMasterClient(context.Background(), master, mc.grpcDialOption, func(client master_pb.SeaweedClient) error { + gprcErr := withMasterClient(context.Background(), master, mc.grpcDialOption, func(ctx context.Context, client master_pb.SeaweedClient) error { - stream, err := client.KeepConnected(context.Background()) + stream, err := client.KeepConnected(ctx) if err != nil { glog.V(0).Infof("failed to keep connected to %s: %v", master, err) return err @@ -99,7 +99,7 @@ func (mc *MasterClient) tryAllMasters() { } } -func withMasterClient(ctx context.Context, master string, grpcDialOption grpc.DialOption, fn func(client master_pb.SeaweedClient) error) error { +func withMasterClient(ctx context.Context, master string, grpcDialOption grpc.DialOption, fn func(ctx context.Context, client master_pb.SeaweedClient) error) error { masterGrpcAddress, parseErr := util.ParseServerToGrpcAddress(master, 0) if parseErr != nil { @@ -114,5 +114,5 @@ func withMasterClient(ctx context.Context, master string, grpcDialOption grpc.Di client := master_pb.NewSeaweedClient(grpcConnection) - return fn(client) + return fn(ctx, client) }