mirror of
https://github.com/aptly-dev/aptly.git
synced 2026-03-30 16:08:13 +00:00
In current aptly, each repository and snapshot has its own reflist in the database. This brings a few problems with it: - Given a sufficiently large repositories and snapshots, these lists can get enormous, reaching >1MB. This is a problem for LevelDB's overall performance, as it tends to prefer values around the confiruged block size (defaults to just 4KiB). - When you take these large repositories and snapshot them, you have a full, new copy of the reflist, even if only a few packages changed. This means that having a lot of snapshots with a few changes causes the database to basically be full of largely duplicate reflists. - All the duplication also means that many of the same refs are being loaded repeatedly, which can cause some slowdown but, more notably, eats up huge amounts of memory. - Adding on more and more new repositories and snapshots will cause the time and memory spent on things like cleanup and publishing to grow roughly linearly. At the core, there are two problems here: - Reflists get very big because there are just a lot of packages. - Different reflists can tend to duplicate much of the same contents. *Split reflists* aim at solving this by separating reflists into 64 *buckets*. Package refs are sorted into individual buckets according to the following system: - Take the first 3 letters of the package name, after dropping a `lib` prefix. (Using only the first 3 letters will cause packages with similar prefixes to end up in the same bucket, under the assumption that packages with similar names tend to be updated together.) - Take the 64-bit xxhash of these letters. (xxhash was chosen because it relatively good distribution across the individual bits, which is important for the next step.) - Use the first 6 bits of the hash (range [0:63]) as an index into the buckets. Once refs are placed in buckets, a sha256 digest of all the refs in the bucket is taken. These buckets are then stored in the database, split into roughly block-sized segments, and all the repositories and snapshots simply store an array of bucket digests. This approach means that *repositories and snapshots can share their reflist buckets*. If a snapshot is taken of a repository, it will have the same contents, so its split reflist will point to the same buckets as the base repository, and only one copy of each bucket is stored in the database. When some packages in the repository change, only the buckets containing those packages will be modified; all the other buckets will remain unchanged, and thus their contents will still be shared. Later on, when these reflists are loaded, each bucket is only loaded once, short-cutting loaded many megabytes of data. In effect, split reflists are essentially copy-on-write, with only the changed buckets stored individually. Changing the disk format means that a migration needs to take place, so that task is moved into the database cleanup step, which will migrate reflists over to split reflists, as well as delete any unused reflist buckets. All the reflist tests are also changed to additionally test out split reflists; although the internal logic is all shared (since buckets are, themselves, just normal reflists), some special additions are needed to have native versions of the various reflist helper methods. In our tests, we've observed the following improvements: - Memory usage during publish and database cleanup, with `GOMEMLIMIT=2GiB`, goes down from ~3.2GiB (larger than the memory limit!) to ~0.7GiB, a decrease of ~4.5x. - Database size decreases from 1.3GB to 367MB. *In my local tests*, publish times had also decreased down to mere seconds but the same effect wasn't observed on the server, with the times staying around the same. My suspicions are that this is due to I/O performance: my local system is an M1 MBP, which almost certainly has much faster disk speeds than our DigitalOcean block volumes. Split reflists include a side effect of requiring more random accesses from reading all the buckets by their keys, so if your random I/O performance is slower, it might cancel out the benefits. That being said, even in that case, the memory usage and database size advantages still persist. Signed-off-by: Ryan Gonzalez <ryan.gonzalez@collabora.com>
190 lines
6.5 KiB
Go
190 lines
6.5 KiB
Go
package cmd
|
|
|
|
import (
|
|
"fmt"
|
|
"sort"
|
|
"strings"
|
|
|
|
"github.com/aptly-dev/aptly/deb"
|
|
"github.com/aptly-dev/aptly/query"
|
|
"github.com/smira/commander"
|
|
"github.com/smira/flag"
|
|
)
|
|
|
|
func aptlySnapshotPull(cmd *commander.Command, args []string) error {
|
|
var err error
|
|
if len(args) < 4 {
|
|
cmd.Usage()
|
|
return commander.ErrCommandError
|
|
}
|
|
|
|
noDeps := context.Flags().Lookup("no-deps").Value.Get().(bool)
|
|
noRemove := context.Flags().Lookup("no-remove").Value.Get().(bool)
|
|
allMatches := context.Flags().Lookup("all-matches").Value.Get().(bool)
|
|
collectionFactory := context.NewCollectionFactory()
|
|
|
|
// Load <name> snapshot
|
|
snapshot, err := collectionFactory.SnapshotCollection().ByName(args[0])
|
|
if err != nil {
|
|
return fmt.Errorf("unable to pull: %s", err)
|
|
}
|
|
|
|
err = collectionFactory.SnapshotCollection().LoadComplete(snapshot, collectionFactory.RefListCollection())
|
|
if err != nil {
|
|
return fmt.Errorf("unable to pull: %s", err)
|
|
}
|
|
|
|
// Load <source> snapshot
|
|
source, err := collectionFactory.SnapshotCollection().ByName(args[1])
|
|
if err != nil {
|
|
return fmt.Errorf("unable to pull: %s", err)
|
|
}
|
|
|
|
err = collectionFactory.SnapshotCollection().LoadComplete(source, collectionFactory.RefListCollection())
|
|
if err != nil {
|
|
return fmt.Errorf("unable to pull: %s", err)
|
|
}
|
|
|
|
context.Progress().Printf("Dependencies would be pulled into snapshot:\n %s\nfrom snapshot:\n %s\nand result would be saved as new snapshot %s.\n",
|
|
snapshot, source, args[2])
|
|
|
|
// Convert snapshot to package list
|
|
context.Progress().Printf("Loading packages (%d)...\n", snapshot.RefList().Len()+source.RefList().Len())
|
|
packageList, err := deb.NewPackageListFromRefList(snapshot.RefList(), collectionFactory.PackageCollection(), context.Progress())
|
|
if err != nil {
|
|
return fmt.Errorf("unable to load packages: %s", err)
|
|
}
|
|
|
|
sourcePackageList, err := deb.NewPackageListFromRefList(source.RefList(), collectionFactory.PackageCollection(), context.Progress())
|
|
if err != nil {
|
|
return fmt.Errorf("unable to load packages: %s", err)
|
|
}
|
|
|
|
context.Progress().Printf("Building indexes...\n")
|
|
packageList.PrepareIndex()
|
|
sourcePackageList.PrepareIndex()
|
|
|
|
// Calculate architectures
|
|
var architecturesList []string
|
|
|
|
if len(context.ArchitecturesList()) > 0 {
|
|
architecturesList = context.ArchitecturesList()
|
|
} else {
|
|
architecturesList = packageList.Architectures(false)
|
|
}
|
|
|
|
sort.Strings(architecturesList)
|
|
|
|
if len(architecturesList) == 0 {
|
|
return fmt.Errorf("unable to determine list of architectures, please specify explicitly")
|
|
}
|
|
|
|
// Build architecture query: (arch == "i386" | arch == "amd64" | ...)
|
|
var archQuery deb.PackageQuery = &deb.FieldQuery{Field: "$Architecture", Relation: deb.VersionEqual, Value: ""}
|
|
for _, arch := range architecturesList {
|
|
archQuery = &deb.OrQuery{L: &deb.FieldQuery{Field: "$Architecture", Relation: deb.VersionEqual, Value: arch}, R: archQuery}
|
|
}
|
|
|
|
// Initial queries out of arguments
|
|
queries := make([]deb.PackageQuery, len(args)-3)
|
|
for i, arg := range args[3:] {
|
|
value, err := GetStringOrFileContent(arg)
|
|
if err != nil {
|
|
return fmt.Errorf("unable to read package query from file %s: %w", arg, err)
|
|
}
|
|
queries[i], err = query.Parse(value)
|
|
if err != nil {
|
|
return fmt.Errorf("unable to parse query: %s", err)
|
|
}
|
|
// Add architecture filter
|
|
queries[i] = &deb.AndQuery{L: queries[i], R: archQuery}
|
|
}
|
|
|
|
// Filter with dependencies as requested
|
|
result, err := sourcePackageList.Filter(deb.FilterOptions{
|
|
Queries: queries,
|
|
WithDependencies: !noDeps,
|
|
Source: packageList,
|
|
DependencyOptions: context.DependencyOptions(),
|
|
Architectures: architecturesList,
|
|
Progress: context.Progress(),
|
|
})
|
|
if err != nil {
|
|
return fmt.Errorf("unable to pull: %s", err)
|
|
}
|
|
result.PrepareIndex()
|
|
|
|
alreadySeen := map[string]bool{}
|
|
|
|
result.ForEachIndexed(func(pkg *deb.Package) error {
|
|
key := pkg.Architecture + "_" + pkg.Name
|
|
_, seen := alreadySeen[key]
|
|
|
|
// If we haven't seen such name-architecture pair and were instructed to remove, remove it
|
|
if !noRemove && !seen {
|
|
// Remove all packages with the same name and architecture
|
|
pS := packageList.Search(deb.Dependency{Architecture: pkg.Architecture, Pkg: pkg.Name}, true, false)
|
|
for _, p := range pS {
|
|
packageList.Remove(p)
|
|
context.Progress().ColoredPrintf("@r[-]@| %s removed", p)
|
|
}
|
|
}
|
|
|
|
// If !allMatches, add only first matching name-arch package
|
|
if !seen || allMatches {
|
|
packageList.Add(pkg)
|
|
context.Progress().ColoredPrintf("@g[+]@| %s added", pkg)
|
|
}
|
|
|
|
alreadySeen[key] = true
|
|
|
|
return nil
|
|
})
|
|
alreadySeen = nil
|
|
|
|
if context.Flags().Lookup("dry-run").Value.Get().(bool) {
|
|
context.Progress().Printf("\nNot creating snapshot, as dry run was requested.\n")
|
|
} else {
|
|
// Create <destination> snapshot
|
|
destination := deb.NewSnapshotFromPackageList(args[2], []*deb.Snapshot{snapshot, source}, packageList,
|
|
fmt.Sprintf("Pulled into '%s' with '%s' as source, pull request was: '%s'", snapshot.Name, source.Name, strings.Join(args[3:], " ")))
|
|
|
|
err = collectionFactory.SnapshotCollection().Add(destination, collectionFactory.RefListCollection())
|
|
if err != nil {
|
|
return fmt.Errorf("unable to create snapshot: %s", err)
|
|
}
|
|
|
|
context.Progress().Printf("\nSnapshot %s successfully created.\nYou can run 'aptly publish snapshot %s' to publish snapshot as Debian repository.\n", destination.Name, destination.Name)
|
|
}
|
|
return err
|
|
}
|
|
|
|
func makeCmdSnapshotPull() *commander.Command {
|
|
cmd := &commander.Command{
|
|
Run: aptlySnapshotPull,
|
|
UsageLine: "pull <name> <source> <destination> <package-query> ...",
|
|
Short: "pull packages from another snapshot",
|
|
Long: `
|
|
Command pull pulls new packages along with its' dependencies to snapshot <name>
|
|
from snapshot <source>. Pull can upgrade package version in <name> with
|
|
versions from <source> following dependencies. New snapshot <destination>
|
|
is created as a result of this process. Packages could be specified simply
|
|
as 'package-name' or as package queries.
|
|
|
|
Use '@file' syntax to read package queries from file and '@-' to read from stdin.
|
|
|
|
Example:
|
|
|
|
$ aptly snapshot pull wheezy-main wheezy-backports wheezy-new-xorg xorg-server-server
|
|
`,
|
|
Flag: *flag.NewFlagSet("aptly-snapshot-pull", flag.ExitOnError),
|
|
}
|
|
|
|
cmd.Flag.Bool("dry-run", false, "don't create destination snapshot, just show what would be pulled")
|
|
cmd.Flag.Bool("no-deps", false, "don't process dependencies, just pull listed packages")
|
|
cmd.Flag.Bool("no-remove", false, "don't remove other package versions when pulling package")
|
|
cmd.Flag.Bool("all-matches", false, "pull all the packages that satisfy the dependency version requirements")
|
|
|
|
return cmd
|
|
}
|