diff --git a/internal/repository/packer_manager.go b/internal/repository/packer_manager.go index 99d0460a0..3b2734f53 100644 --- a/internal/repository/packer_manager.go +++ b/internal/repository/packer_manager.go @@ -38,8 +38,6 @@ type packerManager struct { } const minPackSize = 4 * 1024 * 1024 -const maxPackSize = 16 * 1024 * 1024 -const maxPackers = 200 // newPackerManager returns an new packer manager which writes temporary files // to a temporary directory @@ -58,15 +56,9 @@ func (r *packerManager) findPacker(size uint) (packer *Packer, err error) { // search for a suitable packer if len(r.packers) > 0 { - debug.Log("searching packer for %d bytes\n", size) - for i, p := range r.packers { - if p.Packer.Size()+size < maxPackSize { - debug.Log("found packer %v", p) - // remove from list - r.packers = append(r.packers[:i], r.packers[i+1:]...) - return p, nil - } - } + p := r.packers[0] + r.packers = r.packers[1:] + return p, nil } // no suitable packer found, return new diff --git a/internal/repository/packer_manager_test.go b/internal/repository/packer_manager_test.go index b16e21c95..efdd7ff43 100644 --- a/internal/repository/packer_manager_test.go +++ b/internal/repository/packer_manager_test.go @@ -91,7 +91,7 @@ func fillPacks(t testing.TB, rnd *randReader, be Saver, pm *packerManager, buf [ } bytes += l - if packer.Size() < minPackSize && pm.countPacker() < maxPackers { + if packer.Size() < minPackSize { pm.insertPacker(packer) continue } diff --git a/internal/repository/repository.go b/internal/repository/repository.go index d09ddd181..7623cde83 100644 --- a/internal/repository/repository.go +++ b/internal/repository/repository.go @@ -191,9 +191,8 @@ func (r *Repository) SaveAndEncrypt(ctx context.Context, t restic.BlobType, data return restic.ID{}, err } - // if the pack is not full enough and there are less than maxPackers - // packers, put back to the list - if packer.Size() < minPackSize && r.countPacker() < maxPackers { + // if the pack is not full enough, put back to the list + if packer.Size() < minPackSize { debug.Log("pack is not full enough (%d bytes)", packer.Size()) r.insertPacker(packer) return *id, nil