gibheer/bleve
0
0
Fork 0
Code

scorch removeOldBoltSnapshots() deletes from correct bucket

Browse Source
This commit is contained in:
Steve Yen 2017-12-20 14:43:08 -08:00
parent d55ef26c51
commit 04ac9d5b1f
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 { if err != nil {
return 0, err return 0, err
} }
defer func() {
if err == nil {
err = s.rootBolt.Sync()
}
}()
defer func() { defer func() {
if err == nil { if err == nil {
err = tx.Commit() err = tx.Commit()
} else { } else {
_ = tx.Rollback() _ = tx.Rollback()
} }
if err == nil {
err = s.rootBolt.Sync()
}
}() }()
snapshots := tx.Bucket(boltSnapshotsBucket)
if snapshots == nil {
return 0, nil
}
for _, epochToRemove := range epochsToRemove { for _, epochToRemove := range epochsToRemove {
k := segment.EncodeUvarintAscending(nil, epochToRemove) k := segment.EncodeUvarintAscending(nil, epochToRemove)
err = tx.DeleteBucket(k) err = snapshots.DeleteBucket(k)
if err == bolt.ErrBucketNotFound { if err == bolt.ErrBucketNotFound {
err = nil err = nil
} }