mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2025-04-05 20:52:50 +08:00
fuse mount handles ttl entries
fix https://github.com/seaweedfs/seaweedfs/issues/5527
This commit is contained in:
parent
2074e7db67
commit
9ca30e52d5
@ -4,6 +4,7 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
"os"
|
"os"
|
||||||
"sync"
|
"sync"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/seaweedfs/seaweedfs/weed/filer"
|
"github.com/seaweedfs/seaweedfs/weed/filer"
|
||||||
"github.com/seaweedfs/seaweedfs/weed/filer/leveldb"
|
"github.com/seaweedfs/seaweedfs/weed/filer/leveldb"
|
||||||
@ -118,6 +119,9 @@ func (mc *MetaCache) FindEntry(ctx context.Context, fp util.FullPath) (entry *fi
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
if entry.TtlSec > 0 && entry.Crtime.Add(time.Duration(entry.TtlSec)).Before(time.Now()) {
|
||||||
|
return nil, filer_pb.ErrNotFound
|
||||||
|
}
|
||||||
mc.mapIdFromFilerToLocal(entry)
|
mc.mapIdFromFilerToLocal(entry)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@ -143,6 +147,9 @@ func (mc *MetaCache) ListDirectoryEntries(ctx context.Context, dirPath util.Full
|
|||||||
}
|
}
|
||||||
|
|
||||||
_, err := mc.localStore.ListDirectoryEntries(ctx, dirPath, startFileName, includeStartFile, limit, func(entry *filer.Entry) bool {
|
_, err := mc.localStore.ListDirectoryEntries(ctx, dirPath, startFileName, includeStartFile, limit, func(entry *filer.Entry) bool {
|
||||||
|
if entry.TtlSec > 0 && entry.Crtime.Add(time.Duration(entry.TtlSec)).Before(time.Now()) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
mc.mapIdFromFilerToLocal(entry)
|
mc.mapIdFromFilerToLocal(entry)
|
||||||
return eachEntryFunc(entry)
|
return eachEntryFunc(entry)
|
||||||
})
|
})
|
||||||
|
Loading…
Reference in New Issue
Block a user