When listing, do not count delete markers (#15689)

When limiting listing do not count delete, since they may be discarded.

Extend limit, since we may be discarding the forward-to marker.

Fix directories always being sent to resolve, since they didn't return as match.
This commit is contained in:
Klaus Post
2022-09-14 21:11:27 +02:00
committed by GitHub
parent 5c61c3ccdc
commit eee1ce305c
3 changed files with 31 additions and 12 deletions

View File

@@ -85,6 +85,12 @@ func (e *metaCacheEntry) matches(other *metaCacheEntry, strict bool) (prefer *me
return other, false
}
if other.isDir() || e.isDir() {
if e.isDir() {
return e, other.isDir() == e.isDir()
}
return other, other.isDir() == e.isDir()
}
eVers, eErr := e.xlmeta()
oVers, oErr := other.xlmeta()
if eErr != nil || oErr != nil {