From c59068d0f30722c731f39eaab0c08588a8b58a13 Mon Sep 17 00:00:00 2001 From: chrislu Date: Mon, 30 May 2022 16:28:36 -0700 Subject: [PATCH] refactor --- weed/filer/filer.go | 4 ++-- weed/server/filer_server.go | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/weed/filer/filer.go b/weed/filer/filer.go index bbe22e105..73ab3022f 100644 --- a/weed/filer/filer.go +++ b/weed/filer/filer.go @@ -68,12 +68,12 @@ func NewFiler(masters map[string]pb.ServerAddress, grpcDialOption grpc.DialOptio return f } -func (f *Filer) AggregateFromPeers(self pb.ServerAddress) { +func (f *Filer) AggregateFromPeers(self pb.ServerAddress, existingNodes []*master_pb.ClusterNodeUpdate) { f.MetaAggregator = NewMetaAggregator(f, self, f.GrpcDialOption) f.MasterClient.OnPeerUpdate = f.MetaAggregator.OnPeerUpdate - for _, peerUpdate := range f.ListExistingPeerUpdates() { + for _, peerUpdate := range existingNodes { f.MetaAggregator.OnPeerUpdate(peerUpdate) } diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go index 82b15084d..b52baf9c9 100644 --- a/weed/server/filer_server.go +++ b/weed/server/filer_server.go @@ -164,7 +164,9 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, option *FilerOption) readonlyMux.HandleFunc("/", fs.readonlyFilerHandler) } - fs.filer.AggregateFromPeers(option.Host) + existingNodes := fs.filer.ListExistingPeerUpdates() + + fs.filer.AggregateFromPeers(option.Host, existingNodes) fs.filer.LoadBuckets()