diff options
| author | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2022-05-03 00:13:57 +0500 |
|---|---|---|
| committer | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2022-05-03 00:13:57 +0500 |
| commit | d8925b4e832b9ed12deae0b9b94cd5f050f2f258 (patch) | |
| tree | a197c8619048285e87c89932666ec0c7b2434f40 /weed/filer/filer.go | |
| parent | 7640e650e5e647e6d6f3c8043c1e0a7442f154c7 (diff) | |
| parent | 998c1973eae6cbf5f91a80d3d6a864db91a3d38f (diff) | |
| download | seaweedfs-d8925b4e832b9ed12deae0b9b94cd5f050f2f258.tar.xz seaweedfs-d8925b4e832b9ed12deae0b9b94cd5f050f2f258.zip | |
Merge branch 'new_master' into ydb
# Conflicts:
# go.mod
# go.sum
Diffstat (limited to 'weed/filer/filer.go')
| -rw-r--r-- | weed/filer/filer.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/weed/filer/filer.go b/weed/filer/filer.go index 836a0e447..59cbf4d75 100644 --- a/weed/filer/filer.go +++ b/weed/filer/filer.go @@ -49,10 +49,10 @@ type Filer struct { UniqueFileId uint32 } -func NewFiler(masters map[string]pb.ServerAddress, grpcDialOption grpc.DialOption, - filerHost pb.ServerAddress, collection string, replication string, dataCenter string, notifyFn func()) *Filer { +func NewFiler(masters map[string]pb.ServerAddress, grpcDialOption grpc.DialOption, filerHost pb.ServerAddress, + filerGroup string, collection string, replication string, dataCenter string, notifyFn func()) *Filer { f := &Filer{ - MasterClient: wdclient.NewMasterClient(grpcDialOption, cluster.FilerType, filerHost, dataCenter, masters), + MasterClient: wdclient.NewMasterClient(grpcDialOption, filerGroup, cluster.FilerType, filerHost, dataCenter, masters), fileIdDeletionQueue: util.NewUnboundedQueue(), GrpcDialOption: grpcDialOption, FilerConf: NewFilerConf(), @@ -84,6 +84,7 @@ func (f *Filer) ListExistingPeerUpdates() (existingNodes []*master_pb.ClusterNod if grpcErr := pb.WithMasterClient(false, f.MasterClient.GetMaster(), f.GrpcDialOption, func(client master_pb.SeaweedClient) error { resp, err := client.ListClusterNodes(context.Background(), &master_pb.ListClusterNodesRequest{ ClientType: cluster.FilerType, + FilerGroup: f.MasterClient.FilerGroup, }) glog.V(0).Infof("the cluster has %d filers\n", len(resp.ClusterNodes)) |