gibheer/bleve
0
0
Fork 0
Code

Merge pull request #686 from steveyen/scorch

Browse Source 
scorch removeOldBoltSnapshots() deletes from correct bucket
This commit is contained in:
Steve Yen 2017-12-20 14:59:36 -08:00 committed by GitHub
commit 59797c35fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
index/scorch/persister.go
View File

@ -448,22 +448,25 @@ func (s *Scorch) removeOldBoltSnapshots() (numRemoved int, err error) {
if err != nil {
return 0, err
}
defer func() {
if err == nil {
err = s.rootBolt.Sync()
}
}()
defer func() {
if err == nil {
err = tx.Commit()
} else {
_ = tx.Rollback()
}
if err == nil {
err = s.rootBolt.Sync()
}
}()
snapshots := tx.Bucket(boltSnapshotsBucket)
if snapshots == nil {
return 0, nil
}
for _, epochToRemove := range epochsToRemove {
k := segment.EncodeUvarintAscending(nil, epochToRemove)
err = tx.DeleteBucket(k)
err = snapshots.DeleteBucket(k)
if err == bolt.ErrBucketNotFound {
err = nil
}