diff options
| author | vadimartynov <166398828+vadimartynov@users.noreply.github.com> | 2024-06-14 21:40:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-14 11:40:34 -0700 |
| commit | 8aae82dd71735df1cd915a47a9b9d453d393adf6 (patch) | |
| tree | c9bb9a876485fddfd17c84c857e2cb97a46dfc5d /weed/operation/assign_file_id.go | |
| parent | 2a169dde9a4dab7d3b66f1be47b29d42b730f3a6 (diff) | |
| download | seaweedfs-8aae82dd71735df1cd915a47a9b9d453d393adf6.tar.xz seaweedfs-8aae82dd71735df1cd915a47a9b9d453d393adf6.zip | |
Added context for the MasterClient's methods to avoid endless loops (#5628)
* Added context for the MasterClient's methods to avoid endless loops
* Returned WithClient function. Added WithClientCustomGetMaster function
* Hid unused ctx arguments
* Using a common context for the KeepConnectedToMaster and WaitUntilConnected functions
* Changed the context termination check in the tryConnectToMaster function
* Added a child context to the tryConnectToMaster function
* Added a common context for KeepConnectedToMaster and WaitUntilConnected functions in benchmark
Diffstat (limited to 'weed/operation/assign_file_id.go')
| -rw-r--r-- | weed/operation/assign_file_id.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/weed/operation/assign_file_id.go b/weed/operation/assign_file_id.go index 1b7a0146d..cc8e87b21 100644 --- a/weed/operation/assign_file_id.go +++ b/weed/operation/assign_file_id.go @@ -47,9 +47,9 @@ func NewAssignProxy(masterFn GetMasterFn, grpcDialOption grpc.DialOption, concur ap = &AssignProxy{ pool: make(chan *singleThreadAssignProxy, concurrency), } - ap.grpcConnection, err = pb.GrpcDial(context.Background(), masterFn().ToGrpcAddress(), true, grpcDialOption) + ap.grpcConnection, err = pb.GrpcDial(context.Background(), masterFn(context.Background()).ToGrpcAddress(), true, grpcDialOption) if err != nil { - return nil, fmt.Errorf("fail to dial %s: %v", masterFn().ToGrpcAddress(), err) + return nil, fmt.Errorf("fail to dial %s: %v", masterFn(context.Background()).ToGrpcAddress(), err) } for i := 0; i < concurrency; i++ { ap.pool <- &singleThreadAssignProxy{} @@ -153,7 +153,7 @@ func Assign(masterFn GetMasterFn, grpcDialOption grpc.DialOption, primaryRequest continue } - lastError = WithMasterServerClient(false, masterFn(), grpcDialOption, func(masterClient master_pb.SeaweedClient) error { + lastError = WithMasterServerClient(false, masterFn(context.Background()), grpcDialOption, func(masterClient master_pb.SeaweedClient) error { req := &master_pb.AssignRequest{ Count: request.Count, Replication: request.Replication, |