Skip to content

Commit 9b59307

Browse files
authored
refactor: ctx handle in CleanupTrashBefore (#6567)
Signed-off-by: jiefenghuang <[email protected]>
1 parent 17975a2 commit 9b59307

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

pkg/meta/base.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2930,18 +2930,20 @@ func (m *baseMeta) CleanupTrashBefore(ctx Context, edge time.Time, increProgress
29302930
entries = entries[1:]
29312931
}
29322932
for _, se := range subEntries {
2933-
var c uint64
2934-
st = m.Remove(ctx, e.Inode, string(se.Name), false, m.conf.MaxDeletes, &c)
29352933
if ctx.Canceled() {
29362934
return
29372935
}
2936+
var c uint64
2937+
st = m.Remove(ctx, e.Inode, string(se.Name), false, m.conf.MaxDeletes, &c)
29382938
if st == 0 {
29392939
count += int(c)
29402940
if increProgress != nil {
29412941
increProgress(int(c))
29422942
}
29432943
} else {
2944-
logger.Warnf("delete from trash %s/%s: %s", e.Name, se.Name, st)
2944+
if st != syscall.ETIMEDOUT && st != syscall.EINTR {
2945+
logger.Warnf("delete from trash %s/%s: %s", e.Name, se.Name, st)
2946+
}
29452947
rmdir = false
29462948
}
29472949
}

0 commit comments

Comments
 (0)