diff options
| author | chrislu <chris.lu@gmail.com> | 2022-03-26 13:33:17 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-03-26 13:33:17 -0700 |
| commit | 21e08986317995a89274b5fc7dad80a42006bc16 (patch) | |
| tree | ccc6f6a1c00282011697e7a7f004cfd78ec1362f /weed/server | |
| parent | 4ba7127ab1bf8fa045d623d0c6293a083f209ad7 (diff) | |
| download | seaweedfs-21e08986317995a89274b5fc7dad80a42006bc16.tar.xz seaweedfs-21e08986317995a89274b5fc7dad80a42006bc16.zip | |
refactor: change masters from a slice to a map
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/filer_grpc_server.go | 2 | ||||
| -rw-r--r-- | weed/server/filer_server.go | 2 | ||||
| -rw-r--r-- | weed/server/master_server.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/weed/server/filer_grpc_server.go b/weed/server/filer_grpc_server.go index 3f65660ee..5a5714156 100644 --- a/weed/server/filer_grpc_server.go +++ b/weed/server/filer_grpc_server.go @@ -393,7 +393,7 @@ func (fs *FilerServer) GetFilerConfiguration(ctx context.Context, req *filer_pb. clusterId, _ := fs.filer.Store.KvGet(context.Background(), []byte("clusterId")) t := &filer_pb.GetFilerConfigurationResponse{ - Masters: pb.ToAddressStrings(fs.option.Masters), + Masters: pb.ToAddressStringsFromMap(fs.option.Masters), Collection: fs.option.Collection, Replication: fs.option.DefaultReplication, MaxMb: uint32(fs.option.MaxMB), diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go index 497f59568..7edd5870f 100644 --- a/weed/server/filer_server.go +++ b/weed/server/filer_server.go @@ -48,7 +48,7 @@ import ( ) type FilerOption struct { - Masters []pb.ServerAddress + Masters map[string]pb.ServerAddress Collection string DefaultReplication string DisableDirListing bool diff --git a/weed/server/master_server.go b/weed/server/master_server.go index 671432d5c..b63e3a418 100644 --- a/weed/server/master_server.go +++ b/weed/server/master_server.go @@ -75,7 +75,7 @@ type MasterServer struct { Cluster *cluster.Cluster } -func NewMasterServer(r *mux.Router, option *MasterOption, peers []pb.ServerAddress) *MasterServer { +func NewMasterServer(r *mux.Router, option *MasterOption, peers map[string]pb.ServerAddress) *MasterServer { v := util.GetViper() signingKey := v.GetString("jwt.signing.key") |