diff options
| author | chrislu <chris.lu@gmail.com> | 2023-09-18 16:13:20 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2023-09-18 16:13:20 -0700 |
| commit | 0bb97709d41b1be4c74f01dcc65aac6d5f88bd16 (patch) | |
| tree | 9be51ec65888a0741f63912c9bc125d0278d3360 /weed/server/filer_server.go | |
| parent | 8cb42c39adbbe7f082009cf91eccb4d2dc527235 (diff) | |
| download | seaweedfs-0bb97709d41b1be4c74f01dcc65aac6d5f88bd16.tar.xz seaweedfs-0bb97709d41b1be4c74f01dcc65aac6d5f88bd16.zip | |
Revert "Merge branch 'master' into sub"
This reverts commit 4d414f54a224142f3f4d934f4af3b5dceb6fec6b, reversing
changes made to 482742514656e9b5a652acf7406740fbc55db13d.
Diffstat (limited to 'weed/server/filer_server.go')
| -rw-r--r-- | weed/server/filer_server.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go index 788ee150a..98784bce3 100644 --- a/weed/server/filer_server.go +++ b/weed/server/filer_server.go @@ -94,6 +94,9 @@ type FilerServer struct { // track known metadata listeners knownListenersLock sync.Mutex knownListeners map[int32]int32 + + // client to assign file id + assignProxy *operation.AssignProxy } func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, option *FilerOption) (fs *FilerServer, err error) { @@ -132,6 +135,8 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, option *FilerOption) go stats.LoopPushingMetric("filer", string(fs.option.Host), fs.metricsAddress, fs.metricsIntervalSec) go fs.filer.KeepMasterClientConnected() + fs.assignProxy, err = operation.NewAssignProxy(fs.filer.GetMaster, fs.grpcDialOption, 16) + if !util.LoadConfiguration("filer", false) { v.SetDefault("leveldb2.enabled", true) v.SetDefault("leveldb2.dir", option.DefaultLevelDbDir) @@ -184,7 +189,7 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, option *FilerOption) fs.filer.Dlm.LockRing.SetTakeSnapshotCallback(fs.OnDlmChangeSnapshot) - return fs, nil + return fs, err } func (fs *FilerServer) checkWithMaster() { |