lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-19 11:37:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fs.configure: read and local add filer configuration

Browse Source
This commit is contained in:
Chris Lu
2020-11-15 18:09:35 -08:00
parent 0ea5c087ce
commit 71056dae07
2 changed files with 114 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
weed/filer/filer_conf.go
View File

@@ -2,6 +2,7 @@ package filer
import (
"context"
"io"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
@@ -47,10 +48,10 @@ func (fc *FilerConf) loadFromChunks(filer *Filer, chunks []*filer_pb.FileChunk)
return
}
return fc.loadFromBytes(data)
return fc.LoadFromBytes(data)
}
func (fc *FilerConf) loadFromBytes(data []byte) (err error) {
func (fc *FilerConf) LoadFromBytes(data []byte) (err error) {
conf := &filer_pb.FilerConf{}
err = proto.UnmarshalText(string(data), conf)
if err != nil {
@@ -64,9 +65,8 @@ func (fc *FilerConf) loadFromBytes(data []byte) (err error) {
func (fc *FilerConf) doLoadConf(conf *filer_pb.FilerConf) (err error) {
for _, location := range conf.Locations {
err = fc.rules.Put([]byte(location.LocationPrefix), location)
err = fc.AddLocationConf(location)
if err != nil {
glog.Errorf("put location prefix: %v", err)
// this is not recoverable
return nil
}
@@ -74,6 +74,15 @@ func (fc *FilerConf) doLoadConf(conf *filer_pb.FilerConf) (err error) {
return nil
}
func (fc *FilerConf) AddLocationConf(locConf *filer_pb.FilerConf_PathConf) (err error) {
err = fc.rules.Put([]byte(locConf.LocationPrefix), locConf)
if err != nil {
glog.Errorf("put location prefix: %v", err)
}
return
}
var (
EmptyFilerConfPathConf = &filer_pb.FilerConf_PathConf{}
)
@@ -88,3 +97,17 @@ func (fc *FilerConf) MatchStorageRule(path string) (pathConf *filer_pb.FilerConf
}
return pathConf
}
func (fc *FilerConf) ToProto() *filer_pb.FilerConf {
m := &filer_pb.FilerConf{}
fc.rules.Walk(func(key []byte, value interface{}) bool {
pathConf := value.(*filer_pb.FilerConf_PathConf)
m.Locations = append(m.Locations, pathConf)
return true
})
return m
}
func (fc *FilerConf) ToText(writer io.Writer) error {
return proto.MarshalText(writer, fc.ToProto())
}