diff options
| author | chrislu <chris.lu@gmail.com> | 2023-02-01 02:38:09 -0800 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2023-02-01 02:38:09 -0800 |
| commit | 0932437a1c772226d430018ae908be866ae8ef8b (patch) | |
| tree | a5c7d10cd6a413e5319a64baae8496dced6d155a | |
| parent | c47f75eb5b30a744e444a26294be79b40cb80b0b (diff) | |
| parent | fe573f26a8db0a4c3bbd5e645c4fa2192683c97e (diff) | |
| download | seaweedfs-0932437a1c772226d430018ae908be866ae8ef8b.tar.xz seaweedfs-0932437a1c772226d430018ae908be866ae8ef8b.zip | |
Merge branch 'master' of https://github.com/seaweedfs/seaweedfs
| -rw-r--r-- | weed/filer/filer.go | 11 | ||||
| -rw-r--r-- | weed/mount/page_writer/page_chunk_mem.go | 10 | ||||
| -rw-r--r-- | weed/mount/weedfs_file_mkrm.go | 6 |
3 files changed, 13 insertions, 14 deletions
diff --git a/weed/filer/filer.go b/weed/filer/filer.go index 07d40acc8..f6f06d9b2 100644 --- a/weed/filer/filer.go +++ b/weed/filer/filer.go @@ -3,14 +3,15 @@ package filer import ( "context" "fmt" - "github.com/seaweedfs/seaweedfs/weed/cluster" - "github.com/seaweedfs/seaweedfs/weed/pb" - "github.com/seaweedfs/seaweedfs/weed/pb/master_pb" "os" "sort" "strings" "time" + "github.com/seaweedfs/seaweedfs/weed/cluster" + "github.com/seaweedfs/seaweedfs/weed/pb" + "github.com/seaweedfs/seaweedfs/weed/pb/master_pb" + "google.golang.org/grpc" "github.com/seaweedfs/seaweedfs/weed/glog" @@ -254,7 +255,9 @@ func (f *Filer) ensureParentDirectoryEntry(ctx context.Context, entry *Entry, di return fmt.Errorf("mkdir %s: %v", dirPath, mkdirErr) } } else { - f.NotifyUpdateEvent(ctx, nil, dirEntry, false, isFromOtherCluster, nil) + if !strings.HasPrefix("/"+util.Join(dirParts[:]...), SystemLogDir) { + f.NotifyUpdateEvent(ctx, nil, dirEntry, false, isFromOtherCluster, nil) + } } } else if !dirEntry.IsDirectory() { diff --git a/weed/mount/page_writer/page_chunk_mem.go b/weed/mount/page_writer/page_chunk_mem.go index 3928f7077..70814262d 100644 --- a/weed/mount/page_writer/page_chunk_mem.go +++ b/weed/mount/page_writer/page_chunk_mem.go @@ -1,10 +1,11 @@ package page_writer import ( - "github.com/seaweedfs/seaweedfs/weed/util" - "github.com/seaweedfs/seaweedfs/weed/util/mem" "sync" "sync/atomic" + + "github.com/seaweedfs/seaweedfs/weed/util" + "github.com/seaweedfs/seaweedfs/weed/util/mem" ) var ( @@ -100,11 +101,6 @@ func (mc *MemChunk) SaveContent(saveFn SaveToStorageFunc) { if saveFn == nil { return } - for t := mc.usage.head.next; t != mc.usage.tail; t = t.next { - reader := util.NewBytesReader(mc.buf[t.StartOffset:t.stopOffset]) - saveFn(reader, int64(mc.logicChunkIndex)*mc.chunkSize+t.StartOffset, t.Size(), t.TsNs, func() { - }) - } for t := mc.usage.head.next; t != mc.usage.tail; t = t.next { startOffset := t.StartOffset diff --git a/weed/mount/weedfs_file_mkrm.go b/weed/mount/weedfs_file_mkrm.go index 02171fe99..2da316a50 100644 --- a/weed/mount/weedfs_file_mkrm.go +++ b/weed/mount/weedfs_file_mkrm.go @@ -3,12 +3,13 @@ package mount import ( "context" "fmt" + "syscall" + "time" + "github.com/hanwen/go-fuse/v2/fuse" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" - "syscall" - "time" ) /** @@ -144,7 +145,6 @@ func (wfs *WFS) Unlink(cancel <-chan struct{}, header *fuse.InHeader, name strin return fuse.EIO } - wfs.metaCache.DeleteEntry(context.Background(), entryFullPath) wfs.inodeToPath.RemovePath(entryFullPath) return fuse.OK |