store: refactor and improve store cache #14524
Conversation
store/cache.go
Outdated
| return nil | ||
| } | ||
|
|
||
| var pruneCandidates []os.FileInfo |
There was a problem hiding this comment.
Just commenting in case it wasn't intentional but this no longer pre-allocates the slice. Probably not a big deal since this doesn't happen often or with lots of entries
There was a problem hiding this comment.
Thanks for the comment. It was intentional, there should be few entries meeting the criteria. However, I'm thinking maybe it makes sense to preallocate the slice for say 1/4 or 1/5 length of entries.
There was a problem hiding this comment.
Pushed a tweak for this. Please have a look
| @@ -165,54 +165,43 @@ func (cm *CacheManager) cleanup() error { | |||
| return err | |||
| } | |||
|
|
|||
| // we need the modtime so convert to FileInfo | |||
| fil := make([]os.FileInfo, 0, len(entries)) | |||
| if len(entries) <= cm.maxItems { | |||
bboozzoo
force-pushed
the
bboozzoo/store-cache-improve
branch
from
d1fab03
to
7cc600f
Compare
There are tests covering this already. The branch is simply a small improvement I did while investigating another problem around the cache and pre-downloads. |
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #14524 +/- ##
==========================================
+ Coverage 78.95% 78.97% +0.02%
==========================================
Files 1084 1085 +1
Lines 146638 147115 +477
==========================================
+ Hits 115773 116181 +408
- Misses 23667 23713 +46
- Partials 7198 7221 +23
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
bboozzoo
force-pushed
the
bboozzoo/store-cache-improve
branch
from
7cc600f
to
4a62779
Compare
Refactor the store cache manager cleanup to make it easier to follow and do not keep repeating the same operations multiple times. Signed-off-by: Maciej Borzecki <[email protected]>
bboozzoo
force-pushed
the
bboozzoo/store-cache-improve
branch
from
4a62779
to
a268a30
Compare
|
Failing tests:
|
* master: (486 commits) o/snapstate, daemon: respect lanes that are passed to snapstate.InstallComponents, snapstate.InstallComponentPath (canonical#14695) cmd/snap-bootstrap: support for noexec and nodev options in preparation of tightening mount options for ubuntu core partitions o/hookstate: allow snapctl model command for kernel snaps many: complete various component cross-checks (canonical#14634) github: only check formatting when using latest/stable Go tests/main/auto-refresh-backoff: fix sorting of changes from the state (canonical#14691) store: place downloaded file in cache after rebuilding from delta (canonical#14680) interfaces/desktop: Improve launch entry and systray integration with session (canonical#14132) interfaces: desktop session improvements to shutdown,{system,upower}-observe and desktop (canonical#13947) github: run make distcheck packaging: symlink fedora-latest to fedora packaging github: run unit tests on fedora:latest s/snapenv, snapdtool: fix tests that depend on user's SNAP_REEXEC (canonical#14681) store: refactor and improve store cache (canonical#14524) many: registry API creates transaction commit change (canonical#14675) tests/main/nvidia-files: set ubuntu-20.04-64/550-server to broken packaging in table of expectations (canonical#14679) c/snap-mgmt: unmount components before unmounting snaps (canonical#14664) .github/workflows/coverity-scan.yaml: add github action for Coverity (canonical#14654) data/selinux: remove timedatex (canonical#14670) c/snap-bootstrap: import users from hybrid system into recovery system (canonical#14521) ...
Refactor the store cache manager cleanup to make it easier to follow and do not keep repeating the same operations multiple times.
Thanks for helping us make a better snapd!
Have you signed the license agreement and read the contribution guide?