Skip to content

ferryd: Proactively remove stale deltas as new packages are indexed #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
joebonrichie wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

ferryd: Proactively remove stale deltas as new packages are indexed #73

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 48 additions & 1 deletion src/ferryd/core/repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,6 +467,10 @@ func (r *Repository) removePackageInternal(db libdb.Database, pool *Pool, id str
r.insertMut.Lock()
defer r.insertMut.Unlock()

return r.removePackageInternalLocked(db, pool, id)
}

func (r *Repository) removePackageInternalLocked(db libdb.Database, pool *Pool, id string) error {
poolEntry, err := pool.GetEntry(db, id)
if err != nil {
return nil
Expand Down Expand Up @@ -503,6 +507,10 @@ func (r *Repository) removeDeltaInternal(db libdb.Database, pool *Pool, id strin
return r.removePackageInternal(db, pool, id)
}

func (r *Repository) removeDeltaInternalLocked(db libdb.Database, pool *Pool, id string) error {
return r.removePackageInternalLocked(db, pool, id)
}

// UnrefPackage will remove a package from our storage, and potentially remove the
// entire RepoEntry for the package if none are left.
//
Expand Down Expand Up @@ -538,9 +546,16 @@ func (r *Repository) UnrefPackage(db libdb.Database, pool *Pool, pkgID string) e

// Check out all the deltas
for _, deltaID := range entry.Deltas {
if deltaID == pkgID {
continue
}
pkgDelta, err := pool.GetEntry(db, deltaID)
if err != nil {
return err
log.WithFields(log.Fields{
"deltaID": deltaID,
"error": err,
}).Warning("Failed to find delta in pool during unref")
continue
}

// We found a delta that is referencing us, we must garbage collect it now
Expand Down Expand Up @@ -652,6 +667,7 @@ func (r *Repository) buildSaneEntry(db libdb.Database, pool *Pool, newPkg *libeo
if entry != nil {
repoEntry.Available = entry.Available
repoEntry.Published = entry.Published
repoEntry.Deltas = entry.Deltas

pkgAvail, err := pool.GetEntry(db, repoEntry.Published)
if err == nil {
Expand Down Expand Up @@ -707,6 +723,37 @@ func (r *Repository) AddLocalPackage(db libdb.Database, pool *Pool, pkg *libeopk
return nil
}

// Proactively clean up stale deltas that don't target our new release
var remainDeltas []string
newRelease := pkg.Meta.Package.GetRelease()
for _, deltaID := range repoEntry.Deltas {
poolEntry, err := pool.GetEntry(db, deltaID)
if err != nil {
log.WithFields(log.Fields{
"id": deltaID,
"error": err,
}).Warning("Failed to find delta in pool during proactive cleanup")
continue
}
if poolEntry.Delta == nil || poolEntry.Delta.ToRelease != newRelease {
log.WithFields(log.Fields{
"id": deltaID,
"package": repoEntry.Name,
"repo": r.ID,
}).Info("Removing stale delta during package update")
if err := r.removeDeltaInternalLocked(db, pool, deltaID); err != nil {
log.WithFields(log.Fields{
"id": deltaID,
"error": err,
}).Warning("Failed to remove stale delta during package update")
}
continue
}
remainDeltas = append(remainDeltas, deltaID)
}
repoEntry.Deltas = remainDeltas
sort.Strings(repoEntry.Deltas)

// Construct root dirs
if err := os.MkdirAll(pkgDir, 00755); err != nil {
return err
Expand Down