rkrtechnology/litestream
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add more checksum logging

Browse Source
This commit is contained in:
Ben Johnson
2021-01-18 06:38:03 -07:00
parent d259d9b9e3
commit 3c4fd152c9
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
db.go
View File

@@ -1319,26 +1319,33 @@ func (db *DB) Restore(ctx context.Context, opt RestoreOptions) error {
tmpPath := outputPath + ".tmp" tmpPath := outputPath + ".tmp"
// Copy snapshot to output path. // Copy snapshot to output path.
var chksum uint64 var dbChksum uint64
if !opt.DryRun { if !opt.DryRun {
if err := db.restoreSnapshot(ctx, r, pos.Generation, pos.Index, tmpPath); err != nil { if err := db.restoreSnapshot(ctx, r, pos.Generation, pos.Index, tmpPath); err != nil {
return fmt.Errorf("cannot restore snapshot: %w", err) return fmt.Errorf("cannot restore snapshot: %w", err)
} }
chksum, _ = checksumFile(tmpPath) if dbChksum, err = checksumFile(tmpPath); err != nil {
return fmt.Errorf("cannot compute db checksum: %w", err)
} }
log.Printf("%s(%s): restoring snapshot %s/%08x to %s, checksum=%016x", db.path, r.Name(), generation, minWALIndex, tmpPath, chksum) }
log.Printf("%s(%s): restoring snapshot %s/%08x to %s, checksum=%016x", db.path, r.Name(), generation, minWALIndex, tmpPath, dbChksum)
// Restore each WAL file until we reach our maximum index. // Restore each WAL file until we reach our maximum index.
var walChksum uint64
for index := minWALIndex; index <= maxWALIndex; index++ { for index := minWALIndex; index <= maxWALIndex; index++ {
if !opt.DryRun { if !opt.DryRun {
if chksum, err = db.restoreWAL(ctx, r, generation, index, tmpPath); os.IsNotExist(err) && index == minWALIndex && index == maxWALIndex { if walChksum, err = db.restoreWAL(ctx, r, generation, index, tmpPath); os.IsNotExist(err) && index == minWALIndex && index == maxWALIndex {
log.Printf("%s(%s): no wal available, snapshot only", db.path, r.Name()) log.Printf("%s(%s): no wal available, snapshot only", db.path, r.Name())
break // snapshot file only, ignore error break // snapshot file only, ignore error
} else if err != nil { } else if err != nil {
return fmt.Errorf("cannot restore wal: %w", err) return fmt.Errorf("cannot restore wal: %w", err)
} }
if dbChksum, err = checksumFile(tmpPath); err != nil {
return fmt.Errorf("cannot compute db checksum after wal restore: %w", err)
} }
log.Printf("%s(%s): restored wal %s/%08x, checksum=%016x", db.path, r.Name(), generation, index, chksum) }
log.Printf("%s(%s): restored wal %s/%08x, checksum=%016x (db=%016x)", db.path, r.Name(), generation, index, walChksum, dbChksum)
} }
// Copy file to final location. // Copy file to final location.
@@ -1474,8 +1481,10 @@ func (db *DB) restoreWAL(ctx context.Context, r Replica, generation string, inde
return 0, err return 0, err
} }
chksum, _ := checksumFile(dbPath + "-wal") chksum, err := checksumFile(dbPath + "-wal")
log.Printf("%s(%s): restored wal checksum: %016x", db.path, r.Name(), chksum) if err != nil {
return 0, fmt.Errorf("cannot checksum wal: %w", err)
}
// Open SQLite database and force a truncating checkpoint. // Open SQLite database and force a truncating checkpoint.
d, err := sql.Open("sqlite3", dbPath) d, err := sql.Open("sqlite3", dbPath)

2
s3/s3.go
View File

@@ -894,7 +894,7 @@ func (r *Replica) WALReader(ctx context.Context, generation string, index int) (
if err != nil { if err != nil {
return nil, err return nil, err
} }
offset = int64(n) offset += int64(n)
} }
return ioutil.NopCloser(&buf), nil return ioutil.NopCloser(&buf), nil