scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-09-07 00:55:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix RBF WAL replay/truncation

Browse source
This commit is contained in:
Ben Johnson 2020-09-07 09:39:26 -06:00
parent 1994560cf6
commit f2bde49d25
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
rbf/db.go
View file

@ -188,6 +188,7 @@ func (db *DB) checkpoint(exclusive bool) error {
return err
}
walID := readMetaWALID(page)
maxCheckpointedWALID := walID
// Determine the high water mark for WAL pages that can be copied.
minActiveWALID := db.minActiveWALID()
@ -195,7 +196,6 @@ func (db *DB) checkpoint(exclusive bool) error {
// Loop over each transaction
walID++
pageMap := immutable.NewMap(&uint32Hasher{})
var maxCheckpointedWALID int64
for {
// Determine last page of transaction.
metaWALID, err := db.findNextWALMetaPage(walID)
@ -255,7 +255,7 @@ func (db *DB) checkpoint(exclusive bool) error {
if maxCheckpointedWALID != 0 {
for len(db.segments) > 0 {
segment := db.segments[0]
if segment.MaxWALID() >= maxCheckpointedWALID {
if segment.MaxWALID() > maxCheckpointedWALID {
break
}
@ -331,17 +331,18 @@ func (db *DB) findLastWALMetaPage() (walID int64, err error) {
return 0, nil
}
var maxWALID int64
for walID := db.segments[0].MinWALID(); walID <= maxWALID; walID++ {
var maxMetaWALID int64
maxWALID := db.maxWALID()
for walID := db.minWALID(); walID <= maxWALID; walID++ {
if page, err := db.readWALPage(walID); err != nil {
return walID, err
} else if IsBitmapHeader(page) {
walID++ // skip next page for bitmap headers
} else if IsMetaPage(page) {
maxWALID = walID // save max meta WAL ID
maxMetaWALID = walID // save max meta WAL ID
}
}
return maxWALID, nil
return maxMetaWALID, nil
}
// minActiveWALID returns the lowest WAL ID in use by any active transaction.
@ -459,7 +460,6 @@ func (db *DB) writeBitmapPage(pgno uint32, page []byte) (walID int64, err error)
}
func (db *DB) ensureWritableWALSegment() error {
if s := db.activeWALSegment(); s != nil && s.Size() < MaxWALSegmentFileSize {
return nil
}
@ -469,13 +469,21 @@ func (db *DB) ensureWritableWALSegment() error {
// addWALSegment appends a new, writable segment and closing an existing segments for write.
func (db *DB) addWALSegment() error {
// Close previous last segment for writes.
base := int64(1)
// If we have a current active WAL segment then close it and start the
// next segment from the next WAL ID. If there is no existing WAL segments,
// read the last checkpointed WAL ID from the DB and start after that.
var base int64
if s := db.activeWALSegment(); s != nil {
base = s.MaxWALID() + 1
if err := s.CloseForWrite(); err != nil {
return err
}
} else {
page, err := db.readPage(db.pageMap, 0)
if err != nil {
return err
}
base = readMetaWALID(page) + 1
}
// Create new segment file.

2
rbf/wal.go
View file

@ -233,7 +233,7 @@ func (s *WALSegment) TruncateAfter(walID int64) error {
// Update to new page size.
newPageN := int((walID - s.minWALID) + 1) // new page count of segment
truncPageN := newPageN - s.pageN // number of pages removed
truncPageN := s.pageN - newPageN // number of pages removed
s.pageN = newPageN
// Check to see if we are only truncating from the write cache.