gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

filer: leveldb2 supports peers also

Browse source
This commit is contained in:
Chris Lu 2020-07-13 00:05:20 -07:00
parent 5ba894bb72
commit 7597831cac
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
weed/filer2/filer.go
View file

@ -61,14 +61,11 @@ func NewFiler(masters []string, grpcDialOption grpc.DialOption,
func (f *Filer) AggregateFromPeers(self string, filers []string) { func (f *Filer) AggregateFromPeers(self string, filers []string) {
// set peers // set peers
if strings.HasPrefix(f.GetStore().GetName(), "leveldb") && len(filers) > 0 {
glog.Fatalf("filers using separate leveldb stores should not configure %d peers %+v", len(filers), filers)
}
if len(filers) == 0 { if len(filers) == 0 {
filers = append(filers, self) filers = append(filers, self)
} }
f.MetaAggregator = NewMetaAggregator(filers, f.GrpcDialOption) f.MetaAggregator = NewMetaAggregator(filers, f.GrpcDialOption)
f.MetaAggregator.StartLoopSubscribe(f, self, time.Now().UnixNano()) f.MetaAggregator.StartLoopSubscribe(f, self)
} }

4
weed/filer2/leveldb2/leveldb2_local_store.go
View file

@ -7,10 +7,6 @@ import (
"github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/util"
) )
func init() {
filer2.Stores = append(filer2.Stores, &LevelDB2Store{})
}
var ( var (
_ = filer2.FilerLocalStore(&LevelDB2Store{}) _ = filer2.FilerLocalStore(&LevelDB2Store{})
) )

18
weed/filer2/meta_aggregator.go
View file

@ -37,25 +37,29 @@ func NewMetaAggregator(filers []string, grpcDialOption grpc.DialOption) *MetaAgg
return t return t
} }
func (ma *MetaAggregator) StartLoopSubscribe(f *Filer, self string, lastTsNs int64) { func (ma *MetaAggregator) StartLoopSubscribe(f *Filer, self string) {
for _, filer := range ma.filers { for _, filer := range ma.filers {
go ma.subscribeToOneFiler(f, self, filer, lastTsNs) go ma.subscribeToOneFiler(f, self, filer)
} }
} }
func (ma *MetaAggregator) subscribeToOneFiler(f *Filer, filer string, self string, lastTsNs int64) { func (ma *MetaAggregator) subscribeToOneFiler(f *Filer, self string, filer string) {
var maybeReplicateMetadataChange func(*filer_pb.SubscribeMetadataResponse) var maybeReplicateMetadataChange func(*filer_pb.SubscribeMetadataResponse)
lastPersistTime := time.Now() lastPersistTime := time.Now()
changesSinceLastPersist := 0 changesSinceLastPersist := 0
lastTsNs := int64(0)
MaxChangeLimit := 100 MaxChangeLimit := 100
if localStore, ok := f.store.actualStore.(FilerLocalStore); ok { if localStore, ok := f.store.actualStore.(FilerLocalStore); ok {
if prevTsNs, err := localStore.ReadOffset(filer); err == nil {
lastTsNs = prevTsNs
}
if self != filer { if self != filer {
if prevTsNs, err := localStore.ReadOffset(filer); err == nil {
lastTsNs = prevTsNs
}
glog.V(0).Infof("follow filer: %v, lastTsNs=%d", filer, lastTsNs)
maybeReplicateMetadataChange = func(event *filer_pb.SubscribeMetadataResponse) { maybeReplicateMetadataChange = func(event *filer_pb.SubscribeMetadataResponse) {
if err := Replay(f.store.actualStore, event); err != nil { if err := Replay(f.store.actualStore, event); err != nil {
glog.Errorf("failed to reply metadata change from %v: %v", filer, err) glog.Errorf("failed to reply metadata change from %v: %v", filer, err)
@ -71,6 +75,8 @@ func (ma *MetaAggregator) subscribeToOneFiler(f *Filer, filer string, self strin
} }
} }
} }
} else {
glog.V(0).Infof("skipping following self: %v", self)
} }
} }