diff options
| author | Chris Lu <chris.lu@gmail.com> | 2019-02-20 01:01:01 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2019-02-20 01:01:01 -0800 |
| commit | e10868899067ad72f822e0d9571b33fa9d1fc7f6 (patch) | |
| tree | 6376da9bf7df15459fc429a18cce989151e5a316 /weed/operation/assign_file_id.go | |
| parent | 097b7a321eae4a70d375ca6d3dea1b118fe77795 (diff) | |
| download | seaweedfs-e10868899067ad72f822e0d9571b33fa9d1fc7f6.tar.xz seaweedfs-e10868899067ad72f822e0d9571b33fa9d1fc7f6.zip | |
avoid grpc 5 seconds timeout
some operations may take longer than 5 seconds.
only keep the timeout for raft operations
Diffstat (limited to 'weed/operation/assign_file_id.go')
| -rw-r--r-- | weed/operation/assign_file_id.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/weed/operation/assign_file_id.go b/weed/operation/assign_file_id.go index 7e7a9059d..dc5c0c5d7 100644 --- a/weed/operation/assign_file_id.go +++ b/weed/operation/assign_file_id.go @@ -3,13 +3,11 @@ package operation import ( "context" "fmt" - "google.golang.org/grpc" - "strings" - "time" - "github.com/chrislusf/seaweedfs/weed/pb/master_pb" "github.com/chrislusf/seaweedfs/weed/security" "github.com/chrislusf/seaweedfs/weed/util" + "google.golang.org/grpc" + "strings" ) type VolumeAssignRequest struct { @@ -46,8 +44,6 @@ func Assign(server string, grpcDialOption grpc.DialOption, primaryRequest *Volum } lastError = withMasterServerClient(server, grpcDialOption, func(masterClient master_pb.SeaweedClient) error { - ctx, cancel := context.WithTimeout(context.Background(), time.Duration(5*time.Second)) - defer cancel() req := &master_pb.AssignRequest{ Count: primaryRequest.Count, @@ -58,7 +54,7 @@ func Assign(server string, grpcDialOption grpc.DialOption, primaryRequest *Volum Rack: primaryRequest.Rack, DataNode: primaryRequest.DataNode, } - resp, grpcErr := masterClient.Assign(ctx, req) + resp, grpcErr := masterClient.Assign(context.Background(), req) if grpcErr != nil { return grpcErr } |
