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/server/master_server.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/server/master_server.go')
| -rw-r--r-- | weed/server/master_server.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/weed/server/master_server.go b/weed/server/master_server.go index 9f29d4ba7..5b8c28698 100644 --- a/weed/server/master_server.go +++ b/weed/server/master_server.go @@ -113,7 +113,7 @@ func NewMasterServer(r *mux.Router, option *MasterOption, peers map[string]pb.Se vgCh: make(chan *topology.VolumeGrowRequest, 1<<6), clientChans: make(map[string]chan *master_pb.KeepConnectedResponse), grpcDialOption: grpcDialOption, - MasterClient: wdclient.NewMasterClient(grpcDialOption, cluster.MasterType, option.Master, "", peers), + MasterClient: wdclient.NewMasterClient(grpcDialOption, "", cluster.MasterType, option.Master, "", peers), adminLocks: NewAdminLocks(), Cluster: cluster.NewCluster(), } @@ -285,7 +285,7 @@ func (ms *MasterServer) startAdminScripts() { for { time.Sleep(time.Duration(sleepMinutes) * time.Minute) if ms.Topo.IsLeader() { - shellOptions.FilerAddress = ms.GetOneFiler() + shellOptions.FilerAddress = ms.GetOneFiler(cluster.FilerGroup(*shellOptions.FilerGroup)) if shellOptions.FilerAddress == "" { continue } |