diff options
| author | chrislu <chris.lu@gmail.com> | 2022-05-30 22:47:29 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-05-30 22:47:29 -0700 |
| commit | f4a6da6cb276f1891b01097670b044fd4ee6139d (patch) | |
| tree | 8b92c13091e1d9973ce21e4f0c9ac143bd667cfd /weed/server/filer_server.go | |
| parent | 596c3860cac83a75ae9ce728c8a043133c03d098 (diff) | |
| parent | ca01ce05249c336ed380d9f77efbee68213b8a37 (diff) | |
| download | seaweedfs-f4a6da6cb276f1891b01097670b044fd4ee6139d.tar.xz seaweedfs-f4a6da6cb276f1891b01097670b044fd4ee6139d.zip | |
Merge branch 'master' of https://github.com/chrislusf/seaweedfs
Diffstat (limited to 'weed/server/filer_server.go')
| -rw-r--r-- | weed/server/filer_server.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go index 82b15084d..d2c1d67f5 100644 --- a/weed/server/filer_server.go +++ b/weed/server/filer_server.go @@ -151,7 +151,7 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, option *FilerOption) // TODO deprecated, will be be removed after 2020-12-31 // replaced by https://github.com/chrislusf/seaweedfs/wiki/Path-Specific-Configuration // fs.filer.FsyncBuckets = v.GetStringSlice("filer.options.buckets_fsync") - fs.filer.LoadConfiguration(v) + isFresh := fs.filer.LoadConfiguration(v) notification.LoadConfiguration(v, "notification.") @@ -164,7 +164,15 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, option *FilerOption) readonlyMux.HandleFunc("/", fs.readonlyFilerHandler) } - fs.filer.AggregateFromPeers(option.Host) + existingNodes := fs.filer.ListExistingPeerUpdates() + startFromTime := time.Now().Add(-filer.LogFlushInterval) + if isFresh { + glog.V(0).Infof("%s bootstrap from peers %+v", option.Host, existingNodes) + if err := fs.filer.MaybeBootstrapFromPeers(option.Host, existingNodes, startFromTime); err == nil { + glog.Fatalf("%s bootstrap from %+v", option.Host, existingNodes) + } + } + fs.filer.AggregateFromPeers(option.Host, existingNodes, startFromTime) fs.filer.LoadBuckets() |