diff options
| -rw-r--r-- | weed/filer2/filer.go | 6 | ||||
| -rw-r--r-- | weed/filer2/filer_notify.go | 2 | ||||
| -rw-r--r-- | weed/server/filer_grpc_server_sub_meta.go | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/weed/filer2/filer.go b/weed/filer2/filer.go index 4fb16f81d..769ff4fac 100644 --- a/weed/filer2/filer.go +++ b/weed/filer2/filer.go @@ -35,7 +35,7 @@ type Filer struct { FsyncBuckets []string buckets *FilerBuckets Cipher bool - MetaLogBuffer *log_buffer.LogBuffer + LocalMetaLogBuffer *log_buffer.LogBuffer metaLogCollection string metaLogReplication string } @@ -47,7 +47,7 @@ func NewFiler(masters []string, grpcDialOption grpc.DialOption, filerHost string fileIdDeletionQueue: util.NewUnboundedQueue(), GrpcDialOption: grpcDialOption, } - f.MetaLogBuffer = log_buffer.NewLogBuffer(time.Minute, f.logFlushFunc, notifyFn) + f.LocalMetaLogBuffer = log_buffer.NewLogBuffer(time.Minute, f.logFlushFunc, notifyFn) f.metaLogCollection = collection f.metaLogReplication = replication @@ -318,6 +318,6 @@ func (f *Filer) cacheSetDirectory(dirpath string, dirEntry *Entry, level int) { } func (f *Filer) Shutdown() { - f.MetaLogBuffer.Shutdown() + f.LocalMetaLogBuffer.Shutdown() f.store.Shutdown() } diff --git a/weed/filer2/filer_notify.go b/weed/filer2/filer_notify.go index ceb3677ce..340f19fb5 100644 --- a/weed/filer2/filer_notify.go +++ b/weed/filer2/filer_notify.go @@ -67,7 +67,7 @@ func (f *Filer) logMetaEvent(ctx context.Context, fullpath string, eventNotifica return } - f.MetaLogBuffer.AddToBuffer([]byte(dir), data) + f.LocalMetaLogBuffer.AddToBuffer([]byte(dir), data) } diff --git a/weed/server/filer_grpc_server_sub_meta.go b/weed/server/filer_grpc_server_sub_meta.go index c82a58b16..e7e5b0d48 100644 --- a/weed/server/filer_grpc_server_sub_meta.go +++ b/weed/server/filer_grpc_server_sub_meta.go @@ -37,7 +37,7 @@ func (fs *FilerServer) SubscribeMetadata(req *filer_pb.SubscribeMetadataRequest, lastReadTime = time.Unix(0, processedTsNs) } - err = fs.filer.MetaLogBuffer.LoopProcessLogData(lastReadTime, func() bool { + err = fs.filer.LocalMetaLogBuffer.LoopProcessLogData(lastReadTime, func() bool { fs.listenersLock.Lock() fs.listenersCond.Wait() fs.listenersLock.Unlock() @@ -63,7 +63,7 @@ func (fs *FilerServer) SubscribeLocalMetadata(req *filer_pb.SubscribeMetadataReq eachLogEntryFn := eachLogEntryFn(eachEventNotificationFn) - err := fs.filer.MetaLogBuffer.LoopProcessLogData(lastReadTime, func() bool { + err := fs.filer.LocalMetaLogBuffer.LoopProcessLogData(lastReadTime, func() bool { fs.listenersLock.Lock() fs.listenersCond.Wait() fs.listenersLock.Unlock() |