lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-22 20:34:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'new_master' into ydb

Browse Source 
# Conflicts:
#	go.mod
#	go.sum
This commit is contained in:
Konstantin Lebedev
2022-05-03 00:13:57 +05:00
parent 7640e650e5 998c1973ea
commit d8925b4e83
52 changed files with 772 additions and 794 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
weed/server/filer_server.go
View File

@@ -51,6 +51,7 @@ import (
type FilerOption struct {
Masters map[string]pb.ServerAddress
FilerGroup string
Collection string
DefaultReplication string
DisableDirListing bool
@@ -119,7 +120,7 @@ func NewFilerServer(defaultMux, readonlyMux *http.ServeMux, option *FilerOption)
glog.Fatal("master list is required!")
}
fs.filer = filer.NewFiler(option.Masters, fs.grpcDialOption, option.Host, option.Collection, option.DefaultReplication, option.DataCenter, func() {
fs.filer = filer.NewFiler(option.Masters, fs.grpcDialOption, option.Host, option.FilerGroup, option.Collection, option.DefaultReplication, option.DataCenter, func() {
fs.listenersCond.Broadcast()
})
fs.filer.Cipher = option.Cipher