TheArchive/restic
1
0
Fork 0
mirror of https://github.com/restic/restic.git synced 2025-11-17 00:02:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add extraObsolete to MasterIndex.Save

Browse Source
This commit is contained in:
Alexander Weiss
2020-10-18 09:24:34 +02:00
parent 5898cb341f
commit 1ec628ddf5
4 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
internal/repository/master_index.go
View File

@@ -266,7 +266,7 @@ func (mi *MasterIndex) MergeFinalIndexes() {
// of all known indexes in the "supersedes" field. The IDs are also returned in
// the IDSet obsolete
// After calling this function, you should remove the obsolete index files.
func (mi *MasterIndex) Save(ctx context.Context, repo restic.Repository, packBlacklist restic.IDSet, p *progress.Counter) (obsolete restic.IDSet, err error) {
func (mi *MasterIndex) Save(ctx context.Context, repo restic.Repository, packBlacklist restic.IDSet, extraObsolete restic.IDs, p *progress.Counter) (obsolete restic.IDSet, err error) {
mi.idxMutex.Lock()
defer mi.idxMutex.Unlock()
@@ -275,15 +275,6 @@ func (mi *MasterIndex) Save(ctx context.Context, repo restic.Repository, packBla
newIndex := NewIndex()
obsolete = restic.NewIDSet()
finalize := func() error {
newIndex.Finalize()
if _, err := SaveIndex(ctx, repo, newIndex); err != nil {
return err
}
newIndex = NewIndex()
return nil
}
for i, idx := range mi.idx {
if idx.Final() {
ids, err := idx.IDs()
@@ -309,13 +300,23 @@ func (mi *MasterIndex) Save(ctx context.Context, repo restic.Repository, packBla
newIndex.StorePack(pbs.packID, pbs.blobs)
p.Add(1)
if IndexFull(newIndex) {
if err := finalize(); err != nil {
newIndex.Finalize()
if _, err := SaveIndex(ctx, repo, newIndex); err != nil {
return nil, err
}
newIndex = NewIndex()
}
}
}
if err := finalize(); err != nil {
err = newIndex.AddToSupersedes(extraObsolete...)
if err != nil {
return nil, err
}
obsolete.Merge(restic.NewIDSet(extraObsolete...))
newIndex.Finalize()
if _, err := SaveIndex(ctx, repo, newIndex); err != nil {
return nil, err
}