fix(dataexchange): filter subdirs before inbox eviction early check (PILOT-183)#34
Merged
Merged
Conversation
…PILOT-183) The evictInboxOverflow function's early-return check used the raw os.ReadDir entry count (including subdirectories) to decide whether eviction is needed. A directory at inboxMaxFiles + 1 entries (where the +1 is a subdir) would skip eviction entirely, even though only maxFiles of real files exist — allowing the real file count to grow unchecked on subsequent saves. Fix: move the IsDir() filter before the early-return len check, so both guards operate on file-only entries. The byte-based eviction path (evictInboxOverflowByBytes) was already correct. Closes PILOT-183
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
The
evictInboxOverflowfunction's early-return check uses the rawos.ReadDirentry count (including subdirectories) to decide whether eviction is needed. When a subdirectory inflates the count past the cap, eviction is skipped even though only legitimate files are at the cap — allowing the real file count to grow unchecked.Fix
Move the
IsDir()filter before the first len check, so both guards (early-return + eviction trigger) operate on file-only entries.Verification
go build ./...— cleango vet ./...— cleango test ./... -count=1— PASS (0.347s)TestEvictInboxOverflow_PILOT183_SubdirMixedWithFilesandTestEvictInboxOverflow_PILOT183_SubdirInflatesEntriesboth passFiles
service.go— +1/-3 (moved IsDir filter before early return)zz_service_errors_test.go— +1/-3 (updated comment to reflect landed fix)Closes PILOT-183