diff options
| author | chrislu <chris.lu@gmail.com> | 2023-09-18 18:47:34 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2023-09-18 18:47:34 -0700 |
| commit | 27af11f1e80d738ed495dfca9766c913fd67a7ca (patch) | |
| tree | a4a54f1e1211e273bede5ecc39ed9513316c596d /weed/server/filer_server.go | |
| parent | 0bb97709d41b1be4c74f01dcc65aac6d5f88bd16 (diff) | |
| download | seaweedfs-27af11f1e80d738ed495dfca9766c913fd67a7ca.tar.xz seaweedfs-27af11f1e80d738ed495dfca9766c913fd67a7ca.zip | |
Revert "Revert "Merge branch 'master' into sub""
This reverts commit 0bb97709d41b1be4c74f01dcc65aac6d5f88bd16.
Diffstat (limited to 'weed/server/filer_server.go')
| -rw-r--r-- | weed/server/filer_server.go | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go index 98784bce3..788ee150a 100644 --- a/weed/server/filer_server.go +++ b/weed/server/filer_server.go @@ -94,9 +94,6 @@ 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) { @@ -135,8 +132,6 @@ 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) @@ -189,7 +184,7 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, option *FilerOption) fs.filer.Dlm.LockRing.SetTakeSnapshotCallback(fs.OnDlmChangeSnapshot) - return fs, err + return fs, nil } func (fs *FilerServer) checkWithMaster() { |