diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-11-06 14:25:06 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-11-06 14:26:26 -0700 |
| commit | 751a7073e3bf7e45f75a7638da256720c2d902a7 (patch) | |
| tree | 67998d568bc5aa69ab0c6aac5be7f109e447beeb /weed/server | |
| parent | 04663c3611326a8bac87d47fc4a2c546c6d9acdd (diff) | |
| parent | e0fc2898e9f9ec24ac2a94f7fba4b440058e2d25 (diff) | |
| download | seaweedfs-751a7073e3bf7e45f75a7638da256720c2d902a7.tar.xz seaweedfs-751a7073e3bf7e45f75a7638da256720c2d902a7.zip | |
Merge branch 'flexible_filer_addition'
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/filer_server.go | 4 | ||||
| -rw-r--r-- | weed/server/master_grpc_server_cluster.go | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go index aa66b4187..a47fdb28c 100644 --- a/weed/server/filer_server.go +++ b/weed/server/filer_server.go @@ -108,7 +108,7 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, option *FilerOption) fs.checkWithMaster() go stats.LoopPushingMetric("filer", string(fs.option.Host), fs.metricsAddress, fs.metricsIntervalSec) - go fs.filer.KeepConnectedToMaster() + go fs.filer.KeepMasterClientConnected() v := util.GetViper() if !util.LoadConfiguration("filer", false) { @@ -143,7 +143,7 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, option *FilerOption) readonlyMux.HandleFunc("/", fs.readonlyFilerHandler) } - fs.filer.AggregateFromPeers(option.Host, option.Filers) + fs.filer.AggregateFromPeers(option.Host) fs.filer.LoadBuckets() diff --git a/weed/server/master_grpc_server_cluster.go b/weed/server/master_grpc_server_cluster.go index 8e80cade3..4a61d2e29 100644 --- a/weed/server/master_grpc_server_cluster.go +++ b/weed/server/master_grpc_server_cluster.go @@ -14,6 +14,7 @@ func (ms *MasterServer) ListClusterNodes(ctx context.Context, req *master_pb.Lis resp.ClusterNodes = append(resp.ClusterNodes, &master_pb.ListClusterNodesResponse_ClusterNode{ Address: string(node.Address), Version: node.Version, + IsLeader: ms.Cluster.IsOneLeader(node.Address), }) } return resp, nil |