gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

shell: add minCacheAge flag to remote.uncache command (#8225)

Browse Source 
* add minCacheAge flag to remote.uncache command #8221

* address code review feedback: add nil check and improve test isolation

* address code review feedback: use consistent timestamp in FileFilter
This commit is contained in:
Chris Lu
2026-02-05 12:57:27 -08:00
committed by GitHub
parent f84b70c362
commit 3306abae10
2 changed files with 132 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
weed/shell/command_remote_uncache.go
View File

@@ -36,7 +36,8 @@ func (c *commandRemoteUncache) Help() string {
remote.uncache -dir=/xxx/some/sub/dir -include=*.pdf
remote.uncache -dir=/xxx/some/sub/dir -exclude=*.txt
remote.uncache -minSize=1024000 # uncache files larger than 100K
remote.uncache -minAge=3600 # uncache files older than 1 hour
remote.uncache -minAge=3600 # uncache files older than 1 hour (created time)
remote.uncache -minCacheAge=3600 # uncache files older than 1 hour (cached time)
`
}
@@ -128,12 +129,14 @@ func (c *commandRemoteUncache) uncacheContentData(commandEnv *CommandEnv, writer
}
type FileFilter struct {
include *string
exclude *string
minSize *int64
maxSize *int64
minAge *int64
maxAge *int64
include *string
exclude *string
minSize *int64
maxSize *int64
minAge *int64
maxAge *int64
minCacheAge *int64
now int64
}
func newFileFilter(remoteMountCommand *flag.FlagSet) (ff *FileFilter) {
@@ -142,12 +145,17 @@ func newFileFilter(remoteMountCommand *flag.FlagSet) (ff *FileFilter) {
ff.exclude = remoteMountCommand.String("exclude", "", "pattens of file names, e.g., *.pdf, *.html, ab?d.txt")
ff.minSize = remoteMountCommand.Int64("minSize", -1, "minimum file size in bytes")
ff.maxSize = remoteMountCommand.Int64("maxSize", -1, "maximum file size in bytes")
ff.minAge = remoteMountCommand.Int64("minAge", -1, "minimum file age in seconds")
ff.maxAge = remoteMountCommand.Int64("maxAge", -1, "maximum file age in seconds")
ff.minAge = remoteMountCommand.Int64("minAge", -1, "minimum file age in seconds (created time)")
ff.maxAge = remoteMountCommand.Int64("maxAge", -1, "maximum file age in seconds (created time)")
ff.minCacheAge = remoteMountCommand.Int64("minCacheAge", -1, "minimum file cache age in seconds (last cached time)")
ff.now = time.Now().Unix()
return
}
func (ff *FileFilter) matches(entry *filer_pb.Entry) bool {
if entry.Attributes == nil {
return false
}
if *ff.include != "" {
if ok, _ := filepath.Match(*ff.include, entry.Name); !ok {
return false
@@ -169,12 +177,21 @@ func (ff *FileFilter) matches(entry *filer_pb.Entry) bool {
}
}
if *ff.minAge != -1 {
if entry.Attributes.Crtime+*ff.minAge > time.Now().Unix() {
if entry.Attributes.Crtime+*ff.minAge > ff.now {
return false
}
}
if *ff.maxAge != -1 {
if entry.Attributes.Crtime+*ff.maxAge < time.Now().Unix() {
if entry.Attributes.Crtime+*ff.maxAge < ff.now {
return false
}
}
if *ff.minCacheAge != -1 {
lastCachedTime := entry.Attributes.Crtime
if entry.RemoteEntry != nil && entry.RemoteEntry.LastLocalSyncTsNs > 0 {
lastCachedTime = entry.RemoteEntry.LastLocalSyncTsNs / 1e9
}
if lastCachedTime+*ff.minCacheAge > ff.now {
return false
}
}